Skip to content

Validate IP Prefix #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sumukhatv wants to merge 4 commits into from
Closed

Validate IP Prefix #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
66d2d94
rename variable to prevent using library name
sumukhatv Feb 17, 2021
3057ce0
Check for correctness of IP Prefix
sumukhatv Feb 17, 2021
5d82b1a
test fixes
sumukhatv Feb 17, 2021
a81a9c2
test fixes
sumukhatv Mar 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions go-server-server/go/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,19 +131,22 @@ func IsValidIPBoth(ipstr string) bool {
}

func ParseIPBothPrefix(ipprefix string) (ipstr string, length int, err error) {
ip, net, err := net.ParseCIDR(ipprefix)
ip, network, err := net.ParseCIDR(ipprefix)
if err != nil {
return
}

ipstr = ip.String()
length, _ = net.Mask.Size()

if ip.String() == strings.Split(network.String(), "/")[0] {
ipstr = ip.String()
length, _ = network.Mask.Size()
} else {
err = errors.New("Incorrect IP Prefix")
}
return
}

func ParseIPPrefix(ipprefix string) (ipstr string, length int, err error) {
ip, net, err := net.ParseCIDR(ipprefix)
ip, network, err := net.ParseCIDR(ipprefix)
if err != nil {
return
}
Expand All @@ -154,7 +157,7 @@ func ParseIPPrefix(ipprefix string) (ipstr string, length int, err error) {
}

ipstr = ip.String()
length, _ = net.Mask.Size()
length, _ = network.Mask.Size()

return
}
Expand Down
85 changes: 50 additions & 35 deletions test/apitest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ def test_vlan_with_vnetid_all_verbs(self):
def test_vlan_with_ippref_all_verbs(self):
# post
self.post_generic_vrouter_and_deps()
r = self.post_config_vlan(2, {'ip_prefix':'10.0.1.1/24'})
r = self.post_config_vlan(2, {'ip_prefix':'10.0.1.0/24'})
self.assertEqual(r.status_code, 204)

# get
Expand All @@ -531,11 +531,11 @@ def test_vlan_with_ippref_all_verbs(self):
j = json.loads(r.text)
self.assertEqual(j, {
'vlan_id': 2,
'attr': {'ip_prefix':'10.0.1.1/24'}
'attr': {'ip_prefix':'10.0.1.0/24'}
})
vlan_table = self.configdb.hgetall(VLAN_TB + '|' + VLAN_NAME_PREF + '2')
self.assertEqual(vlan_table, {b'vlanid': b'2'})
vlan_intf_table = self.configdb.hgetall(VLAN_INTF_TB + '|' + VLAN_NAME_PREF + '2|10.0.1.1/24')
vlan_intf_table = self.configdb.hgetall(VLAN_INTF_TB + '|' + VLAN_NAME_PREF + '2|10.0.1.0/24')
self.assertEqual(vlan_intf_table, {b'':b''})
vlan_intf_table = self.configdb.hgetall(VLAN_INTF_TB + '|' + VLAN_NAME_PREF + '2')
self.assertEqual(vlan_intf_table, {})
Expand All @@ -545,13 +545,13 @@ def test_vlan_with_ippref_all_verbs(self):
self.assertEqual(r.status_code, 204)
vlan_table = self.configdb.hgetall(VLAN_TB + '|' + VLAN_NAME_PREF + '2')
self.assertEqual(vlan_table, {})
vlan_intf_table = self.configdb.hgetall(VLAN_INTF_TB + '|' + VLAN_NAME_PREF + '2|10.0.1.1/24')
vlan_intf_table = self.configdb.hgetall(VLAN_INTF_TB + '|' + VLAN_NAME_PREF + '2|10.0.1.0/24')
self.assertEqual(vlan_intf_table, {})

def test_vlan_all_args_all_verbs(self):
# post
self.post_generic_vrouter_and_deps()
r = self.post_config_vlan(2, {'vnet_id' : 'vnet-guid-1', 'ip_prefix':'10.0.1.1/24'})
r = self.post_config_vlan(2, {'vnet_id' : 'vnet-guid-1', 'ip_prefix':'10.0.1.0/24'})
self.assertEqual(r.status_code, 204)

# get
Expand All @@ -560,11 +560,11 @@ def test_vlan_all_args_all_verbs(self):
j = json.loads(r.text)
self.assertEqual(j, {
'vlan_id': 2,
'attr': {'vnet_id' : 'vnet-guid-1', 'ip_prefix':'10.0.1.1/24'}
'attr': {'vnet_id' : 'vnet-guid-1', 'ip_prefix':'10.0.1.0/24'}
})
vlan_table = self.configdb.hgetall(VLAN_TB + '|' + VLAN_NAME_PREF + '2')
self.assertEqual(vlan_table, {b'vlanid': b'2'})
vlan_intf_table = self.configdb.hgetall(VLAN_INTF_TB + '|' + VLAN_NAME_PREF + '2|10.0.1.1/24')
vlan_intf_table = self.configdb.hgetall(VLAN_INTF_TB + '|' + VLAN_NAME_PREF + '2|10.0.1.0/24')
self.assertEqual(vlan_intf_table, {b'':b''})
vlan_intf_table = self.configdb.hgetall(VLAN_INTF_TB + '|' + VLAN_NAME_PREF + '2')
self.assertEqual(vlan_intf_table, {b'proxy_arp': b'enabled', b'vnet_name': VNET_NAME_PREF+'1'})
Expand All @@ -576,7 +576,7 @@ def test_vlan_all_args_all_verbs(self):
self.assertEqual(vlan_table, {})
vlan_intf_table = self.configdb.hgetall(VLAN_INTF_TB + '|' + VLAN_NAME_PREF + '2')
self.assertEqual(vlan_intf_table, {})
vlan_intf_table = self.configdb.hgetall(VLAN_INTF_TB + '|' + VLAN_NAME_PREF + '2|10.0.1.1/24')
vlan_intf_table = self.configdb.hgetall(VLAN_INTF_TB + '|' + VLAN_NAME_PREF + '2|10.0.1.0/24')
self.assertEqual(vlan_intf_table, {})

def test_get_vlans_per_vnetid_1digitvlans(self):
Expand All @@ -588,18 +588,18 @@ def test_get_vlans_per_vnetid_1digitvlans(self):
self.post_config_vrouter_vrf_id('vnet-guid-1', {'vnid': 1001})
self.post_config_vrouter_vrf_id('vnet-guid-2', {'vnid': 2001})
#create vlan interfaces
self.post_config_vlan(3, {'vnet_id' : 'vnet-guid-1', 'ip_prefix':'10.0.4.1/24'})
self.post_config_vlan(4, {'vnet_id' : 'vnet-guid-1', 'ip_prefix':'10.0.3.1/24'})
self.post_config_vlan(3, {'vnet_id' : 'vnet-guid-1', 'ip_prefix':'10.0.4.0/24'})
self.post_config_vlan(4, {'vnet_id' : 'vnet-guid-1', 'ip_prefix':'10.0.3.0/24'})

self.post_config_vlan(5, {'vnet_id' : 'vnet-guid-2', 'ip_prefix':'10.2.4.1/24'})
self.post_config_vlan(6, {'vnet_id' : 'vnet-guid-2', 'ip_prefix':'10.2.3.1/24'})
self.post_config_vlan(5, {'vnet_id' : 'vnet-guid-2', 'ip_prefix':'10.2.4.0/24'})
self.post_config_vlan(6, {'vnet_id' : 'vnet-guid-2', 'ip_prefix':'10.2.3.0/24'})
# get vlans for vnet-guid-1
r_vnet1 = self.get_config_interface_vlans('vnet-guid-1')
r_vnet2 = self.get_config_interface_vlans('vnet-guid-2')
j_vnet1 = json.loads(r_vnet1.text)
j_vnet2 = json.loads(r_vnet2.text)
k_vnet1 = {"vnet_id":"vnet-guid-1","attr":[{"vlan_id":3,"ip_prefix":"10.0.4.1/24"},{"vlan_id":4,"ip_prefix":"10.0.3.1/24"}]}
k_vnet2 = {"vnet_id":"vnet-guid-2","attr":[{"vlan_id":5,"ip_prefix":"10.2.4.1/24"},{"vlan_id":6,"ip_prefix":"10.2.3.1/24"}]}
k_vnet1 = {"vnet_id":"vnet-guid-1","attr":[{"vlan_id":3,"ip_prefix":"10.0.4.0/24"},{"vlan_id":4,"ip_prefix":"10.0.3.0/24"}]}
k_vnet2 = {"vnet_id":"vnet-guid-2","attr":[{"vlan_id":5,"ip_prefix":"10.2.4.0/24"},{"vlan_id":6,"ip_prefix":"10.2.3.0/24"}]}
for key,value in j_vnet1.iteritems():
if type(value)!=list:
#print("not type list",value)
Expand All @@ -624,18 +624,18 @@ def test_get_vlans_per_vnetid_4digitvlans(self):
self.post_config_vrouter_vrf_id('vnet-guid-1', {'vnid': 1001})
self.post_config_vrouter_vrf_id('vnet-guid-2', {'vnid': 2002})
#create vlan interfaces
self.post_config_vlan(1111, {'vnet_id' : 'vnet-guid-1', 'ip_prefix':'10.0.1.1/24'})
self.post_config_vlan(2222, {'vnet_id' : 'vnet-guid-1', 'ip_prefix':'10.0.2.1/24'})
self.post_config_vlan(1111, {'vnet_id' : 'vnet-guid-1', 'ip_prefix':'10.0.1.0/24'})
self.post_config_vlan(2222, {'vnet_id' : 'vnet-guid-1', 'ip_prefix':'10.0.2.0/24'})
self.post_config_vlan(3000, {'vnet_id' : 'vnet-guid-2'})
self.post_config_vlan(4000, {'vnet_id' : 'vnet-guid-2', 'ip_prefix':'10.2.2.1/24'})
self.post_config_vlan(4000, {'vnet_id' : 'vnet-guid-2', 'ip_prefix':'10.2.2.0/24'})

# get vlans for vnet-guid-1
r = self.get_config_interface_vlans('vnet-guid-1')
j = json.loads(r.text)
r2 = self.get_config_interface_vlans('vnet-guid-2')
j2 = json.loads(r2.text)
k = {"vnet_id":"vnet-guid-1","attr":[{"vlan_id":1111,"ip_prefix":"10.0.1.1/24"},{"vlan_id":2222,"ip_prefix":"10.0.2.1/24"}]}
k2 = {"vnet_id":"vnet-guid-2","attr":[{"vlan_id":3000},{"vlan_id":4000,"ip_prefix":"10.2.2.1/24"}]}
k = {"vnet_id":"vnet-guid-1","attr":[{"vlan_id":1111,"ip_prefix":"10.0.1.0/24"},{"vlan_id":2222,"ip_prefix":"10.0.2.0/24"}]}
k2 = {"vnet_id":"vnet-guid-2","attr":[{"vlan_id":3000},{"vlan_id":4000,"ip_prefix":"10.2.2.0/24"}]}
for key,value in j.iteritems():
if type(value)!=list:
#print("not type list",value)
Expand All @@ -660,13 +660,13 @@ def test_get_all_vlans(self):
# create vnet_id/vrf
self.post_config_vrouter_vrf_id('vnet-guid-1', {'vnid': 1001})
#create vlan interfaces
self.post_config_vlan(3000, {'vnet_id' : 'vnet-guid-1', 'ip_prefix':'10.0.1.1/24'})
self.post_config_vlan(3000, {'vnet_id' : 'vnet-guid-1', 'ip_prefix':'10.0.1.0/24'})
self.post_config_vlan(3001, {'vnet_id' : 'vnet-guid-1'})

# get all vlans
r = self.get_config_vlans_all()
j = json.loads(r.text)
k = {"attr":[{"vlan_id":3000,"ip_prefix":"10.0.1.1/24","vnet_id":"vnet-guid-1"},{"vlan_id":3001,"vnet_id":"vnet-guid-1"}]}
k = {"attr":[{"vlan_id":3000,"ip_prefix":"10.0.1.0/24","vnet_id":"vnet-guid-1"},{"vlan_id":3001,"vnet_id":"vnet-guid-1"}]}
for key,value in j.iteritems():
if type(value)!=list:
self.assertEqual(k[key],j[key])
Expand All @@ -681,7 +681,7 @@ def test_vlan_member_tagged_untagged_interop(self):
vlans = [3,4]
members = ["Ethernet2", "Ethernet3", "Ethernet4"]
self.post_generic_vrouter_and_deps()
r = self.post_config_vlan(vlan0, {'vnet_id' : 'vnet-guid-1', 'ip_prefix':'10.0.1.1/24'})
r = self.post_config_vlan(vlan0, {'vnet_id' : 'vnet-guid-1', 'ip_prefix':'10.0.1.0/24'})
self.assertEqual(r.status_code, 204)
for member in members:
r = self.post_config_vlan_member(vlan0, member, {'tagging_mode' : 'untagged'})
Expand All @@ -695,7 +695,7 @@ def test_vlan_member_tagged_untagged_interop(self):
'attr': {'tagging_mode' : 'untagged'}
})
for vlan in vlans:
r = self.post_config_vlan(vlan, {'vnet_id' : 'vnet-guid-1', 'ip_prefix':'10.0.1.1/24'})
r = self.post_config_vlan(vlan, {'vnet_id' : 'vnet-guid-1', 'ip_prefix':'10.0.1.0/24'})
self.assertEqual(r.status_code, 204)
# post
for member in members:
Expand All @@ -717,7 +717,7 @@ def test_vlan_member_tagging_all_verbs(self):
members = ['Ethernet2', 'Ethernet3']
self.post_generic_vrouter_and_deps()
for vlan in vlans:
r = self.post_config_vlan(vlan, {'vnet_id' : 'vnet-guid-1', 'ip_prefix':'10.0.1.1/24'})
r = self.post_config_vlan(vlan, {'vnet_id' : 'vnet-guid-1', 'ip_prefix':'10.0.1.0/24'})
self.assertEqual(r.status_code, 204)
# post
for member in members:
Expand Down Expand Up @@ -768,7 +768,7 @@ def test_get_members_per_vlan(self):
# create vnet_id/vrf
self.post_config_vrouter_vrf_id('vnet-guid-1', {'vnid': 1001})
#create vlan interface 2
self.post_config_vlan(2, {'vnet_id' : 'vnet-guid-1', 'ip_prefix':'10.0.1.1/24'})
self.post_config_vlan(2, {'vnet_id' : 'vnet-guid-1', 'ip_prefix':'10.0.1.0/24'})
members = ["Ethernet2", "Ethernet3", "Ethernet4"]
for member in members:
self.post_config_vlan_member(2, member, {'tagging_mode' : 'untagged'})
Expand Down Expand Up @@ -811,7 +811,7 @@ def test_get_neighbors_per_vlan(self):
# create vnet_id/vrf
self.post_config_vrouter_vrf_id('vnet-guid-1', {'vnid': 1001})
#create vlan interface 2
self.post_config_vlan(3, {'vnet_id' : 'vnet-guid-1', 'ip_prefix':'10.0.2.1/24'})
self.post_config_vlan(3, {'vnet_id' : 'vnet-guid-1', 'ip_prefix':'10.0.2.0/24'})
self.post_config_vlan_neighbor(3, "10.10.20.10")
self.post_config_vlan_neighbor(3, "10.10.30.10")

Expand Down Expand Up @@ -891,9 +891,18 @@ def test_patch_routes_drop_bm_routes_tunnel(self):
self.assertEqual(r.status_code, 204)
routes = []
for i in range (1,7):
for ci in cidr:
routes.append({'cmd':'add',
'ip_prefix':'10.1.'+str(i)+'.1/'+str(ci),
routes.append({'cmd':'add',
'ip_prefix':'10.1.'+str(i)+'.0/'+str(24),
'nexthop':'34.53.'+str(i)+'.0',
'vnid': 1 + i%5,
'mac_address':'00:08:aa:bb:cd:'+hex(15+i)[2:]})
routes.append({'cmd':'add',
'ip_prefix':'10.1.'+str(i)+'.0/'+str(30),
'nexthop':'34.53.'+str(i)+'.0',
'vnid': 1 + i%5,
'mac_address':'00:08:aa:bb:cd:'+hex(15+i)[2:]})
routes.append({'cmd':'add',
'ip_prefix':'10.1.'+str(i)+'.1/'+str(32),
'nexthop':'34.53.'+str(i)+'.0',
'vnid': 1 + i%5,
'mac_address':'00:08:aa:bb:cd:'+hex(15+i)[2:]})
Expand Down Expand Up @@ -927,15 +936,22 @@ def test_patch_routes_drop_bm_routes_tunnel(self):
def test_patch_routes_drop_bm_routes_local(self):
cidr = [24,30,32]
self.post_generic_vrouter_and_deps()
rv = self.post_config_vlan(2, {'vnet_id':'vnet-guid-1', 'ip_prefix':'10.1.1.0/24'})
rv = self.post_config_vlan(2, {'vnet_id':'vnet-guid-1', 'ip_prefix':'10.1.3.0/24'})
self.assertEqual(rv.status_code, 204)
r = self.post_config_vlan(3, {'vnet_id':'vnet-guid-1', 'ip_prefix':'10.1.5.0/24'})
self.assertEqual(r.status_code, 204)
routes = []
for i in range (1,7):
for ci in cidr:
routes.append({'cmd':'add',
'ip_prefix':'10.1.'+str(i)+'.1/'+str(ci),
routes.append({'cmd':'add',
'ip_prefix':'10.1.'+str(i)+'.0/'+str(24),
'nexthop':'34.53.'+str(i)+'.0',
'ifname': 'Vlan3005'})
routes.append({'cmd':'add',
'ip_prefix':'10.1.'+str(i)+'.0/'+str(30),
'nexthop':'34.53.'+str(i)+'.0',
'ifname': 'Vlan3005'})
routes.append({'cmd':'add',
'ip_prefix':'10.1.'+str(i)+'.1/'+str(32),
'nexthop':'34.53.'+str(i)+'.0',
'ifname': 'Vlan3005'})

Expand All @@ -951,13 +967,12 @@ def test_patch_routes_drop_bm_routes_local(self):
else:
routes_not_bm.append(route)
self.check_routes_exist_in_loc_route_tb(1, routes_not_bm)
logging.warning(routes_not_bm)
self.check_routes_dont_exist_in_loc_route_tb(1, routes_bm)

r = self.get_config_vrouter_vrf_id_routes("vnet-guid-1")
self.assertEqual(r.status_code, 200)
j = json.loads(r.text)
j.remove({'nexthop': '', 'ifname': 'Vlan3', 'ip_prefix': '10.1.5.0/24'})
j.remove({'nexthop': '', 'ifname': 'Vlan2', 'ip_prefix': '10.1.1.0/24'})
self.assertItemsEqual(j, routes_not_bm)
for route in routes_bm:
route['cmd'] = 'delete'
Expand Down