Skip to content

Commit 4aa45ea

Browse files
committed
fix: Implemented feedbaclk
1 parent c115822 commit 4aa45ea

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

cosmo/routerbgpcpevisitor.py

+14-10
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ class RouterBgpCpeExporterVisitor(AbstractRouterExporterVisitor):
1313
def accept(self, o):
1414
return super().accept(o)
1515

16-
def _processNumberedBGP(self, cpe, base_group_name, linked_interface, policy_v4, policy_v6):
16+
@staticmethod
17+
def _processNumberedBGP(cpe, base_group_name, linked_interface, policy_v4, policy_v6):
1718
ip_addresses = linked_interface.getIPAddresses()
1819
ip_addresses_ipo = map(lambda x: x.getIPInterfaceObject(), ip_addresses)
1920
own_ipv4_address = next(filter(lambda i: type(i) is IPv4Interface, ip_addresses_ipo), None)
@@ -62,8 +63,8 @@ def _processNumberedBGP(self, cpe, base_group_name, linked_interface, policy_v4,
6263

6364
return groups
6465

65-
66-
def _processUnnumberedBGP(self, base_group_name, linked_interface, policy_v4, policy_v6):
66+
@staticmethod
67+
def _processUnnumberedBGP(base_group_name, linked_interface, policy_v4, policy_v6):
6768
return {
6869
base_group_name: {
6970
"any_as": True,
@@ -121,9 +122,9 @@ def processBgpCpeTag(self, o: TagType):
121122
policy_v4["export"] = "DEFAULT_V4"
122123
policy_v6["export"] = "DEFAULT_V6"
123124

124-
cpet = DeviceType(cpe["device"])
125+
t_cpe = DeviceType(cpe["device"])
125126
v4_import, v6_import = set(), set() # unique
126-
for item in iter(cpet):
127+
for item in iter(t_cpe):
127128
ret = CpeRouterExporterVisitor().accept(item)
128129
if not ret:
129130
continue
@@ -136,11 +137,14 @@ def processBgpCpeTag(self, o: TagType):
136137
policy_v4["import_list"] = list(v4_import)
137138
policy_v6["import_list"] = list(v6_import)
138139

139-
groups = self._processNumberedBGP(
140-
cpe, group_name, linked_interface, policy_v4, policy_v6
141-
) if len(ip_addresses) > 0 else self._processUnnumberedBGP(
142-
group_name, linked_interface, policy_v4, policy_v6
143-
)
140+
if len(ip_addresses) > 0:
141+
groups = self._processNumberedBGP(
142+
cpe, group_name, linked_interface, policy_v4, policy_v6
143+
)
144+
else:
145+
groups = self._processUnnumberedBGP(
146+
group_name, linked_interface, policy_v4, policy_v6
147+
)
144148

145149
return {
146150
self._vrf_key: {

cosmo/tests/test_serializer.py

-1
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,6 @@ def test_router_case_local_bgpcpe():
387387

388388
assert 'CPE_ifp-0-1-2-5_V4' in groups_L3VPN
389389
assert 'CPE_ifp-0-1-2-5_V6' in groups_L3VPN
390-
print(groups_L3VPN)
391390
assert groups_L3VPN['CPE_ifp-0-1-2-5_V4']['neighbors'][0]['peer'] == '10.128.6.12'
392391
assert groups_L3VPN['CPE_ifp-0-1-2-5_V6']['neighbors'][0]['peer'] == '2a0e:b941:2::21'
393392
assert not 'export' in groups_L3VPN['CPE_ifp-0-1-2-5_V4']['family']['ipv4_unicast']['policy']

0 commit comments

Comments
 (0)