Skip to content
This repository has been archived by the owner on Sep 17, 2019. It is now read-only.

Commit

Permalink
Merge pull request #98 from napalm-automation/develop
Browse files Browse the repository at this point in the history 
Release 0.4.7
  • Loading branch information
@mirceaulinic
mirceaulinic committed Jan 27, 2017
2 parents 881c3c7 + a1cb30a commit 7240ac2
Show file tree
Hide file tree
Showing 6 changed files with 145 additions and 1 deletion.
16 changes: 16 additions & 0 deletions napalm_iosxr/iosxr.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -820,6 +820,22 @@ def build_prefix_limit(af_table, limit, prefix_percent, prefix_timeout):
}
if group and group == group_name:
break
if '' in bgp_group_neighbors.keys():
bgp_config['_'] = {
'apply_groups': [],
'description': '',
'local_as': 0,
'type': '',
'import_policy': '',
'export_policy': '',
'local_address': '',
'multipath': False,
'multihop_ttl': 0,
'remote_as': 0,
'remove_private_as': False,
'prefix_limit': {},
'neighbors': bgp_group_neighbors.get('', {})
}

return bgp_config

Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

setup(
name="napalm-iosxr",
version="0.4.6",
version="0.4.7",
packages=find_packages(),
author="David Barroso, Mircea Ulinic",
author_email="dbarrosop@dravetech.com, mircea@cloudflare.com",
Expand Down
2 changes: 2 additions & 0 deletions ...__InstanceName_default__InstanceName___Naming___Instance___BGP___Configuration___Get_.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<Response MajorVersion="1" MinorVersion="0"><Get><Configuration><BGP MajorVersion="40" MinorVersion="9"><Instance><Naming><InstanceName>default</InstanceName></Naming><InstanceAS><Naming><AS>0</AS></Naming><FourByteAS><Naming><AS>65900</AS></Naming><BGPRunning>true</BGPRunning><DefaultVRF><Global><RouterID>10.255.255.1</RouterID><GlobalAFTable><GlobalAF><Naming><AFName>IPv4Unicast</AFName></Naming><Enable>true</Enable><SourcedNetworkTable><SourcedNetwork><Naming><Network><IPV4Address>192.168.1.0</IPV4Address><IPV4PrefixLength>24</IPV4PrefixLength></Network></Naming></SourcedNetwork></SourcedNetworkTable></GlobalAF></GlobalAFTable></Global><BGPEntity><NeighborGroupTable><NeighborGroup><Naming><NeighborGroupName>RR</NeighborGroupName></Naming><Create>true</Create><RemoteAS><AS_XX>0</AS_XX><AS_YY>65900</AS_YY></RemoteAS><UpdateSourceInterface>Loopback0</UpdateSourceInterface><NeighborGroupAFTable><NeighborGroupAF><Naming><AFName>IPv4Unicast</AFName></Naming><Activate>true</Activate><RoutePolicyIn>RP-RR-IN</RoutePolicyIn><MaximumPrefixes><PrefixLimit>1000000</PrefixLimit><WarningPercentage>90</WarningPercentage><WarningOnly>false</WarningOnly><RestartTime>120</RestartTime></MaximumPrefixes></NeighborGroupAF></NeighborGroupAFTable></NeighborGroup></NeighborGroupTable><NeighborTable><Neighbor><Naming><NeighborAddress><IPV4Address>10.255.255.2</IPV4Address></NeighborAddress></Naming><RemoteAS><AS_XX>0</AS_XX><AS_YY>65900</AS_YY></RemoteAS><UpdateSourceInterface>Loopback0</UpdateSourceInterface><NeighborAFTable><NeighborAF><Naming><AFName>IPv4Unicast</AFName></Naming><Activate>true</Activate><RoutePolicyIn>pass-all</RoutePolicyIn><RoutePolicyOut>pass-all</RoutePolicyOut></NeighborAF></NeighborAFTable></Neighbor><Neighbor><Naming><NeighborAddress><IPV4Address>10.255.255.3</IPV4Address></NeighborAddress></Naming><NeighborGroupAddMember>RR</NeighborGroupAddMember></Neighbor><Neighbor><Naming><NeighborAddress><IPV4Address>10.255.255.12</IPV4Address></NeighborAddress></Naming><NeighborGroupAddMember>RR</NeighborGroupAddMember><NeighborAFTable><NeighborAF><Naming><AFName>IPv4Unicast</AFName></Naming><Activate>true</Activate><RoutePolicyIn>RP-SPECIAL-SNOWFLAKE-IN</RoutePolicyIn></NeighborAF></NeighborAFTable></Neighbor><Neighbor><Naming><NeighborAddress><IPV4Address>10.255.255.220</IPV4Address></NeighborAddress></Naming><RemoteAS><AS_XX>0</AS_XX><AS_YY>65900</AS_YY></RemoteAS><UpdateSourceInterface>Loopback0</UpdateSourceInterface><NeighborAFTable><NeighborAF><Naming><AFName>IPv4Unicast</AFName></Naming><Activate>true</Activate><RoutePolicyIn>pass-all</RoutePolicyIn><RoutePolicyOut>pass-all</RoutePolicyOut></NeighborAF></NeighborAFTable></Neighbor></NeighborTable></BGPEntity></DefaultVRF></FourByteAS></InstanceAS></Instance></BGP></Configuration></Get><ResultSummary ErrorCount="0"/></Response>
82 changes: 82 additions & 0 deletions test/unit/mocked_data/test_get_bgp_config/mixed_with_without_groups/expected_result.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
{
"RR": {
"neighbors": {
"10.255.255.12": {
"local_address": "",
"export_policy": "",
"route_reflector_client": false,
"remote_as": 0,
"authentication_key": "",
"import_policy": "RP-SPECIAL-SNOWFLAKE-IN",
"nhs": false,
"prefix_limit": {},
"local_as": 0,
"description": ""
},
"10.255.255.3": {
"local_address": "",
"export_policy": "",
"route_reflector_client": false,
"remote_as": 0,
"authentication_key": "",
"import_policy": "",
"nhs": false,
"prefix_limit": {},
"local_as": 0,
"description": ""
}
},
"remote_as": 65900,
"multipath": false,
"export_policy": "",
"prefix_limit": {},
"description": "",
"local_address": "",
"apply_groups": [],
"remove_private_as": true,
"import_policy": "RP-RR-IN",
"type": "external",
"local_as": 0,
"multihop_ttl": 0
},
"_": {
"neighbors": {
"10.255.255.2": {
"local_address": "",
"export_policy": "pass-all",
"route_reflector_client": false,
"remote_as": 65900,
"authentication_key": "",
"import_policy": "pass-all",
"nhs": false,
"prefix_limit": {},
"local_as": 0,
"description": ""
},
"10.255.255.220": {
"local_address": "",
"export_policy": "pass-all",
"route_reflector_client": false,
"remote_as": 65900,
"authentication_key": "",
"import_policy": "pass-all",
"nhs": false,
"prefix_limit": {},
"local_as": 0,
"description": ""
}
},
"remote_as": 0,
"multipath": false,
"export_policy": "",
"prefix_limit": {},
"description": "",
"local_address": "",
"apply_groups": [],
"remove_private_as": false,
"import_policy": "",
"type": "",
"local_as": 0,
"multihop_ttl": 0
}
}
2 changes: 2 additions & 0 deletions ...__InstanceName_default__InstanceName___Naming___Instance___BGP___Configuration___Get_.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<Response MajorVersion="1" MinorVersion="0"><Get><Configuration><BGP MajorVersion="40" MinorVersion="9"><Instance><Naming><InstanceName>default</InstanceName></Naming><InstanceAS><Naming><AS>0</AS></Naming><FourByteAS><Naming><AS>65900</AS></Naming><BGPRunning>true</BGPRunning><DefaultVRF><Global><RouterID>10.255.255.1</RouterID><GlobalAFTable><GlobalAF><Naming><AFName>IPv4Unicast</AFName></Naming><Enable>true</Enable><SourcedNetworkTable><SourcedNetwork><Naming><Network><IPV4Address>192.168.1.0</IPV4Address><IPV4PrefixLength>24</IPV4PrefixLength></Network></Naming></SourcedNetwork></SourcedNetworkTable></GlobalAF></GlobalAFTable></Global><BGPEntity><NeighborTable><Neighbor><Naming><NeighborAddress><IPV4Address>10.255.255.2</IPV4Address></NeighborAddress></Naming><RemoteAS><AS_XX>0</AS_XX><AS_YY>65900</AS_YY></RemoteAS><UpdateSourceInterface>Loopback0</UpdateSourceInterface><NeighborAFTable><NeighborAF><Naming><AFName>IPv4Unicast</AFName></Naming><Activate>true</Activate><RoutePolicyIn>pass-all</RoutePolicyIn><RoutePolicyOut>pass-all</RoutePolicyOut></NeighborAF></NeighborAFTable></Neighbor><Neighbor><Naming><NeighborAddress><IPV4Address>10.255.255.3</IPV4Address></NeighborAddress></Naming><RemoteAS><AS_XX>0</AS_XX><AS_YY>65900</AS_YY></RemoteAS><UpdateSourceInterface>Loopback0</UpdateSourceInterface><NeighborAFTable><NeighborAF><Naming><AFName>IPv4Unicast</AFName></Naming><Activate>true</Activate><RoutePolicyIn>pass-all</RoutePolicyIn><RoutePolicyOut>pass-all</RoutePolicyOut></NeighborAF></NeighborAFTable></Neighbor></NeighborTable></BGPEntity></DefaultVRF></FourByteAS></InstanceAS></Instance></BGP></Configuration></Get><ResultSummary ErrorCount="0"/></Response>
42 changes: 42 additions & 0 deletions test/unit/mocked_data/test_get_bgp_config/peers_without_groups/expected_result.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"_": {
"remote_as": 0,
"export_policy": "",
"import_policy": "",
"apply_groups": [],
"local_address": "",
"multihop_ttl": 0,
"remove_private_as": false,
"description": "",
"multipath": false,
"prefix_limit": {},
"type": "",
"local_as": 0,
"neighbors": {
"10.255.255.2": {
"route_reflector_client": false,
"prefix_limit": {},
"nhs": false,
"import_policy": "pass-all",
"export_policy": "pass-all",
"authentication_key": "",
"remote_as": 65900,
"description": "",
"local_address": "",
"local_as": 0
},
"10.255.255.3": {
"route_reflector_client": false,
"prefix_limit": {},
"nhs": false,
"import_policy": "pass-all",
"export_policy": "pass-all",
"authentication_key": "",
"remote_as": 65900,
"description": "",
"local_address": "",
"local_as": 0
}
}
}
}

0 comments on commit 7240ac2

Please sign in to comment.