Browse Source

Merge "Remove the remaining neutron-lbaas related constants"

changes/58/687858/8
Zuul 2 weeks ago
parent
commit
0eea71bf06
4 changed files with 2 additions and 26 deletions
  1. +0
    -11
      networking_odl/common/constants.py
  2. +1
    -6
      networking_odl/common/lightweight_testing.py
  3. +0
    -5
      networking_odl/journal/full_sync.py
  4. +1
    -4
      networking_odl/tests/unit/journal/test_full_sync.py

+ 0
- 11
networking_odl/common/constants.py View File

@@ -28,17 +28,6 @@ ODL_ROUTERS = 'routers'
ODL_FLOATINGIP = 'floatingip'
ODL_FLOATINGIPS = 'floatingips'

ODL_LOADBALANCER = 'loadbalancer'
ODL_LOADBALANCERS = 'loadbalancers'
ODL_LISTENER = 'listener'
ODL_LISTENERS = 'listeners'
ODL_POOL = 'pool'
ODL_POOLS = 'pools'
ODL_MEMBER = 'member'
ODL_MEMBERS = 'members'
ODL_HEALTHMONITOR = 'healthmonitor'
ODL_HEALTHMONITORS = 'healthmonitors'

ODL_QOS = 'qos'
ODL_QOS_POLICY = 'policy'
ODL_QOS_POLICIES = 'policies'

+ 1
- 6
networking_odl/common/lightweight_testing.py View File

@@ -42,12 +42,7 @@ class OpenDaylightLwtClient(client.OpenDaylightRestClient):
odl_const.ODL_SUBNETS: {},
odl_const.ODL_PORTS: {},
odl_const.ODL_SGS: {},
odl_const.ODL_SG_RULES: {},
odl_const.ODL_LOADBALANCERS: {},
odl_const.ODL_LISTENERS: {},
odl_const.ODL_POOLS: {},
odl_const.ODL_MEMBERS: {},
odl_const.ODL_HEALTHMONITORS: {}}
odl_const.ODL_SG_RULES: {}}

@classmethod
def _make_response(cls, status_code=OK, content=None):

+ 0
- 5
networking_odl/journal/full_sync.py View File

@@ -42,11 +42,6 @@ _ORDERED_ODL_RESOURCES = (
odl_const.ODL_ROUTER,
odl_const.ODL_PORT,
odl_const.ODL_FLOATINGIP,
odl_const.ODL_LOADBALANCER,
odl_const.ODL_LISTENER,
odl_const.ODL_POOL,
odl_const.ODL_MEMBER,
odl_const.ODL_HEALTHMONITOR,
odl_const.ODL_QOS_POLICY,
odl_const.ODL_TRUNK,
odl_const.ODL_BGPVPN,

+ 1
- 4
networking_odl/tests/unit/journal/test_full_sync.py View File

@@ -347,10 +347,8 @@ class FullSyncTestCase(test_base_db.ODLBaseDbTestCase):

@staticmethod
def _get_name(resource_type):
MEMBERS = 'pool_members'
mapping = {
odl_const.ODL_QOS_POLICY: odl_const.ODL_QOS_POLICIES,
odl_const.ODL_MEMBER: MEMBERS,
odl_const.ODL_SFC_PORT_PAIR:
odl_const.NETWORKING_SFC_FLOW_CLASSIFIERS,
odl_const.ODL_SFC_PORT_PAIR:
@@ -380,8 +378,7 @@ class FullSyncTestCase(test_base_db.ODLBaseDbTestCase):
plugins = self._get_all_plugins()
driver = plugins[plugin_type][1]
args = [mock.Mock()]
if object_type in [odl_const.ODL_MEMBER,
odl_const.ODL_BGPVPN_ROUTER_ASSOCIATION,
if object_type in [odl_const.ODL_BGPVPN_ROUTER_ASSOCIATION,
odl_const.ODL_BGPVPN_NETWORK_ASSOCIATION]:
args.append(mock.Mock())


Loading…
Cancel
Save