Browse Source

Import ml2 api from neutron_lib and implement get_agent_api agent method

Two issues broke networking-dpm

* Patch [1] moved the ml2 api file from neutron to neutron_lib.
* Patch [2] introduced a new abstract method to agent_manager_base which our dpm agent manager inherits from.

[1] a2c36d7e00 (diff-b3918f8e7feb10936ad483ee4a7f94c7)
[2] cbee0f9f88
Change-Id: Id0aba49ede37ffd92397ffddddc8d467e511b108
Andreas Scheuring 1 year ago
parent
commit
a2b3be2f7d
2 changed files with 4 additions and 1 deletions
  1. 3
    0
      networking_dpm/ml2/dpm_neutron_agent.py
  2. 1
    1
      networking_dpm/ml2/mech_dpm.py

+ 3
- 0
networking_dpm/ml2/dpm_neutron_agent.py View File

@@ -176,6 +176,9 @@ class DPMManager(amb.CommonAgentManagerBase):
176 176
         self.vswitches = vswitches
177 177
         self.cpc = cpc
178 178
 
179
+    def get_agent_api(self, **kwargs):
180
+        pass
181
+
179 182
     def ensure_port_admin_state(self, device, admin_state_up):
180 183
         # Setting a port up/down is not supported by Neutron DPM agent. Ports
181 184
         # are always up.

+ 1
- 1
networking_dpm/ml2/mech_dpm.py View File

@@ -16,9 +16,9 @@
16 16
 
17 17
 from neutron_lib.api.definitions import portbindings
18 18
 from neutron_lib import constants as p_constants
19
+from neutron_lib.plugins.ml2 import api
19 20
 from oslo_log import log
20 21
 
21
-from neutron.plugins.ml2 import driver_api as api
22 22
 from neutron.plugins.ml2.drivers import mech_agent
23 23
 
24 24
 LOG = log.getLogger(__name__)

Loading…
Cancel
Save