From: Brady Johnson Date: Tue, 9 Feb 2016 11:45:14 +0000 (+0100) Subject: Changes to fix SFC clustering tests X-Git-Tag: release/beryllium-sr1~115 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=dec76e5bee2b62509e58271ba3953b03df95c8a7 Changes to fix SFC clustering tests - updates to SFC yang files to reflect changed model - Patch Set 2 : rebase - Patch Set 3 : Fixed SFF config after manually testing all the changed JSONs locally. - Patch Set 4 : rebase - Patch Set 5 : Fixed other erroneous SFC JSON files Change-Id: Ibba9a310c159735c54c0952639d5370a13912000 Signed-off-by: Brady Johnson --- diff --git a/csit/variables/sfc/service-function-chains.json b/csit/variables/sfc/service-function-chains.json index 1274039d48..b485e2b07d 100644 --- a/csit/variables/sfc/service-function-chains.json +++ b/csit/variables/sfc/service-function-chains.json @@ -6,17 +6,17 @@ "sfc-service-function": [ { "name": "dpi-abstract1", - "type": "service-function-type:dpi", + "type": "dpi", "order" : 0 }, { "name": "napt44-abstract1", - "type": "service-function-type:napt44", + "type": "napt44", "order" : 1 }, { "name": "firewall-abstract1", - "type": "service-function-type:firewall", + "type": "firewall", "order" : 2 } ] @@ -26,16 +26,16 @@ "sfc-service-function": [ { "name": "firewall-abstract2", - "type": "service-function-type:firewall", + "type": "firewall", "order" : 0 }, { "name": "napt44-abstract2", - "type": "service-function-type:napt44", + "type": "napt44", "order" : 1 } ] } ] } -} \ No newline at end of file +} diff --git a/csit/variables/sfc/service-function-forwarders.json b/csit/variables/sfc/service-function-forwarders.json index a1758dc6d9..2a361bf7e0 100644 --- a/csit/variables/sfc/service-function-forwarders.json +++ b/csit/variables/sfc/service-function-forwarders.json @@ -18,19 +18,17 @@ "service-function-dictionary": [ { "sff-sf-data-plane-locator": { - "port": 5000, - "ip": "10.1.1.1" + "sf-dpl-name": "SF1-DPL", + "sff-dpl-name": "eth0" }, - "name": "SF1", - "type": "service-function-type:dpi" + "name": "SF1" }, { "sff-sf-data-plane-locator": { - "port": 5000, - "ip": "10.1.1.2" + "sf-dpl-name": "SF2-DPL", + "sff-dpl-name": "eth0" }, - "name": "SF2", - "type": "service-function-type:firewall" + "name": "SF2" } ], "connected-sff-dictionary": [ @@ -60,19 +58,17 @@ "service-function-dictionary": [ { "sff-sf-data-plane-locator": { - "port": 5000, - "ip": "10.1.1.5" + "sf-dpl-name": "SF5-DPL", + "sff-dpl-name": "eth0" }, - "name": "SF5", - "type": "service-function-type:dpi" + "name": "SF5" }, { "sff-sf-data-plane-locator": { - "port": 5000, - "ip": "10.1.1.6" + "sf-dpl-name": "SF6-DPL", + "sff-dpl-name": "eth0" }, - "name": "SF6", - "type": "service-function-type:napt44" + "name": "SF6" } ], "connected-sff-dictionary": [ diff --git a/csit/variables/sfc/service-functions.json b/csit/variables/sfc/service-functions.json index 8d42773f9d..5e1e7aed52 100644 --- a/csit/variables/sfc/service-functions.json +++ b/csit/variables/sfc/service-functions.json @@ -13,7 +13,7 @@ } ], "name": "napt44-103-2", - "type": "service-function-type:napt44", + "type": "napt44", "nsh-aware": true }, { @@ -28,7 +28,7 @@ } ], "name": "napt44-103-1", - "type": "service-function-type:napt44", + "type": "napt44", "nsh-aware": true }, { @@ -43,7 +43,7 @@ } ], "name": "dpi-102-2", - "type": "service-function-type:dpi", + "type": "dpi", "nsh-aware": true }, { @@ -58,7 +58,7 @@ } ], "name": "firewall-101-2", - "type": "service-function-type:firewall", + "type": "firewall", "nsh-aware": true }, { @@ -73,7 +73,7 @@ } ], "name": "napt44-104", - "type": "service-function-type:napt44", + "type": "napt44", "nsh-aware": true }, { @@ -88,7 +88,7 @@ } ], "name": "dpi-102-1", - "type": "service-function-type:dpi", + "type": "dpi", "nsh-aware": true }, { @@ -103,7 +103,7 @@ } ], "name": "firewall-104", - "type": "service-function-type:firewall", + "type": "firewall", "nsh-aware": true }, { @@ -118,7 +118,7 @@ } ], "name": "dpi-102-3", - "type": "service-function-type:dpi", + "type": "dpi", "nsh-aware": true }, { @@ -133,7 +133,7 @@ } ], "name": "firewall-101-1", - "type": "service-function-type:firewall", + "type": "firewall", "nsh-aware": true } ] diff --git a/csit/variables/sfc/sf_dpi_102_100.json b/csit/variables/sfc/sf_dpi_102_100.json index 8acbc95d1e..64f0a89265 100644 --- a/csit/variables/sfc/sf_dpi_102_100.json +++ b/csit/variables/sfc/sf_dpi_102_100.json @@ -2,7 +2,7 @@ "service-function": [ { "name": "dpi-102-100", - "type": "service-function-type:dpi", + "type": "dpi", "nsh-aware": true, "sf-data-plane-locator": [ { diff --git a/csit/variables/sfc/sfc_chain_100.json b/csit/variables/sfc/sfc_chain_100.json index f8702a1faa..a10950b9bc 100644 --- a/csit/variables/sfc/sfc_chain_100.json +++ b/csit/variables/sfc/sfc_chain_100.json @@ -6,17 +6,17 @@ { "name": "dpi-abstract100", "order": 0, - "type": "service-function-type:firewall" + "type": "firewall" }, { "name": "napt44-abstract100", "order": 1, - "type": "service-function-type:dpi" + "type": "dpi" }, { "name": "firewall-abstract100", "order": 2, - "type": "service-function-type:napt44" + "type": "napt44" } ] } diff --git a/csit/variables/sfc/sfc_chain_100_sfids.json b/csit/variables/sfc/sfc_chain_100_sfids.json index d6d6025a76..c6a77a705b 100644 --- a/csit/variables/sfc/sfc_chain_100_sfids.json +++ b/csit/variables/sfc/sfc_chain_100_sfids.json @@ -3,7 +3,7 @@ { "name": "ids-abstract100", "order": 3, - "type": "service-function-type:ids" + "type": "ids" } ] } diff --git a/csit/variables/sfc/sff_ovs_100.json b/csit/variables/sfc/sff_ovs_100.json index b9fcad65ec..645e61822b 100644 --- a/csit/variables/sfc/sff_ovs_100.json +++ b/csit/variables/sfc/sff_ovs_100.json @@ -17,11 +17,10 @@ "service-function-dictionary": [ { "sff-sf-data-plane-locator": { - "port": 6000, - "ip": "10.1.1.7" + "sf-dpl-name": "SF7-DPL", + "sff-dpl-name": "eth0" }, - "name": "SF7", - "type": "service-function-type:dpi" + "name": "SF7" } ] } diff --git a/csit/variables/sfc/sff_sfd_locator.json b/csit/variables/sfc/sff_sfd_locator.json index 50dc19dbfb..23ef837216 100644 --- a/csit/variables/sfc/sff_sfd_locator.json +++ b/csit/variables/sfc/sff_sfd_locator.json @@ -1,6 +1,6 @@ { "sff-sf-data-plane-locator": { - "ip": "10.1.1.1", - "port": 6000 + "sf-dpl-name": "SF2-DPL", + "sff-dpl-name": "eth0" } } diff --git a/csit/variables/sfc/sff_sfd_sf100.json b/csit/variables/sfc/sff_sfd_sf100.json index 7449c96076..e33c050ad0 100644 --- a/csit/variables/sfc/sff_sfd_sf100.json +++ b/csit/variables/sfc/sff_sfd_sf100.json @@ -3,10 +3,9 @@ { "name": "SF100", "sff-sf-data-plane-locator": { - "ip": "10.1.1.1", - "port": 5100 - }, - "type": "service-function-type:napt44" + "sf-dpl-name": "SF2-DPL", + "sff-dpl-name": "eth0" + } } ] }