From 49261a55c3f9198a4d1bbf1c2913263d6d77451c Mon Sep 17 00:00:00 2001 From: Andrej Kozemcak Date: Tue, 12 Jul 2016 09:13:31 +0200 Subject: CSIT-203: Expand LISP test - Change LISP configuration and test if LISP tunnel still work. Change-Id: I28426d7cc0ede11aa7e826ab40ed1c95c8606abc Signed-off-by: Andrej Kozemcak --- resources/libraries/python/LispSetup.py | 4 +- resources/libraries/robot/lisp/lisp_api.robot | 2 +- .../robot/lisp/lisp_static_adjacency.robot | 72 +++++++++++++++++++++- .../templates/vat/lisp/del_lisp_adjacency.vat | 1 + .../lisp/static_adjacency/lisp_static_adjacency.py | 24 ++++++++ 5 files changed, 99 insertions(+), 4 deletions(-) create mode 100644 resources/templates/vat/lisp/del_lisp_adjacency.vat (limited to 'resources') diff --git a/resources/libraries/python/LispSetup.py b/resources/libraries/python/LispSetup.py index 13d0501abb..531510198c 100644 --- a/resources/libraries/python/LispSetup.py +++ b/resources/libraries/python/LispSetup.py @@ -99,7 +99,7 @@ class LispRemoteMapping(object): 'lisp/del_lisp_remote_mapping.vat', vni=vni, deid=deid, - deid_predix=deid_prefix, + deid_prefix=deid_prefix, seid=seid, seid_prefix=seid_prefix, rloc=rloc) @@ -159,7 +159,7 @@ class LispAdjacency(object): 'lisp/del_lisp_adjacency.vat', vni=vni, deid=deid, - deid_predix=deid_prefix, + deid_prefix=deid_prefix, seid=seid, seid_prefix=seid_prefix) diff --git a/resources/libraries/robot/lisp/lisp_api.robot b/resources/libraries/robot/lisp/lisp_api.robot index 8d0a98c630..faffeb3921 100644 --- a/resources/libraries/robot/lisp/lisp_api.robot +++ b/resources/libraries/robot/lisp/lisp_api.robot @@ -130,7 +130,7 @@ | | ... | *Arguments:* | | ... | - dut_node - DUT node. Type: dictionary | | ... | - locator_set_number - Number how many locator_set data -| | ... | it will generate. Type: int +| | ... | it will generate. Type: integer | | ... | | ... | *Return:* | | ... | - No value returned diff --git a/resources/libraries/robot/lisp/lisp_static_adjacency.robot b/resources/libraries/robot/lisp/lisp_static_adjacency.robot index 79e26c5dc9..92d62eb549 100644 --- a/resources/libraries/robot/lisp/lisp_static_adjacency.robot +++ b/resources/libraries/robot/lisp/lisp_static_adjacency.robot @@ -19,6 +19,7 @@ | Library | resources.libraries.python.LispSetup.LispLocalEid | Library | resources.libraries.python.LispSetup.LispAdjacency | Library | resources.libraries.python.LispSetup.LispRemoteMapping +| Library | resources.libraries.python.IPv4Util.IPv4Util *** Keywords *** | Set up Lisp topology @@ -95,4 +96,73 @@ | | ... | ${dut2_static_adjacency['deid']} | | ... | ${dut2_static_adjacency['prefix']} | | ... | ${dut2_static_adjacency['seid']} -| | ... | ${dut2_static_adjacency['prefix']} \ No newline at end of file +| | ... | ${dut2_static_adjacency['prefix']} + +| Change Lisp Configuration +| | [Documentation] | Change configuration of the Lisp protocol. +| | ... +| | ... | *Arguments:* +| | ... | - dut1_node - DUT1 node. Type: dictionary +| | ... | - dut2_node - DUT2 node. Type: dictionary +| | ... | - dut1_to_dut2 - DUT1 towards DUT2 interface name. Type: string +| | ... | - dut2_to_dut1 - DUT2 towards DUT1 interface name. Type: string +| | ... | - dut1_to_dut2_mac - DUT1 towards DUT2 interface mac address. + Type: string +| | ... | - dut2_to_dut1_mac - DUT2 towards DUT1 interface mac address. + Type: string +| | ... | - new_dut1_ip - New DUT1 towards DUT2 interface IP address. + Type: string +| | ... | - new_dut2_ip - New DUT2 towards DUT1 interface IP address. + Type: string +| | ... | - prefix - Prefix of the DUT nodes. Type: integer +| | ... | - old_dut1_static_adjacency - Old DUT1 static adjacency. +| | ... | Type: dictionary +| | ... | - new_dut1_static_adjacency - New DUT1 static adjacency. +| | ... | Type: dictionary +| | ... +| | ... | *Return:* +| | ... | - No value returned +| | ... +| | ... | *Example:* +| | ... | \| Change Lisp Configuration \| ${dut1_node} \| ${dut2_node} \ +| | ... | \| ${dut1_to_dut2} \| ${dut2_to_dut1} | "08:00:27:20:e0:0d" \ +| | ... | \| "08:00:27:b1:94:b1" \| "6.3.0.1" \| "6.3.0.20" \| "24" \ +| | ... | \| ${old_dut1_static_adjacency} \| ${new_dut1_static_adjacency} \| +| | ... +| | [Arguments] | ${dut1_node} | ${dut2_node} | ${dut1_to_dut2} +| | ... | ${dut2_to_dut1} | ${dut1_to_dut2_mac} | ${dut2_to_dut1_mac} +| | ... | ${new_dut1_ip} | ${new_dut2_ip} | ${prefix} +| | ... | ${old_dut1_static_adjacency} | ${new_dut1_static_adjacency} +| | Flush IPv4 Addresses "${dut2_to_dut1}" "${dut2_node}" +| | Vpp Del Lisp Remote Mapping | ${dut1_node} +| | ... | ${old_dut1_static_adjacency['vni']} +| | ... | ${old_dut1_static_adjacency['deid']} +| | ... | ${old_dut1_static_adjacency['prefix']} +| | ... | ${old_dut1_static_adjacency['seid']} +| | ... | ${old_dut1_static_adjacency['prefix']} +| | ... | ${old_dut1_static_adjacency['rloc']} +| | Vpp Del Lisp Adjacency | ${dut1_node} +| | ... | ${old_dut1_static_adjacency['vni']} +| | ... | ${old_dut1_static_adjacency['deid']} +| | ... | ${old_dut1_static_adjacency['prefix']} +| | ... | ${old_dut1_static_adjacency['seid']} +| | ... | ${old_dut1_static_adjacency['prefix']} +| | Set Interface Address | ${dut2_node} | ${dut2_to_dut1} +| | ... | ${new_dut2_ip} | ${prefix} +| | Add Arp On Dut | ${dut1_node} | ${dut1_to_dut2} | ${new_dut2_ip} +| | ... | ${dut2_to_dut1_mac} +| | Add Arp On Dut | ${dut2_node} | ${dut2_to_dut1} | ${new_dut1_ip} +| | ... | ${dut1_to_dut2_mac} +| | Vpp Add Lisp Remote Mapping | ${dut1_node} +| | ... | ${new_dut1_static_adjacency['vni']} +| | ... | ${new_dut1_static_adjacency['deid']} +| | ... | ${new_dut1_static_adjacency['prefix']} +| | ... | ${new_dut1_static_adjacency['seid']} +| | ... | ${new_dut1_static_adjacency['prefix']} +| | ... | ${new_dut1_static_adjacency['rloc']} +| | Vpp Add Lisp Adjacency | ${dut1_node} +| | ... | ${new_dut1_static_adjacency['vni']} +| | ... | ${new_dut1_static_adjacency['deid']} +| | ... | ${new_dut1_static_adjacency['prefix']} +| | ... | ${new_dut1_static_adjacency['seid']} +| | ... | ${new_dut1_static_adjacency['prefix']} diff --git a/resources/templates/vat/lisp/del_lisp_adjacency.vat b/resources/templates/vat/lisp/del_lisp_adjacency.vat new file mode 100644 index 0000000000..f4eca487e9 --- /dev/null +++ b/resources/templates/vat/lisp/del_lisp_adjacency.vat @@ -0,0 +1 @@ +lisp_add_del_adjacency del vni {vni} deid {deid}/{deid_prefix} seid {seid}/{seid_prefix} diff --git a/resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py b/resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py index de7aff068d..b3af598d58 100644 --- a/resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py +++ b/resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py @@ -47,6 +47,12 @@ dut2_ip4_eid = {'locator_name': locator_name, 'vni': 0, 'eid': '6.0.2.0', 'prefix': 24} +dut2_to_dut1_ip4_reconf= '6.0.3.20' +dut1_to_dut2_ip4_static_adjacency_reconf = {'vni': 0, + 'deid': '6.0.2.0', + 'seid': '6.0.1.0', + 'rloc': '6.0.3.20', + 'prefix': 24} # IPv6 Lisp static mapping configuration dut1_to_dut2_ip6 = '6:0:3::1' @@ -74,6 +80,12 @@ dut2_ip6_eid = {'locator_name': locator_name, 'vni': 0, 'eid': '6:0:2::0', 'prefix': 64} +dut2_to_dut1_ip6_reconf= '6:0:3::20' +dut1_to_dut2_ip6_static_adjacency_reconf = {'vni': 0, + 'deid': '6:0:2::0', + 'seid': '6:0:1::0', + 'rloc': '6:0:3::20', + 'prefix': 64} # IPv4 over IPv6 Lisp static mapping configuration dut1_to_dut2_ip4o6 = '6:0:3::1' @@ -102,6 +114,12 @@ dut2_ip4o6_eid = {'locator_name': locator_name, 'vni': 0, 'eid': '6.0.2.0', 'prefix': 24} +dut2_to_dut1_ip4o6_reconf= '6:0:3::20' +dut1_ip4o6_static_adjacency_reconf = {'vni': 0, + 'deid': '6.0.2.0', + 'seid': '6.0.1.0', + 'rloc': '6:0:3::20', + 'prefix': 24} # IPv6 over IPv4 Lisp static mapping configuration dut1_to_dut2_ip6o4 = '6.0.3.1' @@ -130,3 +148,9 @@ dut2_ip6o4_eid = {'locator_name': locator_name, 'vni': 0, 'eid': '6:0:2::0', 'prefix': 64} +dut2_to_dut1_ip6o4_reconf= '6.0.3.20' +dut1_ip6o4_static_adjacency_reconf = {'vni': 0, + 'deid': '6:0:2::0', + 'seid': '6:0:1::0', + 'rloc': '6.0.3.20', + 'prefix': 64} -- cgit 1.2.3-korg