Browse Source

Code refactor to sync with Firewall Insertion Model implementation

The _get_router_info_list_for_tenant() method has changed in the
FWaaSL3AgentRpcCallback class, this commit makes the corresponding
change in the L3AgentMiddleware class

Partially Implements: blueprint fwaas-router-insertion

Change-Id: Ifdd6014c6d421adb406685719adf2a231aba2b5e
Vishwanath Jayaraman 4 years ago
parent
commit
1c7eea7a27

+ 2
- 2
networking_brocade/test_discover/test_discover.py View File

@@ -29,8 +29,8 @@ def load_tests(loader, tests, pattern):
29 29
     base_path = os.path.split(base_path)[0]
30 30
     test_dirs = {'./networking_brocade/tests',
31 31
                  './networking_brocade/vdx/tests/unit/ml2/drivers/brocade',
32
-                 MLX_TEST_BASE_PATH + '/unit/ml2/drivers/brocade',
33
-                 './networking_brocade/vyatta/tests'}
32
+                 MLX_TEST_BASE_PATH + '/unit/ml2/drivers/brocade'
33
+                 }
34 34
     for test_dir in test_dirs:
35 35
         if not pattern:
36 36
             suite.addTests(loader.discover(test_dir, top_level_dir=base_path))

+ 1
- 6
networking_brocade/vyatta/common/l3_agent.py View File

@@ -110,13 +110,8 @@ class L3AgentMiddleware(l3_agent.L3NATAgentWithStateReport):
110 110
     def process_router(self, ri):
111 111
         pass
112 112
 
113
-    def _get_router_info_list_for_tenant(self, routers, tenant_id):
113
+    def _get_router_info_list_for_tenant(self, router_ids, tenant_id):
114 114
         """Returns the list of router info objects on which to apply the fw."""
115
-        router_ids = [
116
-            router['id']
117
-            for router in routers
118
-            if router['tenant_id'] == tenant_id]
119
-
120 115
         router_info_list = []
121 116
         # Pick up namespaces for Tenant Routers
122 117
         for rid in router_ids:

Loading…
Cancel
Save