diff --git a/f5_openstack_agent/lbaasv2/drivers/bigip/agent.py b/f5_openstack_agent/lbaasv2/drivers/bigip/agent.py
index 384b1c7af..9a7977b46 100755
--- a/f5_openstack_agent/lbaasv2/drivers/bigip/agent.py
+++ b/f5_openstack_agent/lbaasv2/drivers/bigip/agent.py
@@ -33,9 +33,9 @@
 
 
 try:
-    from neutron.agent.linux import interface
     from neutron.common import config as common_config
     from neutron.common import rpc as n_rpc
+    from neutron.conf.agent.common import INTERFACE_OPTS
     try:
         from neutron.conf.agent import common as config
     except Exception:
@@ -71,7 +71,7 @@ def main():
     """F5 LBaaS agent for OpenStack."""
     cfg.CONF.register_opts(OPTS)
     cfg.CONF.register_opts(manager.OPTS)
-    cfg.CONF.register_opts(interface.OPTS)
+    cfg.CONF.register_opts(INTERFACE_OPTS)
 
     config.register_agent_state_opts_helper(cfg.CONF)
     config.register_root_helper(cfg.CONF)
diff --git a/f5_openstack_agent/lbaasv2/drivers/bigip/esd_filehandler.py b/f5_openstack_agent/lbaasv2/drivers/bigip/esd_filehandler.py
index fb8803996..d37ce65b2 100644
--- a/f5_openstack_agent/lbaasv2/drivers/bigip/esd_filehandler.py
+++ b/f5_openstack_agent/lbaasv2/drivers/bigip/esd_filehandler.py
@@ -50,8 +50,8 @@ def read_json(self):
                     self.esdJSONDict.update(fileJSONDict)
 
             except ValueError as err:
-                    LOG.error('ESD JSON File is invalid: %s', err)
-                    raise f5_ex.esdJSONFileInvalidException()
+                LOG.error('ESD JSON File is invalid: %s', err)
+                raise f5_ex.esdJSONFileInvalidException()
 
         return self.esdJSONDict
 
diff --git a/f5_openstack_agent/lbaasv2/drivers/bigip/lbaas_builder.py b/f5_openstack_agent/lbaasv2/drivers/bigip/lbaas_builder.py
index 10a320bac..7a0091e0e 100644
--- a/f5_openstack_agent/lbaasv2/drivers/bigip/lbaas_builder.py
+++ b/f5_openstack_agent/lbaasv2/drivers/bigip/lbaas_builder.py
@@ -274,7 +274,7 @@ def _assure_monitors_created(self, service):
                     monitor['provisioning_status'] = constants_v2.F5_ERROR
 
     def _assure_monitors_deleted(self, service):
-        monitors = service.get("healthmonitors", [])
+        monitors = service.get("healthmonitors", list())
         loadbalancer = service["loadbalancer"]
         bigips = self.driver.get_config_bigips()
 
diff --git a/f5_openstack_agent/lbaasv2/drivers/bigip/test/test_exceptions.py b/f5_openstack_agent/lbaasv2/drivers/bigip/test/test_exceptions.py
index f4856360b..baf5b2ca4 100644
--- a/f5_openstack_agent/lbaasv2/drivers/bigip/test/test_exceptions.py
+++ b/f5_openstack_agent/lbaasv2/drivers/bigip/test/test_exceptions.py
@@ -518,8 +518,8 @@ def test_VXLANDeleteException():
 
 
 def test_BigIPNotLicensedForVcmp():
-        with pytest.raises(exceptions.BigIPNotLicensedForVcmp):
-            raise getattr(exceptions, 'BigIPNotLicensedForVcmp')()
+    with pytest.raises(exceptions.BigIPNotLicensedForVcmp):
+        raise getattr(exceptions, 'BigIPNotLicensedForVcmp')()
 
 
 if __name__ == '__main__':
diff --git a/f5_openstack_agent/lbaasv2/drivers/bigip/test/test_vcmp.py b/f5_openstack_agent/lbaasv2/drivers/bigip/test/test_vcmp.py
index 8b147d3f2..03a6620a3 100644
--- a/f5_openstack_agent/lbaasv2/drivers/bigip/test/test_vcmp.py
+++ b/f5_openstack_agent/lbaasv2/drivers/bigip/test/test_vcmp.py
@@ -126,9 +126,9 @@ def old_setup_vcmp_method_test(mock_mgmt_root, mock_driver, mock_host_obj):
 def test___init__(setup_vcmp_mgr):
     vcmp = setup_vcmp_mgr
     assert vcmp.vcmp_hosts != []
-    assert len(vcmp.vcmp_hosts) is 2
+    assert len(vcmp.vcmp_hosts) == 2
     assert vcmp.vcmp_hosts[0]['guests'] != []
-    assert len(vcmp.vcmp_hosts[0]['guests']) is 1
+    assert len(vcmp.vcmp_hosts[0]['guests']) == 1
 
 
 def test___init__no_vcmp_hosts():
@@ -237,13 +237,13 @@ def test__check_vcmp_host_assignments_bad_platform(setup_vcmp_method_test):
 def test__get_vlan_use_count(setup_vcmp_method_test):
     vcmp, mock_bigip = setup_vcmp_method_test
     use_cnt = vcmp._get_vlan_use_count(vcmp.vcmp_hosts[0], 'test_vlan')
-    assert use_cnt is 1
+    assert use_cnt == 1
 
 
 def test__get_vlan_use_count_zero(setup_vcmp_method_test):
     vcmp, mock_bigip = setup_vcmp_method_test
     use_cnt = vcmp._get_vlan_use_count(vcmp.vcmp_hosts[0], 'test_vlan_2')
-    assert use_cnt is 0
+    assert use_cnt == 0
 
 
 def test__is_vlan_assoc_with_vcmp_guest(setup_vcmp_method_test):
diff --git a/f5_openstack_agent/lbaasv2/drivers/bigip/utils.py b/f5_openstack_agent/lbaasv2/drivers/bigip/utils.py
index 7e6663830..917d2a4b5 100644
--- a/f5_openstack_agent/lbaasv2/drivers/bigip/utils.py
+++ b/f5_openstack_agent/lbaasv2/drivers/bigip/utils.py
@@ -137,7 +137,7 @@ def strip_cidr_netmask(ip_address):
     '''
 
     split_ip = ip_address.split('/')
-    if len(split_ip) is 2:
+    if len(split_ip) == 2:
         return split_ip[0]
     else:
         msg = 'The IP address provided was not in CIDR notation.'