Fixed data for GBP CSIT tests for Li and Master branch. 24/30524/9
authorDileep <dileep.ranganathan@intel.com>
Wed, 2 Dec 2015 15:06:50 +0000 (07:06 -0800)
committerGerrit Code Review <gerrit@opendaylight.org>
Mon, 7 Dec 2015 09:42:24 +0000 (09:42 +0000)
See - https://git.opendaylight.org/gerrit/30392

Change-Id: I09ab68d48504d7c1d8cc902ed156bdd940332710
Signed-off-by: Dileep <dileep.ranganathan@intel.com>
96 files changed:
csit/suites/groupbasedpolicy/Clustering_Datastore/020_simple_clustering.robot
csit/suites/groupbasedpolicy/GBP/3-node/Variables.robot [changed mode: 0755->0644]
csit/suites/groupbasedpolicy/GBP/3-node/__init__.robot
csit/suites/groupbasedpolicy/GBP_Basic/020_gbp_tenant.robot
csit/variables/gbp/3node/lithium/demo-gbp1/vethl-h35_2.json [moved from csit/variables/gbp/3node/demo-gbp1/vethl-h35_2.json with 100% similarity]
csit/variables/gbp/3node/lithium/demo-gbp1/vethl-h35_3.json [moved from csit/variables/gbp/3node/demo-gbp1/vethl-h35_3.json with 100% similarity]
csit/variables/gbp/3node/lithium/demo-gbp1/vethl-h35_4.json [moved from csit/variables/gbp/3node/demo-gbp1/vethl-h35_4.json with 100% similarity]
csit/variables/gbp/3node/lithium/demo-gbp1/vethl-h35_5.json [moved from csit/variables/gbp/3node/demo-gbp1/vethl-h35_5.json with 100% similarity]
csit/variables/gbp/3node/lithium/demo-gbp1/vethl-h36_2.json [moved from csit/variables/gbp/3node/demo-gbp1/vethl-h36_2.json with 100% similarity]
csit/variables/gbp/3node/lithium/demo-gbp1/vethl-h36_3.json [moved from csit/variables/gbp/3node/demo-gbp1/vethl-h36_3.json with 100% similarity]
csit/variables/gbp/3node/lithium/demo-gbp1/vethl-h36_4.json [moved from csit/variables/gbp/3node/demo-gbp1/vethl-h36_4.json with 100% similarity]
csit/variables/gbp/3node/lithium/demo-gbp1/vethl-h36_5.json [moved from csit/variables/gbp/3node/demo-gbp1/vethl-h36_5.json with 100% similarity]
csit/variables/gbp/3node/lithium/demo-gbp2/vethl-h35_2.json [moved from csit/variables/gbp/3node/demo-gbp2/vethl-h35_2.json with 100% similarity]
csit/variables/gbp/3node/lithium/demo-gbp2/vethl-h35_3.json [moved from csit/variables/gbp/3node/demo-gbp2/vethl-h35_3.json with 100% similarity]
csit/variables/gbp/3node/lithium/demo-gbp2/vethl-h35_4.json [moved from csit/variables/gbp/3node/demo-gbp2/vethl-h35_4.json with 100% similarity]
csit/variables/gbp/3node/lithium/demo-gbp2/vethl-h35_5.json [moved from csit/variables/gbp/3node/demo-gbp2/vethl-h35_5.json with 100% similarity]
csit/variables/gbp/3node/lithium/demo-gbp2/vethl-h35_6.json [moved from csit/variables/gbp/3node/demo-gbp2/vethl-h35_6.json with 100% similarity]
csit/variables/gbp/3node/lithium/demo-gbp2/vethl-h35_7.json [moved from csit/variables/gbp/3node/demo-gbp2/vethl-h35_7.json with 100% similarity]
csit/variables/gbp/3node/lithium/demo-gbp2/vethl-h35_8.json [moved from csit/variables/gbp/3node/demo-gbp2/vethl-h35_8.json with 100% similarity]
csit/variables/gbp/3node/lithium/demo-gbp2/vethl-h35_9.json [moved from csit/variables/gbp/3node/demo-gbp2/vethl-h35_9.json with 100% similarity]
csit/variables/gbp/3node/lithium/demo-gbp2/vethl-h36_2.json [moved from csit/variables/gbp/3node/demo-gbp2/vethl-h36_2.json with 100% similarity]
csit/variables/gbp/3node/lithium/demo-gbp2/vethl-h36_3.json [moved from csit/variables/gbp/3node/demo-gbp2/vethl-h36_3.json with 100% similarity]
csit/variables/gbp/3node/lithium/demo-gbp2/vethl-h36_4.json [moved from csit/variables/gbp/3node/demo-gbp2/vethl-h36_4.json with 100% similarity]
csit/variables/gbp/3node/lithium/demo-gbp2/vethl-h36_5.json [moved from csit/variables/gbp/3node/demo-gbp2/vethl-h36_5.json with 100% similarity]
csit/variables/gbp/3node/lithium/demo-gbp2/vethl-h36_6.json [moved from csit/variables/gbp/3node/demo-gbp2/vethl-h36_6.json with 100% similarity]
csit/variables/gbp/3node/lithium/demo-gbp2/vethl-h36_7.json [moved from csit/variables/gbp/3node/demo-gbp2/vethl-h36_7.json with 100% similarity]
csit/variables/gbp/3node/lithium/demo-gbp2/vethl-h36_8.json [moved from csit/variables/gbp/3node/demo-gbp2/vethl-h36_8.json with 100% similarity]
csit/variables/gbp/3node/lithium/demo-gbp2/vethl-h36_9.json [moved from csit/variables/gbp/3node/demo-gbp2/vethl-h36_9.json with 100% similarity]
csit/variables/gbp/3node/lithium/tenant1.json [moved from csit/variables/gbp/tenant1.json with 79% similarity]
csit/variables/gbp/3node/lithium/tenant2.json [moved from csit/variables/gbp/3node/tenant2.json with 94% similarity]
csit/variables/gbp/3node/master/demo-gbp1/vethl-h35_2.json [new file with mode: 0644]
csit/variables/gbp/3node/master/demo-gbp1/vethl-h35_3.json [new file with mode: 0644]
csit/variables/gbp/3node/master/demo-gbp1/vethl-h35_4.json [new file with mode: 0644]
csit/variables/gbp/3node/master/demo-gbp1/vethl-h35_5.json [new file with mode: 0644]
csit/variables/gbp/3node/master/demo-gbp1/vethl-h36_2.json [new file with mode: 0644]
csit/variables/gbp/3node/master/demo-gbp1/vethl-h36_3.json [new file with mode: 0644]
csit/variables/gbp/3node/master/demo-gbp1/vethl-h36_4.json [new file with mode: 0644]
csit/variables/gbp/3node/master/demo-gbp1/vethl-h36_5.json [new file with mode: 0644]
csit/variables/gbp/3node/master/demo-gbp2/vethl-h35_2.json [new file with mode: 0644]
csit/variables/gbp/3node/master/demo-gbp2/vethl-h35_3.json [new file with mode: 0644]
csit/variables/gbp/3node/master/demo-gbp2/vethl-h35_4.json [new file with mode: 0644]
csit/variables/gbp/3node/master/demo-gbp2/vethl-h35_5.json [new file with mode: 0644]
csit/variables/gbp/3node/master/demo-gbp2/vethl-h35_6.json [new file with mode: 0644]
csit/variables/gbp/3node/master/demo-gbp2/vethl-h35_7.json [new file with mode: 0644]
csit/variables/gbp/3node/master/demo-gbp2/vethl-h35_8.json [new file with mode: 0644]
csit/variables/gbp/3node/master/demo-gbp2/vethl-h35_9.json [new file with mode: 0644]
csit/variables/gbp/3node/master/demo-gbp2/vethl-h36_2.json [new file with mode: 0644]
csit/variables/gbp/3node/master/demo-gbp2/vethl-h36_3.json [new file with mode: 0644]
csit/variables/gbp/3node/master/demo-gbp2/vethl-h36_4.json [new file with mode: 0644]
csit/variables/gbp/3node/master/demo-gbp2/vethl-h36_5.json [new file with mode: 0644]
csit/variables/gbp/3node/master/demo-gbp2/vethl-h36_6.json [new file with mode: 0644]
csit/variables/gbp/3node/master/demo-gbp2/vethl-h36_7.json [new file with mode: 0644]
csit/variables/gbp/3node/master/demo-gbp2/vethl-h36_8.json [new file with mode: 0644]
csit/variables/gbp/3node/master/demo-gbp2/vethl-h36_9.json [new file with mode: 0644]
csit/variables/gbp/3node/master/tenant1.json [moved from csit/variables/gbp/tenants.json with 63% similarity]
csit/variables/gbp/3node/master/tenant2.json [new file with mode: 0644]
csit/variables/gbp/demo-asymmetric-chain/lithium/tenants.json [moved from csit/variables/gbp/demo-asymmetric-chain/tenants.json with 94% similarity]
csit/variables/gbp/demo-asymmetric-chain/lithium/vethl-h35_2.json [moved from csit/variables/gbp/demo-asymmetric-chain/vethl-h35_2.json with 100% similarity]
csit/variables/gbp/demo-asymmetric-chain/lithium/vethl-h35_3.json [moved from csit/variables/gbp/demo-asymmetric-chain/vethl-h35_3.json with 100% similarity]
csit/variables/gbp/demo-asymmetric-chain/lithium/vethl-h35_4.json [moved from csit/variables/gbp/demo-asymmetric-chain/vethl-h35_4.json with 100% similarity]
csit/variables/gbp/demo-asymmetric-chain/lithium/vethl-h35_5.json [moved from csit/variables/gbp/demo-asymmetric-chain/vethl-h35_5.json with 100% similarity]
csit/variables/gbp/demo-asymmetric-chain/lithium/vethl-h36_2.json [moved from csit/variables/gbp/demo-asymmetric-chain/vethl-h36_2.json with 100% similarity]
csit/variables/gbp/demo-asymmetric-chain/lithium/vethl-h36_3.json [moved from csit/variables/gbp/demo-asymmetric-chain/vethl-h36_3.json with 100% similarity]
csit/variables/gbp/demo-asymmetric-chain/lithium/vethl-h36_4.json [moved from csit/variables/gbp/demo-asymmetric-chain/vethl-h36_4.json with 100% similarity]
csit/variables/gbp/demo-asymmetric-chain/lithium/vethl-h36_5.json [moved from csit/variables/gbp/demo-asymmetric-chain/vethl-h36_5.json with 100% similarity]
csit/variables/gbp/demo-asymmetric-chain/master/tenants.json [new file with mode: 0644]
csit/variables/gbp/demo-asymmetric-chain/master/vethl-h35_2.json [new file with mode: 0644]
csit/variables/gbp/demo-asymmetric-chain/master/vethl-h35_3.json [new file with mode: 0644]
csit/variables/gbp/demo-asymmetric-chain/master/vethl-h35_4.json [new file with mode: 0644]
csit/variables/gbp/demo-asymmetric-chain/master/vethl-h35_5.json [new file with mode: 0644]
csit/variables/gbp/demo-asymmetric-chain/master/vethl-h36_2.json [new file with mode: 0644]
csit/variables/gbp/demo-asymmetric-chain/master/vethl-h36_3.json [new file with mode: 0644]
csit/variables/gbp/demo-asymmetric-chain/master/vethl-h36_4.json [new file with mode: 0644]
csit/variables/gbp/demo-asymmetric-chain/master/vethl-h36_5.json [new file with mode: 0644]
csit/variables/gbp/demo-symmetric-chain/lithium/tenants.json [moved from csit/variables/gbp/demo-symmetric-chain/tenants.json with 94% similarity]
csit/variables/gbp/demo-symmetric-chain/lithium/vethl-h35_2.json [moved from csit/variables/gbp/demo-symmetric-chain/vethl-h35_2.json with 100% similarity]
csit/variables/gbp/demo-symmetric-chain/lithium/vethl-h35_3.json [moved from csit/variables/gbp/demo-symmetric-chain/vethl-h35_3.json with 100% similarity]
csit/variables/gbp/demo-symmetric-chain/lithium/vethl-h35_4.json [moved from csit/variables/gbp/demo-symmetric-chain/vethl-h35_4.json with 100% similarity]
csit/variables/gbp/demo-symmetric-chain/lithium/vethl-h35_5.json [moved from csit/variables/gbp/demo-symmetric-chain/vethl-h35_5.json with 100% similarity]
csit/variables/gbp/demo-symmetric-chain/lithium/vethl-h36_2.json [moved from csit/variables/gbp/demo-symmetric-chain/vethl-h36_2.json with 100% similarity]
csit/variables/gbp/demo-symmetric-chain/lithium/vethl-h36_3.json [moved from csit/variables/gbp/demo-symmetric-chain/vethl-h36_3.json with 100% similarity]
csit/variables/gbp/demo-symmetric-chain/lithium/vethl-h36_4.json [moved from csit/variables/gbp/demo-symmetric-chain/vethl-h36_4.json with 100% similarity]
csit/variables/gbp/demo-symmetric-chain/lithium/vethl-h36_5.json [moved from csit/variables/gbp/demo-symmetric-chain/vethl-h36_5.json with 100% similarity]
csit/variables/gbp/demo-symmetric-chain/master/tenants.json [new file with mode: 0644]
csit/variables/gbp/demo-symmetric-chain/master/vethl-h35_2.json [new file with mode: 0644]
csit/variables/gbp/demo-symmetric-chain/master/vethl-h35_3.json [new file with mode: 0644]
csit/variables/gbp/demo-symmetric-chain/master/vethl-h35_4.json [new file with mode: 0644]
csit/variables/gbp/demo-symmetric-chain/master/vethl-h35_5.json [new file with mode: 0644]
csit/variables/gbp/demo-symmetric-chain/master/vethl-h36_2.json [new file with mode: 0644]
csit/variables/gbp/demo-symmetric-chain/master/vethl-h36_3.json [new file with mode: 0644]
csit/variables/gbp/demo-symmetric-chain/master/vethl-h36_4.json [new file with mode: 0644]
csit/variables/gbp/demo-symmetric-chain/master/vethl-h36_5.json [new file with mode: 0644]
csit/variables/gbp/lithium/tenant1.json [moved from csit/variables/gbp/3node/tenant1.json with 94% similarity]
csit/variables/gbp/lithium/tenants.json [new file with mode: 0644]
csit/variables/gbp/master/tenant1.json [new file with mode: 0644]
csit/variables/gbp/master/tenants.json [new file with mode: 0644]

index 9b46fedfa4aaa75a27f366446019b8700da2c40d..e15940e1f48fb21961d875a30085c4479e1d748f 100644 (file)
@@ -8,12 +8,13 @@ Library           OperatingSystem
 Variables         ../../../variables/Variables.py
 Resource          ../../../libraries/Utils.robot
 
-*** Variables ***
-${GBP_TENENT_ID}    f5c7d344-d1c7-4208-8531-2c2693657e12
-${GBP_TENANT1_API}    /restconf/config/policy:tenants/tenant/${GBP_TENENT_ID}
-${GBP_TENANT1_FILE}    ${CURDIR}/../../../variables/gbp/tenant1.json
-
 *** Test Cases ***
+Init Variables
+    [Documentation]    Initialize ODL version specific variables
+    log    ${ODL_VERSION}
+    Run Keyword If    '${ODL_VERSION}' == 'stable-lithium'    Init Variables Lithium
+    ...    ELSE    Init Variables Master
+
 Add Tenant to one node
     [Documentation]    Add one Tenant from JSON file
     Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
@@ -38,3 +39,15 @@ Read JSON From File
     ${body}    OperatingSystem.Get File    ${filepath}
     ${jsonbody}    To Json    ${body}
     [Return]    ${jsonbody}
+
+Init Variables Master
+    [Documentation]    Sets variables specific to latest(master) version
+    Set Suite Variable    ${GBP_TENANT_ID}    tenant-red
+    Set Suite Variable    ${GBP_TENANT1_API}    /restconf/config/policy:tenants/tenant/${GBP_TENANT_ID}
+    Set Suite Variable    ${GBP_TENANT1_FILE}    ${CURDIR}/../../../variables/gbp/master/tenant1.json
+
+Init Variables Lithium
+    [Documentation]    Sets variables specific to Lithium version
+    Set Suite Variable    ${GBP_TENANT_ID}    f5c7d344-d1c7-4208-8531-2c2693657e12
+    Set Suite Variable    ${GBP_TENANT1_API}    /restconf/config/policy:tenants/tenant/${GBP_TENANT_ID}
+    Set Suite Variable    ${GBP_TENANT1_FILE}    ${CURDIR}/../../../variables/gbp/lithium/tenant1.json
old mode 100755 (executable)
new mode 100644 (file)
index 45716c9..12e1383
@@ -1,5 +1,5 @@
 *** Settings ***
-Documentation     Global variables for GBPSFC 6-node topology
+Documentation     Global variables for GBPSFC 3-node topology
 Variables         ../../../../variables/Variables.py
 
 *** Variables ***
@@ -10,20 +10,12 @@ ${GBP1}           ${TOOLS_SYSTEM_IP}
 ${GBP2}           ${TOOLS_SYSTEM_2_IP}
 ${GBP3}           ${TOOLS_SYSTEM_3_IP}
 @{GBPs}           ${GBP1}    ${GBP2}    ${GBP3}
-${GBP_TENANT1_ID}    f5c7d344-d1c7-4208-8531-2c2693657e12
-${GBP_TENANT2_ID}    25c7d344-d1c7-4208-8531-2c2693657e12
-${TENANT1_PATH}    ${GBP_TENANTS_API}/tenant/${GBP_TENANT1_ID}
-${TENANT2_PATH}    ${GBP_TENANTS_API}/tenant/${GBP_TENANT2_ID}
 ${TUNNELS_PATH}    ${CONFIG_NODES_API}
 ${ENDPOINT_REG_PATH}    ${GBP_REGEP_API}
 ${ENDPOINT_UNREG_PATH}    ${GBP_UNREGEP_API}
 ${ENDPOINTS_OPER_PATH}    /restconf/operational/endpoint:endpoints
 ${OF_OVERLAY_CONFIG_PATH}    /restconf/config/ofoverlay:of-overlay-config
-${TENANT1_FILE}    ${CURDIR}/../../../../variables/gbp/3node/tenant1.json
-${TENANT2_FILE}    ${CURDIR}/../../../../variables/gbp/3node/tenant2.json
 ${TUNNELS_FILE}    ${CURDIR}/../../../../variables/gbp/3node/tunnels.json
-${ENDPOINTS_GBP1_DIR}    ${CURDIR}/../../../../variables/gbp/3node/demo-gbp1
-${ENDPOINTS_GBP2_DIR}    ${CURDIR}/../../../../variables/gbp/3node/demo-gbp2
 
 *** Keywords ***
 Set Test Variables
@@ -41,3 +33,31 @@ Set Test Variables
     Set Global Variable    ${DIFF_WEBSERVER_DOCKER}    ${diff_webserver_docker}
     Set Global Variable    ${DIFF_WEBSERVER_IP}    ${diff_webserver_ip}
     Set Global Variable    ${DIFF_WEBSERVER_MAC}    ${diff_webserver_mac}
+
+Init Variables
+    [Documentation]    Initialize ODL version specific variables
+    log    ${ODL_VERSION}
+    Run Keyword If    '${ODL_VERSION}' == 'stable-lithium'    Init Variables Lithium
+    ...    ELSE    Init Variables Master
+
+Init Variables Master
+    [Documentation]    Sets variables specific to latest(master) version
+    Set Global Variable    ${GBP_TENANT1_ID}    tenant-red
+    Set Global Variable    ${GBP_TENANT2_ID}    tenant-blue
+    Set Global Variable    ${TENANT1_PATH}    ${GBP_TENANTS_API}/policy:tenant/${GBP_TENANT1_ID}
+    Set Global Variable    ${TENANT2_PATH}    ${GBP_TENANTS_API}/policy:tenant/${GBP_TENANT2_ID}
+    Set Global Variable    ${TENANT1_FILE}    ${CURDIR}/../../../../variables/gbp/3node/master/tenant1.json
+    Set Global Variable    ${TENANT2_FILE}    ${CURDIR}/../../../../variables/gbp/3node/master/tenant2.json
+    Set Global Variable    ${ENDPOINTS_GBP1_DIR}    ${CURDIR}/../../../../variables/gbp/3node/master/demo-gbp1
+    Set Global Variable    ${ENDPOINTS_GBP2_DIR}    ${CURDIR}/../../../../variables/gbp/3node/master/demo-gbp2
+
+Init Variables Lithium
+    [Documentation]    Sets variables specific to Lithium version
+    Set Global Variable    ${GBP_TENANT1_ID}    f5c7d344-d1c7-4208-8531-2c2693657e12
+    Set Global Variable    ${GBP_TENANT2_ID}    25c7d344-d1c7-4208-8531-2c2693657e12
+    Set Global Variable    ${TENANT1_PATH}    ${GBP_TENANTS_API}/policy:tenant/${GBP_TENANT1_ID}
+    Set Global Variable    ${TENANT2_PATH}    ${GBP_TENANTS_API}/policy:tenant/${GBP_TENANT2_ID}
+    Set Global Variable    ${TENANT1_FILE}    ${CURDIR}/../../../../variables/gbp/3node/lithium/tenant1.json
+    Set Global Variable    ${TENANT2_FILE}    ${CURDIR}/../../../../variables/gbp/3node/lithium/tenant2.json
+    Set Global Variable    ${ENDPOINTS_GBP1_DIR}    ${CURDIR}/../../../../variables/gbp/3node/lithium/demo-gbp1
+    Set Global Variable    ${ENDPOINTS_GBP2_DIR}    ${CURDIR}/../../../../variables/gbp/3node/lithium/demo-gbp2
index b93e232f97a8d23729c6149b5e8ae95eeaaa5603..e296ab0363e72f02dcadb8bf6c7da7cc6ebe3118 100755 (executable)
@@ -26,6 +26,7 @@ Setup Everything
     \    ${stdout}    ${stderr}    ${rc}    ConnUtils.Execute in VE    pip freeze | grep ipaddr -q || pip install ipaddr    timeout=${timeout}
     \    Should Be Equal As Numbers    ${rc}    0
     \    SSHLibrary.Close Connection
+    Init Variables
 
 Teardown Everything
     Log    stop_suite_in_3_node
index f7e79036d1b91377873ce47d75fb404bf4af184e..020ee461566b8ae6c2e289c9cefb8b3f142efd4b 100644 (file)
@@ -9,13 +9,13 @@ Library           RequestsLibrary
 Variables         ../../../variables/Variables.py
 Resource          ../../../libraries/Utils.robot
 
-*** Variables ***
-${GBP_TENANTS_FILE}    ../../../variables/gbp/tenants.json
-${GBP_TENENT_ID}    f5c7d344-d1c7-4208-8531-2c2693657e12
-${GBP_TENANT1_API}    /restconf/config/policy:tenants/policy:tenant/${GBP_TENENT_ID}
-${GBP_TENANT1_FILE}    ../../../variables/gbp/tenant1.json
-
 *** Test Cases ***
+Init Variables
+    [Documentation]    Initialize ODL version specific variables
+    log    ${ODL_VERSION}
+    Run Keyword If    '${ODL_VERSION}' == 'stable-lithium'    Init Variables Lithium
+    ...    ELSE    Init Variables Master
+
 Add Tenants
     [Documentation]    Add Tenants from JSON file
     Add Elements To URI From File    ${GBP_TENANTS_API}    ${GBP_TENANTS_FILE}
@@ -60,8 +60,24 @@ Delete one Tenant
     Remove All Elements At URI    ${GBP_TENANT1_API}
     ${resp}    RequestsLibrary.Get    session    ${GBP_TENANTS_API}
     Should Be Equal As Strings    ${resp.status_code}    200
-    Should Not Contain    ${resp.content}    ${GBP_TENENT_ID}
+    Should Not Contain    ${resp.content}    ${GBP_TENANT_ID}
 
 Clean Datastore After Tests
     [Documentation]    Clean All Tenants In Datastore After Tests
     Remove All Elements At URI    ${GBP_TENANTS_API}
+
+
+*** Keywords ***
+Init Variables Master
+    [Documentation]    Sets variables specific to latest(master) version
+    Set Suite Variable    ${GBP_TENANT_ID}    tenant-red
+    Set Suite Variable    ${GBP_TENANT1_API}    /restconf/config/policy:tenants/policy:tenant/${GBP_TENANT_ID}
+    Set Suite Variable    ${GBP_TENANTS_FILE}    ${CURDIR}../../../variables/gbp/master/tenants.json
+    Set Suite Variable    ${GBP_TENANT1_FILE}    ${CURDIR}../../../variables/gbp/master/tenant1.json
+
+Init Variables Lithium
+    [Documentation]    Sets variables specific to Lithium version
+    Set Suite Variable    ${GBP_TENANT_ID}    f5c7d344-d1c7-4208-8531-2c2693657e12
+    Set Suite Variable    ${GBP_TENANT1_API}    /restconf/config/policy:tenants/policy:tenant/${GBP_TENANT_ID}
+    Set Suite Variable    ${GBP_TENANTS_FILE}    ${CURDIR}../../../variables/gbp/lithium/tenants.json
+    Set Suite Variable    ${GBP_TENANT1_FILE}    ${CURDIR}../../../variables/gbp/lithium/tenant1.json
similarity index 79%
rename from csit/variables/gbp/tenant1.json
rename to csit/variables/gbp/3node/lithium/tenant1.json
index 99a297ecf354d23c5cee8452124b695fd98bd533..5fef5334f4cdfea3be1cfa0128414e4457fcae25 100644 (file)
@@ -1,5 +1,5 @@
 {
-    "tenant": {
+    "policy:tenant": {
         "contract": [
             {
                 "clause": [
                                 "classifier-ref": [
                                     {
                                         "direction": "in",
-                                        "name": "http-dest"
+                                        "name": "http-dest",
+                                        "instance-name": "http-dest"
                                     },
                                     {
                                         "direction": "out",
-                                        "name": "http-src"
+                                        "name": "http-src",
+                                        "instance-name": "http-src"
+                                    }
+                                ],
+                                "action-ref": [
+                                    {
+                                        "name": "allow1",
+                                        "order": 0
                                     }
                                 ],
-                                                    "action-ref": [
-                      {
-                        "name": "allow1",
-                        "order": 0
-                      }
-                    ],
-
                                 "name": "allow-http-rule"
                             }
                         ]
                             {
                                 "classifier-ref": [
                                     {
-                                        "name": "icmp"
+                                        "name": "icmp",
+                                        "instance-name": "icmp"
+                                    }
+                                ],
+                                "action-ref": [
+                                    {
+                                        "name": "allow1",
+                                        "order": 0
                                     }
                                 ],
-                                                    "action-ref": [
-                      {
-                        "name": "allow1",
-                        "order": 0
-                      }
-                    ],
-
                                 "name": "allow-icmp-rule"
                             }
                         ]
         "subject-feature-instances": {
             "classifier-instance": [
                 {
-                    "classifier-definition-id": "Classifier-L4",
+                    "classifier-definition-id": "4250ab32-e8b8-445a-aebb-e1bd2cdd291f",
                     "name": "http-dest",
                     "parameter-value": [
                         {
                     ]
                 },
                 {
-                    "classifier-definition-id": "Classifier-L4",
+                    "classifier-definition-id": "4250ab32-e8b8-445a-aebb-e1bd2cdd291f",
                     "name": "http-src",
                     "parameter-value": [
                         {
                     ]
                 },
                 {
-                    "classifier-definition-id": "Classifier-IP-Protocol",
+                    "classifier-definition-id": "79c6fdb2-1e1a-4832-af57-c65baf5c2335",
                     "name": "icmp",
                     "parameter-value": [
                         {
                     ]
                 }
             ],
-          "action-instance": [
-            {
-              "name": "allow1",
-              "action-definition-id": "Action-Allow"
-            }
-          ]
+            "action-instance": [
+                {
+                    "name": "allow1",
+                    "action-definition-id": "f942e8fd-e957-42b7-bd18-f73d11266d17"
+                }
+            ]
         },
         "subnet": [
             {
similarity index 94%
rename from csit/variables/gbp/3node/tenant2.json
rename to csit/variables/gbp/3node/lithium/tenant2.json
index 6cf00e4bf2f3cfe1792defa0f918c940f5dde637..79da96301f763ff34e58464dff92361bff5532d0 100644 (file)
             "classifier-instance": [
                 {
                     "name": "icmp",
-                    "classifier-definition-id": "Classifier-IP-Protocol",
+                    "classifier-definition-id": "79c6fdb2-1e1a-4832-af57-c65baf5c2335",
                     "parameter-value": [
                         {
                             "name": "proto",
                 },
                 {
                     "name": "http-dest",
-                    "classifier-definition-id": "Classifier-L4",
+                    "classifier-definition-id": "4250ab32-e8b8-445a-aebb-e1bd2cdd291f",
                     "parameter-value": [
                         {
                             "int-value": "6",
                 },
                 {
                     "name": "http-src",
-                    "classifier-definition-id": "Classifier-L4",
+                    "classifier-definition-id": "4250ab32-e8b8-445a-aebb-e1bd2cdd291f",
                     "parameter-value": [
                         {
                             "int-value": "6",
             "action-instance": [
                 {
                     "name": "allow1",
-                    "action-definition-id": "Action-Allow"
+                    "action-definition-id": "f942e8fd-e957-42b7-bd18-f73d11266d17"
                 }
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/csit/variables/gbp/3node/master/demo-gbp1/vethl-h35_2.json b/csit/variables/gbp/3node/master/demo-gbp1/vethl-h35_2.json
new file mode 100644 (file)
index 0000000..bd4d2cd
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "clients",
+        "network-containment": "subnet-10.0.35.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:35:02",
+        "l3-address": [
+            {
+                "ip-address": "10.0.35.2",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h35_2",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/3node/master/demo-gbp1/vethl-h35_3.json b/csit/variables/gbp/3node/master/demo-gbp1/vethl-h35_3.json
new file mode 100644 (file)
index 0000000..5a11907
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "clients",
+        "network-containment": "subnet-10.0.35.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:35:03",
+        "l3-address": [
+            {
+                "ip-address": "10.0.35.3",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h35_3",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/3node/master/demo-gbp1/vethl-h35_4.json b/csit/variables/gbp/3node/master/demo-gbp1/vethl-h35_4.json
new file mode 100644 (file)
index 0000000..3659001
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "clients",
+        "network-containment": "subnet-10.0.35.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:35:04",
+        "l3-address": [
+            {
+                "ip-address": "10.0.35.4",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h35_4",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/3node/master/demo-gbp1/vethl-h35_5.json b/csit/variables/gbp/3node/master/demo-gbp1/vethl-h35_5.json
new file mode 100644 (file)
index 0000000..d68bfaa
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "clients",
+        "network-containment": "subnet-10.0.35.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:35:05",
+        "l3-address": [
+            {
+                "ip-address": "10.0.35.5",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h35_5",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/3node/master/demo-gbp1/vethl-h36_2.json b/csit/variables/gbp/3node/master/demo-gbp1/vethl-h36_2.json
new file mode 100644 (file)
index 0000000..6ca4e72
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "webservers",
+        "network-containment": "subnet-10.0.36.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:36:02",
+        "l3-address": [
+            {
+                "ip-address": "10.0.36.2",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h36_2",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/3node/master/demo-gbp1/vethl-h36_3.json b/csit/variables/gbp/3node/master/demo-gbp1/vethl-h36_3.json
new file mode 100644 (file)
index 0000000..645aea5
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "webservers",
+        "network-containment": "subnet-10.0.36.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:36:03",
+        "l3-address": [
+            {
+                "ip-address": "10.0.36.3",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h36_3",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/3node/master/demo-gbp1/vethl-h36_4.json b/csit/variables/gbp/3node/master/demo-gbp1/vethl-h36_4.json
new file mode 100644 (file)
index 0000000..b5e7134
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "webservers",
+        "network-containment": "subnet-10.0.36.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:36:04",
+        "l3-address": [
+            {
+                "ip-address": "10.0.36.4",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h36_4",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/3node/master/demo-gbp1/vethl-h36_5.json b/csit/variables/gbp/3node/master/demo-gbp1/vethl-h36_5.json
new file mode 100644 (file)
index 0000000..0f82e73
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "webservers",
+        "network-containment": "subnet-10.0.36.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:36:05",
+        "l3-address": [
+            {
+                "ip-address": "10.0.36.5",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h36_5",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/3node/master/demo-gbp2/vethl-h35_2.json b/csit/variables/gbp/3node/master/demo-gbp2/vethl-h35_2.json
new file mode 100644 (file)
index 0000000..bd4d2cd
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "clients",
+        "network-containment": "subnet-10.0.35.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:35:02",
+        "l3-address": [
+            {
+                "ip-address": "10.0.35.2",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h35_2",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/3node/master/demo-gbp2/vethl-h35_3.json b/csit/variables/gbp/3node/master/demo-gbp2/vethl-h35_3.json
new file mode 100644 (file)
index 0000000..5a11907
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "clients",
+        "network-containment": "subnet-10.0.35.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:35:03",
+        "l3-address": [
+            {
+                "ip-address": "10.0.35.3",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h35_3",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/3node/master/demo-gbp2/vethl-h35_4.json b/csit/variables/gbp/3node/master/demo-gbp2/vethl-h35_4.json
new file mode 100644 (file)
index 0000000..3659001
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "clients",
+        "network-containment": "subnet-10.0.35.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:35:04",
+        "l3-address": [
+            {
+                "ip-address": "10.0.35.4",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h35_4",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/3node/master/demo-gbp2/vethl-h35_5.json b/csit/variables/gbp/3node/master/demo-gbp2/vethl-h35_5.json
new file mode 100644 (file)
index 0000000..d68bfaa
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "clients",
+        "network-containment": "subnet-10.0.35.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:35:05",
+        "l3-address": [
+            {
+                "ip-address": "10.0.35.5",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h35_5",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/3node/master/demo-gbp2/vethl-h35_6.json b/csit/variables/gbp/3node/master/demo-gbp2/vethl-h35_6.json
new file mode 100644 (file)
index 0000000..06ac9c9
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "clients",
+        "network-containment": "subnet-10.0.35.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:35:06",
+        "l3-address": [
+            {
+                "ip-address": "10.0.35.6",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h35_6",
+        "tenant": "tenant-blue"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/3node/master/demo-gbp2/vethl-h35_7.json b/csit/variables/gbp/3node/master/demo-gbp2/vethl-h35_7.json
new file mode 100644 (file)
index 0000000..8e1ea30
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "clients",
+        "network-containment": "subnet-10.0.35.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:35:07",
+        "l3-address": [
+            {
+                "ip-address": "10.0.35.7",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h35_7",
+        "tenant": "tenant-blue"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/3node/master/demo-gbp2/vethl-h35_8.json b/csit/variables/gbp/3node/master/demo-gbp2/vethl-h35_8.json
new file mode 100644 (file)
index 0000000..34c3fb4
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "clients",
+        "network-containment": "subnet-10.0.35.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:35:08",
+        "l3-address": [
+            {
+                "ip-address": "10.0.35.8",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h35_8",
+        "tenant": "tenant-blue"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/3node/master/demo-gbp2/vethl-h35_9.json b/csit/variables/gbp/3node/master/demo-gbp2/vethl-h35_9.json
new file mode 100644 (file)
index 0000000..b66117e
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "clients",
+        "network-containment": "subnet-10.0.35.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:35:09",
+        "l3-address": [
+            {
+                "ip-address": "10.0.35.9",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h35_9",
+        "tenant": "tenant-blue"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/3node/master/demo-gbp2/vethl-h36_2.json b/csit/variables/gbp/3node/master/demo-gbp2/vethl-h36_2.json
new file mode 100644 (file)
index 0000000..6ca4e72
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "webservers",
+        "network-containment": "subnet-10.0.36.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:36:02",
+        "l3-address": [
+            {
+                "ip-address": "10.0.36.2",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h36_2",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/3node/master/demo-gbp2/vethl-h36_3.json b/csit/variables/gbp/3node/master/demo-gbp2/vethl-h36_3.json
new file mode 100644 (file)
index 0000000..645aea5
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "webservers",
+        "network-containment": "subnet-10.0.36.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:36:03",
+        "l3-address": [
+            {
+                "ip-address": "10.0.36.3",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h36_3",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/3node/master/demo-gbp2/vethl-h36_4.json b/csit/variables/gbp/3node/master/demo-gbp2/vethl-h36_4.json
new file mode 100644 (file)
index 0000000..b5e7134
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "webservers",
+        "network-containment": "subnet-10.0.36.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:36:04",
+        "l3-address": [
+            {
+                "ip-address": "10.0.36.4",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h36_4",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/3node/master/demo-gbp2/vethl-h36_5.json b/csit/variables/gbp/3node/master/demo-gbp2/vethl-h36_5.json
new file mode 100644 (file)
index 0000000..0f82e73
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "webservers",
+        "network-containment": "subnet-10.0.36.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:36:05",
+        "l3-address": [
+            {
+                "ip-address": "10.0.36.5",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h36_5",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/3node/master/demo-gbp2/vethl-h36_6.json b/csit/variables/gbp/3node/master/demo-gbp2/vethl-h36_6.json
new file mode 100644 (file)
index 0000000..90352f3
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "webservers",
+        "network-containment": "subnet-10.0.36.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:36:06",
+        "l3-address": [
+            {
+                "ip-address": "10.0.36.6",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h36_6",
+        "tenant": "tenant-blue"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/3node/master/demo-gbp2/vethl-h36_7.json b/csit/variables/gbp/3node/master/demo-gbp2/vethl-h36_7.json
new file mode 100644 (file)
index 0000000..272608e
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "webservers",
+        "network-containment": "subnet-10.0.36.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:36:07",
+        "l3-address": [
+            {
+                "ip-address": "10.0.36.7",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h36_7",
+        "tenant": "tenant-blue"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/3node/master/demo-gbp2/vethl-h36_8.json b/csit/variables/gbp/3node/master/demo-gbp2/vethl-h36_8.json
new file mode 100644 (file)
index 0000000..8c017cc
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "webservers",
+        "network-containment": "subnet-10.0.36.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:36:08",
+        "l3-address": [
+            {
+                "ip-address": "10.0.36.8",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h36_8",
+        "tenant": "tenant-blue"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/3node/master/demo-gbp2/vethl-h36_9.json b/csit/variables/gbp/3node/master/demo-gbp2/vethl-h36_9.json
new file mode 100644 (file)
index 0000000..7ab7bbe
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "webservers",
+        "network-containment": "subnet-10.0.36.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:36:09",
+        "l3-address": [
+            {
+                "ip-address": "10.0.36.9",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h36_9",
+        "tenant": "tenant-blue"
+    }
+}
\ No newline at end of file
similarity index 63%
rename from csit/variables/gbp/tenants.json
rename to csit/variables/gbp/3node/master/tenant1.json
index 6ce8cd65aa9669b6bc27cd40eb16d78a81b2ce1d..b9eb3456f348adc59dad2b46f35a90ada972e6b5 100644 (file)
@@ -1,7 +1,5 @@
 {
-"tenants": {
-
-    "tenant": [{
+    "policy:tenant": {
         "contract": [
             {
                 "clause": [
@@ -13,7 +11,7 @@
                         ]
                     }
                 ],
-                "id": "22282cca-9a13-4d0c-a67e-a933ebb0b0ae",
+                "id": "icmp-http-contract",
                 "subject": [
                     {
                         "name": "allow-http-subject",
                                 "classifier-ref": [
                                     {
                                         "direction": "in",
-                                        "name": "http-dest"
+                                        "name": "http-dest",
+                                        "instance-name": "http-dest"
                                     },
                                     {
                                         "direction": "out",
-                                        "name": "http-src"
+                                        "name": "http-src",
+                                        "instance-name": "http-src"
+                                    }
+                                ],
+                                "action-ref": [
+                                    {
+                                        "name": "allow1",
+                                        "order": 0
                                     }
                                 ],
-                                                    "action-ref": [
-                      {
-                        "name": "allow1",
-                        "order": 0
-                      }
-                    ],
-
                                 "name": "allow-http-rule"
                             }
                         ]
                             {
                                 "classifier-ref": [
                                     {
-                                        "name": "icmp"
+                                        "name": "icmp",
+                                        "instance-name": "icmp"
+                                    }
+                                ],
+                                "action-ref": [
+                                    {
+                                        "name": "allow1",
+                                        "order": 0
                                     }
                                 ],
-                                                    "action-ref": [
-                      {
-                        "name": "allow1",
-                        "order": 0
-                      }
-                    ],
-
                                 "name": "allow-icmp-rule"
                             }
                         ]
                 "consumer-named-selector": [
                     {
                         "contract": [
-                            "22282cca-9a13-4d0c-a67e-a933ebb0b0ae"
+                            "icmp-http-contract"
                         ],
-                        "name": "e593f05d-96be-47ad-acd5-ba81465680d5-1eaf9a67-a171-42a8-9282-71cf702f61dd-22282cca-9a13-4d0c-a67e-a933ebb0b0ae"
+                        "name": "webservers-clients-icmp-http-contract"
                     }
                 ],
-                "id": "1eaf9a67-a171-42a8-9282-71cf702f61dd",
-                "network-domain": "d2779562-ebf1-45e6-93a4-78e2362bc418",
+                "id": "clients",
                 "provider-named-selector": []
             },
             {
                 "consumer-named-selector": [],
-                "id": "e593f05d-96be-47ad-acd5-ba81465680d5",
-                "network-domain": "2c71d675-693e-406f-899f-12a026eb55f1",
+                "id": "webservers",
                 "provider-named-selector": [
                     {
                         "contract": [
-                            "22282cca-9a13-4d0c-a67e-a933ebb0b0ae"
+                            "icmp-http-contract"
                         ],
-                        "name": "e593f05d-96be-47ad-acd5-ba81465680d5-1eaf9a67-a171-42a8-9282-71cf702f61dd-22282cca-9a13-4d0c-a67e-a933ebb0b0ae"
+                        "name": "webservers-clients-icmp-http-contract"
                     }
                 ]
             }
         ],
-        "id": "f5c7d344-d1c7-4208-8531-2c2693657e12",
+        "id": "tenant-red",
         "l2-bridge-domain": [
             {
-                "id": "7b796915-adf4-4356-b5ca-de005ac410c1",
-                "parent": "cbe0cc07-b8ff-451d-8171-9eef002a8e80"
+                "id": "bridge-domain1",
+                "parent": "l3-context-vrf-red"
             }
         ],
         "l2-flood-domain": [
             {
-                "id": "1ddde8d8-c2bc-48d7-8ce0-d78eb6ed4b5b",
-                "parent": "7b796915-adf4-4356-b5ca-de005ac410c1"
+                "id": "flood-domain-1",
+                "parent": "bridge-domain1"
             },
             {
-                "id": "03f69af2-481c-4554-97d6-c4fedca5d126",
-                "parent": "7b796915-adf4-4356-b5ca-de005ac410c1"
+                "id": "flood-domain1",
+                "parent": "bridge-domain1"
             }
         ],
         "l3-context": [
             {
-                "id": "cbe0cc07-b8ff-451d-8171-9eef002a8e80"
+                "id": "l3-context-vrf-red"
             }
         ],
         "name": "GBPPOC",
                     ]
                 }
             ],
-          "action-instance": [
-            {
-              "name": "allow1",
-              "action-definition-id": "Action-Allow"
-            }
-          ]
+            "action-instance": [
+                {
+                    "name": "allow1",
+                    "action-definition-id": "Action-Allow"
+                }
+            ]
         },
         "subnet": [
             {
-                "id": "d2779562-ebf1-45e6-93a4-78e2362bc418",
+                "id": "subnet-10.0.35.0/24",
                 "ip-prefix": "10.0.35.1/24",
-                "parent": "1ddde8d8-c2bc-48d7-8ce0-d78eb6ed4b5b",
+                "parent": "flood-domain-1",
                 "virtual-router-ip": "10.0.35.1"
             },
             {
-                "id": "2c71d675-693e-406f-899f-12a026eb55f1",
+                "id": "subnet-10.0.36.0/24",
                 "ip-prefix": "10.0.36.1/24",
-                "parent": "03f69af2-481c-4554-97d6-c4fedca5d126",
+                "parent": "flood-domain1",
                 "virtual-router-ip": "10.0.36.1"
             }
         ]
-    }]
-
     }
 }
diff --git a/csit/variables/gbp/3node/master/tenant2.json b/csit/variables/gbp/3node/master/tenant2.json
new file mode 100644 (file)
index 0000000..1e1f623
--- /dev/null
@@ -0,0 +1,177 @@
+{
+    "policy:tenant": {
+        "contract": [
+            {
+                "clause": [
+                    {
+                        "name": "allow-http-clause",
+                        "subject-refs": [
+                            "allow-http-subject",
+                            "allow-icmp-subject"
+                        ]
+                    }
+                ],
+                "id": "icmp-http-contract",
+                "subject": [
+                    {
+                        "name": "allow-http-subject",
+                        "rule": [
+                            {
+                                "classifier-ref": [
+                                    {
+                                        "direction": "in",
+                                        "name": "http-dest",
+                                        "instance-name": "http-dest"
+                                    },
+                                    {
+                                        "direction": "out",
+                                        "name": "http-src",
+                                        "instance-name": "http-src"
+                                    }
+                                ],
+                                "action-ref": [
+                                    {
+                                        "name": "allow1",
+                                        "order": 0
+                                    }
+                                ],
+                                "name": "allow-http-rule"
+                            }
+                        ]
+                    },
+                    {
+                        "name": "allow-icmp-subject",
+                        "rule": [
+                            {
+                                "classifier-ref": [
+                                    {
+                                        "name": "icmp",
+                                        "instance-name": "icmp"
+                                    }
+                                ],
+                                "action-ref": [
+                                    {
+                                        "name": "allow1",
+                                        "order": 0
+                                    }
+                                ],
+                                "name": "allow-icmp-rule"
+                            }
+                        ]
+                    }
+                ]
+            }
+        ],
+        "endpoint-group": [
+            {
+                "consumer-named-selector": [
+                    {
+                        "contract": [
+                            "icmp-http-contract"
+                        ],
+                        "name": "webservers-clients-icmp-http-contract"
+                    }
+                ],
+                "id": "clients",
+                "provider-named-selector": []
+            },
+            {
+                "consumer-named-selector": [],
+                "id": "webservers",
+                "provider-named-selector": [
+                    {
+                        "contract": [
+                            "icmp-http-contract"
+                        ],
+                        "name": "webservers-clients-icmp-http-contract"
+                    }
+                ]
+            }
+        ],
+        "id": "tenant-blue",
+        "l2-bridge-domain": [
+            {
+                "id": "bridge-domain1",
+                "parent": "l3-context-vrf-red"
+            }
+        ],
+        "l2-flood-domain": [
+            {
+                "id": "flood-domain-1",
+                "parent": "bridge-domain1"
+            },
+            {
+                "id": "flood-domain1",
+                "parent": "bridge-domain1"
+            }
+        ],
+        "l3-context": [
+            {
+                "id": "l3-context-vrf-red"
+            }
+        ],
+        "name": "GBPPOC",
+        "subject-feature-instances": {
+            "classifier-instance": [
+                {
+                    "classifier-definition-id": "Classifier-L4",
+                    "name": "http-dest",
+                    "parameter-value": [
+                        {
+                            "int-value": "6",
+                            "name": "proto"
+                        },
+                        {
+                            "int-value": "80",
+                            "name": "destport"
+                        }
+                    ]
+                },
+                {
+                    "classifier-definition-id": "Classifier-L4",
+                    "name": "http-src",
+                    "parameter-value": [
+                        {
+                            "int-value": "6",
+                            "name": "proto"
+                        },
+                        {
+                            "int-value": "80",
+                            "name": "sourceport"
+                        }
+                    ]
+                },
+                {
+                    "classifier-definition-id": "Classifier-IP-Protocol",
+                    "name": "icmp",
+                    "parameter-value": [
+                        {
+                            "int-value": "1",
+                            "name": "proto"
+                        }
+                    ]
+                }
+            ],
+            "action-instance": [
+                {
+                    "name": "allow1",
+                    "action-definition-id": "Action-Allow"
+                }
+            ]
+        },
+        "subnet": [
+            {
+                "id": "subnet-10.0.35.0/24",
+                "ip-prefix": "10.0.35.1/24",
+                "parent": "flood-domain-1",
+                "virtual-router-ip": "10.0.35.1"
+            },
+            {
+                "id": "subnet-10.0.36.0/24",
+                "ip-prefix": "10.0.36.1/24",
+                "parent": "flood-domain1",
+                "virtual-router-ip": "10.0.36.1"
+            }
+        ]
+    }
+}
similarity index 94%
rename from csit/variables/gbp/demo-asymmetric-chain/tenants.json
rename to csit/variables/gbp/demo-asymmetric-chain/lithium/tenants.json
index 840e88adce7d298bf4a51417e1a0f0d5a65f3436..c2d5042fe714de4d05ac32a16e2de6ac5daf14d6 100644 (file)
@@ -70,7 +70,7 @@
                 "classifier-instance": [
                     {
                         "name": "icmp",
-                        "classifier-definition-id": "Classifier-IP-Protocol",
+                        "classifier-definition-id": "79c6fdb2-1e1a-4832-af57-c65baf5c2335",
                         "parameter-value": [
                             {
                                 "name": "proto",
@@ -80,7 +80,7 @@
                     },
                     {
                         "name": "http-dest",
-                        "classifier-definition-id": "Classifier-L4",
+                        "classifier-definition-id": "4250ab32-e8b8-445a-aebb-e1bd2cdd291f",
                         "parameter-value": [
                             {
                                 "int-value": "6",
@@ -94,7 +94,7 @@
                     },
                     {
                         "name": "http-src",
-                        "classifier-definition-id": "Classifier-L4",
+                        "classifier-definition-id": "4250ab32-e8b8-445a-aebb-e1bd2cdd291f",
                         "parameter-value": [
                             {
                                 "int-value": "6",
                 "action-instance": [
                     {
                         "name": "chain1",
-                        "action-definition-id": "Action-Chain",
+                        "action-definition-id": "3d886be7-059f-4c4f-bbef-0356bea40933",
                         "parameter-value": [
                             {
                                 "name": "sfc-chain-name",
                     },
                     {
                         "name": "allow1",
-                        "action-definition-id": "Action-Allow"
+                        "action-definition-id": "f942e8fd-e957-42b7-bd18-f73d11266d17"
                     }
                 ]
             },
             ]
         }
     ]
-}
\ No newline at end of file
+}
+
diff --git a/csit/variables/gbp/demo-asymmetric-chain/master/tenants.json b/csit/variables/gbp/demo-asymmetric-chain/master/tenants.json
new file mode 100644 (file)
index 0000000..c2100b6
--- /dev/null
@@ -0,0 +1,201 @@
+{
+    "tenant": [
+        {
+            "id": "tenant-red",
+            "l2-flood-domain": [
+                {
+                    "id": "flood-domain-1",
+                    "parent": "bridge-domain1"
+                },
+                {
+                    "id": "flood-domain-2",
+                    "parent": "bridge-domain1"
+                }
+            ],
+            "name": "DockerTenant",
+            "l3-context": [
+                {
+                    "id": "l3-context-vrf-red"
+                }
+            ],
+            "l2-bridge-domain": [
+                {
+                    "id": "bridge-domain1",
+                    "parent": "l3-context-vrf-red"
+                }
+            ],
+            "subnet": [
+                {
+                    "id": "subnet-10.0.36.0/24",
+                    "virtual-router-ip": "10.0.36.1",
+                    "parent": "flood-domain-2",
+                    "ip-prefix": "10.0.36.1/24"
+                },
+                {
+                    "id": "subnet-10.0.35.0/24",
+                    "virtual-router-ip": "10.0.35.1",
+                    "parent": "flood-domain-1",
+                    "ip-prefix": "10.0.35.1/24"
+                }
+            ],
+            "endpoint-group": [
+                {
+                    "id": "webservers",
+                    "name": "webservers",
+                    "provider-named-selector": [
+                        {
+                            "name": "webservers-clients-icmp-http-contract",
+                            "contract": [
+                                "icmp-http-contract"
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "id": "clients",
+                    "name": "clients",
+                    "consumer-named-selector": [
+                        {
+                            "name": "webservers-clients-icmp-http-contract",
+                            "contract": [
+                                "icmp-http-contract"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "subject-feature-instances": {
+                "classifier-instance": [
+                    {
+                        "name": "icmp",
+                        "classifier-definition-id": "Classifier-IP-Protocol",
+                        "parameter-value": [
+                            {
+                                "name": "proto",
+                                "int-value": 1
+                            }
+                        ]
+                    },
+                    {
+                        "name": "http-dest",
+                        "classifier-definition-id": "Classifier-L4",
+                        "parameter-value": [
+                            {
+                                "int-value": "6",
+                                "name": "proto"
+                            },
+                            {
+                                "int-value": "80",
+                                "name": "destport"
+                            }
+                        ]
+                    },
+                    {
+                        "name": "http-src",
+                        "classifier-definition-id": "Classifier-L4",
+                        "parameter-value": [
+                            {
+                                "int-value": "6",
+                                "name": "proto"
+                            },
+                            {
+                                "int-value": "80",
+                                "name": "sourceport"
+                            }
+                        ]
+                    }
+                ],
+                "action-instance": [
+                    {
+                        "name": "chain1",
+                        "action-definition-id": "Action-Chain",
+                        "parameter-value": [
+                            {
+                                "name": "sfc-chain-name",
+                                "string-value": "SFCGBP"
+                            }
+                        ]
+                    },
+                    {
+                        "name": "allow1",
+                        "action-definition-id": "Action-Allow"
+                    }
+                ]
+            },
+            "contract": [
+                {
+                    "id": "icmp-http-contract",
+                    "subject": [
+                        {
+                            "name": "icmp-subject",
+                            "rule": [
+                                {
+                                    "name": "allow-icmp-rule",
+                                    "order": 0,
+                                    "classifier-ref": [
+                                        {
+                                            "name": "icmp",
+                                            "instance-name": "icmp"
+                                        }
+                                    ],
+                                    "action-ref": [
+                                        {
+                                            "name": "allow1",
+                                            "order": 0
+                                        }
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            "name": "http-subject",
+                            "rule": [
+                                {
+                                    "name": "http-chain-rule",
+                                    "classifier-ref": [
+                                        {
+                                            "name": "http-dest",
+                                            "instance-name": "http-dest",
+                                            "direction": "in"
+                                        }
+                                    ],
+                                    "action-ref": [
+                                        {
+                                            "name": "chain1",
+                                            "order": 0
+                                        }
+                                    ]
+                                },
+                                {
+                                    "name": "http-out-rule",
+                                    "classifier-ref": [
+                                        {
+                                            "name": "http-src",
+                                            "instance-name": "http-src",
+                                            "direction": "out"
+                                        }
+                                    ],
+                                    "action-ref": [
+                                        {
+                                            "name": "allow1",
+                                            "order": 0
+                                        }
+                                    ]
+                                }
+                            ]
+                        }
+                    ],
+                    "clause": [
+                        {
+                            "name": "icmp-http-clause",
+                            "subject-refs": [
+                                "icmp-subject",
+                                "http-subject"
+                            ]
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
diff --git a/csit/variables/gbp/demo-asymmetric-chain/master/vethl-h35_2.json b/csit/variables/gbp/demo-asymmetric-chain/master/vethl-h35_2.json
new file mode 100644 (file)
index 0000000..bd4d2cd
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "clients",
+        "network-containment": "subnet-10.0.35.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:35:02",
+        "l3-address": [
+            {
+                "ip-address": "10.0.35.2",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h35_2",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/demo-asymmetric-chain/master/vethl-h35_3.json b/csit/variables/gbp/demo-asymmetric-chain/master/vethl-h35_3.json
new file mode 100644 (file)
index 0000000..5a11907
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "clients",
+        "network-containment": "subnet-10.0.35.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:35:03",
+        "l3-address": [
+            {
+                "ip-address": "10.0.35.3",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h35_3",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/demo-asymmetric-chain/master/vethl-h35_4.json b/csit/variables/gbp/demo-asymmetric-chain/master/vethl-h35_4.json
new file mode 100644 (file)
index 0000000..3659001
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "clients",
+        "network-containment": "subnet-10.0.35.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:35:04",
+        "l3-address": [
+            {
+                "ip-address": "10.0.35.4",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h35_4",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/demo-asymmetric-chain/master/vethl-h35_5.json b/csit/variables/gbp/demo-asymmetric-chain/master/vethl-h35_5.json
new file mode 100644 (file)
index 0000000..d68bfaa
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "clients",
+        "network-containment": "subnet-10.0.35.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:35:05",
+        "l3-address": [
+            {
+                "ip-address": "10.0.35.5",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h35_5",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/demo-asymmetric-chain/master/vethl-h36_2.json b/csit/variables/gbp/demo-asymmetric-chain/master/vethl-h36_2.json
new file mode 100644 (file)
index 0000000..6ca4e72
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "webservers",
+        "network-containment": "subnet-10.0.36.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:36:02",
+        "l3-address": [
+            {
+                "ip-address": "10.0.36.2",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h36_2",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/demo-asymmetric-chain/master/vethl-h36_3.json b/csit/variables/gbp/demo-asymmetric-chain/master/vethl-h36_3.json
new file mode 100644 (file)
index 0000000..645aea5
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "webservers",
+        "network-containment": "subnet-10.0.36.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:36:03",
+        "l3-address": [
+            {
+                "ip-address": "10.0.36.3",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h36_3",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/demo-asymmetric-chain/master/vethl-h36_4.json b/csit/variables/gbp/demo-asymmetric-chain/master/vethl-h36_4.json
new file mode 100644 (file)
index 0000000..b5e7134
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "webservers",
+        "network-containment": "subnet-10.0.36.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:36:04",
+        "l3-address": [
+            {
+                "ip-address": "10.0.36.4",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h36_4",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/demo-asymmetric-chain/master/vethl-h36_5.json b/csit/variables/gbp/demo-asymmetric-chain/master/vethl-h36_5.json
new file mode 100644 (file)
index 0000000..0f82e73
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "webservers",
+        "network-containment": "subnet-10.0.36.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:36:05",
+        "l3-address": [
+            {
+                "ip-address": "10.0.36.5",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h36_5",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
similarity index 94%
rename from csit/variables/gbp/demo-symmetric-chain/tenants.json
rename to csit/variables/gbp/demo-symmetric-chain/lithium/tenants.json
index c6292422947c09d0d79783bc283a523e7073ad9f..f319b23a7b0de6b4f00fb45b771102a6db4e792b 100644 (file)
@@ -70,7 +70,7 @@
                 "classifier-instance": [
                     {
                         "name": "icmp",
-                        "classifier-definition-id": "Classifier-IP-Protocol",
+                        "classifier-definition-id": "79c6fdb2-1e1a-4832-af57-c65baf5c2335",
                         "parameter-value": [
                             {
                                 "name": "proto",
@@ -80,7 +80,7 @@
                     },
                     {
                         "name": "http-dest",
-                        "classifier-definition-id": "Classifier-L4",
+                        "classifier-definition-id": "4250ab32-e8b8-445a-aebb-e1bd2cdd291f",
                         "parameter-value": [
                             {
                                 "int-value": "6",
@@ -94,7 +94,7 @@
                     },
                     {
                         "name": "http-src",
-                        "classifier-definition-id": "Classifier-L4",
+                        "classifier-definition-id": "4250ab32-e8b8-445a-aebb-e1bd2cdd291f",
                         "parameter-value": [
                             {
                                 "int-value": "6",
                 "action-instance": [
                     {
                         "name": "chain1",
-                        "action-definition-id": "Action-Chain",
+                        "action-definition-id": "3d886be7-059f-4c4f-bbef-0356bea40933",
                         "parameter-value": [
                             {
                                 "name": "sfc-chain-name",
                     },
                     {
                         "name": "allow1",
-                        "action-definition-id": "Action-Allow"
+                        "action-definition-id": "f942e8fd-e957-42b7-bd18-f73d11266d17"
                     }
                 ]
             },
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/csit/variables/gbp/demo-symmetric-chain/master/tenants.json b/csit/variables/gbp/demo-symmetric-chain/master/tenants.json
new file mode 100644 (file)
index 0000000..f1599dd
--- /dev/null
@@ -0,0 +1,201 @@
+{
+    "tenant": [
+        {
+            "id": "tenant-red",
+            "l2-flood-domain": [
+                {
+                    "id": "flood-domain-1",
+                    "parent": "bridge-domain1"
+                },
+                {
+                    "id": "flood-domain-2",
+                    "parent": "bridge-domain1"
+                }
+            ],
+            "name": "DockerTenant",
+            "l3-context": [
+                {
+                    "id": "l3-context-vrf-red"
+                }
+            ],
+            "l2-bridge-domain": [
+                {
+                    "id": "bridge-domain1",
+                    "parent": "l3-context-vrf-red"
+                }
+            ],
+            "subnet": [
+                {
+                    "id": "subnet-10.0.36.0/24",
+                    "virtual-router-ip": "10.0.36.1",
+                    "parent": "flood-domain-2",
+                    "ip-prefix": "10.0.36.1/24"
+                },
+                {
+                    "id": "subnet-10.0.35.0/24",
+                    "virtual-router-ip": "10.0.35.1",
+                    "parent": "flood-domain-1",
+                    "ip-prefix": "10.0.35.1/24"
+                }
+            ],
+            "endpoint-group": [
+                {
+                    "id": "webservers",
+                    "name": "webservers",
+                    "provider-named-selector": [
+                        {
+                            "name": "webservers-clients-icmp-http-contract",
+                            "contract": [
+                                "icmp-http-contract"
+                            ]
+                        }
+                    ]
+                },
+                {
+                    "id": "clients",
+                    "name": "clients",
+                    "consumer-named-selector": [
+                        {
+                            "name": "webservers-clients-icmp-http-contract",
+                            "contract": [
+                                "icmp-http-contract"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "subject-feature-instances": {
+                "classifier-instance": [
+                    {
+                        "name": "icmp",
+                        "classifier-definition-id": "Classifier-IP-Protocol",
+                        "parameter-value": [
+                            {
+                                "name": "proto",
+                                "int-value": 1
+                            }
+                        ]
+                    },
+                    {
+                        "name": "http-dest",
+                        "classifier-definition-id": "Classifier-L4",
+                        "parameter-value": [
+                            {
+                                "int-value": "6",
+                                "name": "proto"
+                            },
+                            {
+                                "int-value": "80",
+                                "name": "destport"
+                            }
+                        ]
+                    },
+                    {
+                        "name": "http-src",
+                        "classifier-definition-id": "Classifier-L4",
+                        "parameter-value": [
+                            {
+                                "int-value": "6",
+                                "name": "proto"
+                            },
+                            {
+                                "int-value": "80",
+                                "name": "sourceport"
+                            }
+                        ]
+                    }
+                ],
+                "action-instance": [
+                    {
+                        "name": "chain1",
+                        "action-definition-id": "Action-Chain",
+                        "parameter-value": [
+                            {
+                                "name": "sfc-chain-name",
+                                "string-value": "SFCGBP"
+                            }
+                        ]
+                    },
+                    {
+                        "name": "allow1",
+                        "action-definition-id": "Action-Allow"
+                    }
+                ]
+            },
+            "contract": [
+                {
+                    "id": "icmp-http-contract",
+                    "subject": [
+                        {
+                            "name": "icmp-subject",
+                            "rule": [
+                                {
+                                    "name": "allow-icmp-rule",
+                                    "order": 0,
+                                    "classifier-ref": [
+                                        {
+                                            "name": "icmp",
+                                            "instance-name": "icmp"
+                                        }
+                                    ],
+                                    "action-ref": [
+                                        {
+                                            "name": "allow1",
+                                            "order": 0
+                                        }
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            "name": "http-subject",
+                            "rule": [
+                                {
+                                    "name": "http-chain-rule-in",
+                                    "classifier-ref": [
+                                        {
+                                            "name": "http-dest",
+                                            "instance-name": "http-dest",
+                                            "direction": "in"
+                                        }
+                                    ],
+                                    "action-ref": [
+                                        {
+                                            "name": "chain1",
+                                            "order": 0
+                                        }
+                                    ]
+                                },
+                                {
+                                    "name": "http-chain-rule-out",
+                                    "classifier-ref": [
+                                        {
+                                            "name": "http-src",
+                                            "instance-name": "http-src",
+                                            "direction": "out"
+                                        }
+                                    ],
+                                    "action-ref": [
+                                        {
+                                            "name": "chain1",
+                                            "order": 0
+                                        }
+                                    ]
+                                }
+                            ]
+                        }
+                    ],
+                    "clause": [
+                        {
+                            "name": "icmp-http-clause",
+                            "subject-refs": [
+                                "icmp-subject",
+                                "http-subject"
+                            ]
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
diff --git a/csit/variables/gbp/demo-symmetric-chain/master/vethl-h35_2.json b/csit/variables/gbp/demo-symmetric-chain/master/vethl-h35_2.json
new file mode 100644 (file)
index 0000000..bd4d2cd
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "clients",
+        "network-containment": "subnet-10.0.35.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:35:02",
+        "l3-address": [
+            {
+                "ip-address": "10.0.35.2",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h35_2",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/demo-symmetric-chain/master/vethl-h35_3.json b/csit/variables/gbp/demo-symmetric-chain/master/vethl-h35_3.json
new file mode 100644 (file)
index 0000000..5a11907
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "clients",
+        "network-containment": "subnet-10.0.35.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:35:03",
+        "l3-address": [
+            {
+                "ip-address": "10.0.35.3",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h35_3",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/demo-symmetric-chain/master/vethl-h35_4.json b/csit/variables/gbp/demo-symmetric-chain/master/vethl-h35_4.json
new file mode 100644 (file)
index 0000000..3659001
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "clients",
+        "network-containment": "subnet-10.0.35.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:35:04",
+        "l3-address": [
+            {
+                "ip-address": "10.0.35.4",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h35_4",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/demo-symmetric-chain/master/vethl-h35_5.json b/csit/variables/gbp/demo-symmetric-chain/master/vethl-h35_5.json
new file mode 100644 (file)
index 0000000..d68bfaa
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "clients",
+        "network-containment": "subnet-10.0.35.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:35:05",
+        "l3-address": [
+            {
+                "ip-address": "10.0.35.5",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h35_5",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/demo-symmetric-chain/master/vethl-h36_2.json b/csit/variables/gbp/demo-symmetric-chain/master/vethl-h36_2.json
new file mode 100644 (file)
index 0000000..6ca4e72
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "webservers",
+        "network-containment": "subnet-10.0.36.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:36:02",
+        "l3-address": [
+            {
+                "ip-address": "10.0.36.2",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h36_2",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/demo-symmetric-chain/master/vethl-h36_3.json b/csit/variables/gbp/demo-symmetric-chain/master/vethl-h36_3.json
new file mode 100644 (file)
index 0000000..645aea5
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "webservers",
+        "network-containment": "subnet-10.0.36.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:36:03",
+        "l3-address": [
+            {
+                "ip-address": "10.0.36.3",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h36_3",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/demo-symmetric-chain/master/vethl-h36_4.json b/csit/variables/gbp/demo-symmetric-chain/master/vethl-h36_4.json
new file mode 100644 (file)
index 0000000..b5e7134
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "webservers",
+        "network-containment": "subnet-10.0.36.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:36:04",
+        "l3-address": [
+            {
+                "ip-address": "10.0.36.4",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h36_4",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
diff --git a/csit/variables/gbp/demo-symmetric-chain/master/vethl-h36_5.json b/csit/variables/gbp/demo-symmetric-chain/master/vethl-h36_5.json
new file mode 100644 (file)
index 0000000..0f82e73
--- /dev/null
@@ -0,0 +1,16 @@
+{
+    "input": {
+        "endpoint-group": "webservers",
+        "network-containment": "subnet-10.0.36.0/24",
+        "l2-context": "bridge-domain1",
+        "mac-address": "00:00:00:00:36:05",
+        "l3-address": [
+            {
+                "ip-address": "10.0.36.5",
+                "l3-context": "l3-context-vrf-red"
+            }
+        ],
+        "port-name": "vethl-h36_5",
+        "tenant": "tenant-red"
+    }
+}
\ No newline at end of file
similarity index 94%
rename from csit/variables/gbp/3node/tenant1.json
rename to csit/variables/gbp/lithium/tenant1.json
index d7e9cd6e4caa71882b28ccdd2be9eeda50380bbf..c830c6f43cda32b78c4376ebcef9fd876ea6b8ac 100644 (file)
         "subject-feature-instances": {
             "classifier-instance": [
                 {
-                    "classifier-definition-id": "Classifier-L4",
+                    "classifier-definition-id": "4250ab32-e8b8-445a-aebb-e1bd2cdd291f",
                     "name": "http-dest",
                     "parameter-value": [
                         {
                     ]
                 },
                 {
-                    "classifier-definition-id": "Classifier-L4",
+                    "classifier-definition-id": "4250ab32-e8b8-445a-aebb-e1bd2cdd291f",
                     "name": "http-src",
                     "parameter-value": [
                         {
                     ]
                 },
                 {
-                    "classifier-definition-id": "Classifier-IP-Protocol",
+                    "classifier-definition-id": "79c6fdb2-1e1a-4832-af57-c65baf5c2335",
                     "name": "icmp",
                     "parameter-value": [
                         {
             "action-instance": [
                 {
                     "name": "allow1",
-                    "action-definition-id": "Action-Allow"
+                    "action-definition-id": "f942e8fd-e957-42b7-bd18-f73d11266d17"
                 }
             ]
         },
diff --git a/csit/variables/gbp/lithium/tenants.json b/csit/variables/gbp/lithium/tenants.json
new file mode 100644 (file)
index 0000000..822e842
--- /dev/null
@@ -0,0 +1,183 @@
+{
+    "policy:tenants": {
+
+        "policy:tenant": [{
+            "contract": [
+                {
+                    "clause": [
+                        {
+                            "name": "allow-http-clause",
+                            "subject-refs": [
+                                "allow-http-subject",
+                                "allow-icmp-subject"
+                            ]
+                        }
+                    ],
+                    "id": "22282cca-9a13-4d0c-a67e-a933ebb0b0ae",
+                    "subject": [
+                        {
+                            "name": "allow-http-subject",
+                            "rule": [
+                                {
+                                    "classifier-ref": [
+                                        {
+                                            "direction": "in",
+                                            "name": "http-dest",
+                                            "instance-name": "http-dest"
+                                        },
+                                        {
+                                            "direction": "out",
+                                            "name": "http-src",
+                                            "instance-name": "http-src"
+                                        }
+                                    ],
+                                    "action-ref": [
+                                        {
+                                            "name": "allow1",
+                                            "order": 0
+                                        }
+                                    ],
+                                    "name": "allow-http-rule"
+                                }
+                            ]
+                        },
+                        {
+                            "name": "allow-icmp-subject",
+                            "rule": [
+                                {
+                                    "classifier-ref": [
+                                        {
+                                            "name": "icmp",
+                                            "instance-name": "icmp"
+                                        }
+                                    ],
+                                    "action-ref": [
+                                        {
+                                            "name": "allow1",
+                                            "order": 0
+                                        }
+                                    ],
+                                    "name": "allow-icmp-rule"
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "endpoint-group": [
+                {
+                    "consumer-named-selector": [
+                        {
+                            "contract": [
+                                "22282cca-9a13-4d0c-a67e-a933ebb0b0ae"
+                            ],
+                            "name": "e593f05d-96be-47ad-acd5-ba81465680d5-1eaf9a67-a171-42a8-9282-71cf702f61dd-22282cca-9a13-4d0c-a67e-a933ebb0b0ae"
+                        }
+                    ],
+                    "id": "1eaf9a67-a171-42a8-9282-71cf702f61dd",
+                    "network-domain": "d2779562-ebf1-45e6-93a4-78e2362bc418",
+                    "provider-named-selector": []
+                },
+                {
+                    "consumer-named-selector": [],
+                    "id": "e593f05d-96be-47ad-acd5-ba81465680d5",
+                    "network-domain": "2c71d675-693e-406f-899f-12a026eb55f1",
+                    "provider-named-selector": [
+                        {
+                            "contract": [
+                                "22282cca-9a13-4d0c-a67e-a933ebb0b0ae"
+                            ],
+                            "name": "e593f05d-96be-47ad-acd5-ba81465680d5-1eaf9a67-a171-42a8-9282-71cf702f61dd-22282cca-9a13-4d0c-a67e-a933ebb0b0ae"
+                        }
+                    ]
+                }
+            ],
+            "id": "f5c7d344-d1c7-4208-8531-2c2693657e12",
+            "l2-bridge-domain": [
+                {
+                    "id": "7b796915-adf4-4356-b5ca-de005ac410c1",
+                    "parent": "cbe0cc07-b8ff-451d-8171-9eef002a8e80"
+                }
+            ],
+            "l2-flood-domain": [
+                {
+                    "id": "1ddde8d8-c2bc-48d7-8ce0-d78eb6ed4b5b",
+                    "parent": "7b796915-adf4-4356-b5ca-de005ac410c1"
+                },
+                {
+                    "id": "03f69af2-481c-4554-97d6-c4fedca5d126",
+                    "parent": "7b796915-adf4-4356-b5ca-de005ac410c1"
+                }
+            ],
+            "l3-context": [
+                {
+                    "id": "cbe0cc07-b8ff-451d-8171-9eef002a8e80"
+                }
+            ],
+            "name": "GBPPOC",
+            "subject-feature-instances": {
+                "classifier-instance": [
+                    {
+                        "classifier-definition-id": "4250ab32-e8b8-445a-aebb-e1bd2cdd291f",
+                        "name": "http-dest",
+                        "parameter-value": [
+                            {
+                                "int-value": "6",
+                                "name": "proto"
+                            },
+                            {
+                                "int-value": "80",
+                                "name": "destport"
+                            }
+                        ]
+                    },
+                    {
+                        "classifier-definition-id": "4250ab32-e8b8-445a-aebb-e1bd2cdd291f",
+                        "name": "http-src",
+                        "parameter-value": [
+                            {
+                                "int-value": "6",
+                                "name": "proto"
+                            },
+                            {
+                                "int-value": "80",
+                                "name": "sourceport"
+                            }
+                        ]
+                    },
+                    {
+                        "classifier-definition-id": "79c6fdb2-1e1a-4832-af57-c65baf5c2335",
+                        "name": "icmp",
+                        "parameter-value": [
+                            {
+                                "int-value": "1",
+                                "name": "proto"
+                            }
+                        ]
+                    }
+                ],
+                "action-instance": [
+                    {
+                        "name": "allow1",
+                        "action-definition-id": "f942e8fd-e957-42b7-bd18-f73d11266d17"
+                    }
+                ]
+            },
+            "subnet": [
+                {
+                    "id": "d2779562-ebf1-45e6-93a4-78e2362bc418",
+                    "ip-prefix": "10.0.35.1/24",
+                    "parent": "1ddde8d8-c2bc-48d7-8ce0-d78eb6ed4b5b",
+                    "virtual-router-ip": "10.0.35.1"
+                },
+                {
+                    "id": "2c71d675-693e-406f-899f-12a026eb55f1",
+                    "ip-prefix": "10.0.36.1/24",
+                    "parent": "03f69af2-481c-4554-97d6-c4fedca5d126",
+                    "virtual-router-ip": "10.0.36.1"
+                }
+            ]
+        }]
+
+    }
+}
diff --git a/csit/variables/gbp/master/tenant1.json b/csit/variables/gbp/master/tenant1.json
new file mode 100644 (file)
index 0000000..b9eb345
--- /dev/null
@@ -0,0 +1,177 @@
+{
+    "policy:tenant": {
+        "contract": [
+            {
+                "clause": [
+                    {
+                        "name": "allow-http-clause",
+                        "subject-refs": [
+                            "allow-http-subject",
+                            "allow-icmp-subject"
+                        ]
+                    }
+                ],
+                "id": "icmp-http-contract",
+                "subject": [
+                    {
+                        "name": "allow-http-subject",
+                        "rule": [
+                            {
+                                "classifier-ref": [
+                                    {
+                                        "direction": "in",
+                                        "name": "http-dest",
+                                        "instance-name": "http-dest"
+                                    },
+                                    {
+                                        "direction": "out",
+                                        "name": "http-src",
+                                        "instance-name": "http-src"
+                                    }
+                                ],
+                                "action-ref": [
+                                    {
+                                        "name": "allow1",
+                                        "order": 0
+                                    }
+                                ],
+                                "name": "allow-http-rule"
+                            }
+                        ]
+                    },
+                    {
+                        "name": "allow-icmp-subject",
+                        "rule": [
+                            {
+                                "classifier-ref": [
+                                    {
+                                        "name": "icmp",
+                                        "instance-name": "icmp"
+                                    }
+                                ],
+                                "action-ref": [
+                                    {
+                                        "name": "allow1",
+                                        "order": 0
+                                    }
+                                ],
+                                "name": "allow-icmp-rule"
+                            }
+                        ]
+                    }
+                ]
+            }
+        ],
+        "endpoint-group": [
+            {
+                "consumer-named-selector": [
+                    {
+                        "contract": [
+                            "icmp-http-contract"
+                        ],
+                        "name": "webservers-clients-icmp-http-contract"
+                    }
+                ],
+                "id": "clients",
+                "provider-named-selector": []
+            },
+            {
+                "consumer-named-selector": [],
+                "id": "webservers",
+                "provider-named-selector": [
+                    {
+                        "contract": [
+                            "icmp-http-contract"
+                        ],
+                        "name": "webservers-clients-icmp-http-contract"
+                    }
+                ]
+            }
+        ],
+        "id": "tenant-red",
+        "l2-bridge-domain": [
+            {
+                "id": "bridge-domain1",
+                "parent": "l3-context-vrf-red"
+            }
+        ],
+        "l2-flood-domain": [
+            {
+                "id": "flood-domain-1",
+                "parent": "bridge-domain1"
+            },
+            {
+                "id": "flood-domain1",
+                "parent": "bridge-domain1"
+            }
+        ],
+        "l3-context": [
+            {
+                "id": "l3-context-vrf-red"
+            }
+        ],
+        "name": "GBPPOC",
+        "subject-feature-instances": {
+            "classifier-instance": [
+                {
+                    "classifier-definition-id": "Classifier-L4",
+                    "name": "http-dest",
+                    "parameter-value": [
+                        {
+                            "int-value": "6",
+                            "name": "proto"
+                        },
+                        {
+                            "int-value": "80",
+                            "name": "destport"
+                        }
+                    ]
+                },
+                {
+                    "classifier-definition-id": "Classifier-L4",
+                    "name": "http-src",
+                    "parameter-value": [
+                        {
+                            "int-value": "6",
+                            "name": "proto"
+                        },
+                        {
+                            "int-value": "80",
+                            "name": "sourceport"
+                        }
+                    ]
+                },
+                {
+                    "classifier-definition-id": "Classifier-IP-Protocol",
+                    "name": "icmp",
+                    "parameter-value": [
+                        {
+                            "int-value": "1",
+                            "name": "proto"
+                        }
+                    ]
+                }
+            ],
+            "action-instance": [
+                {
+                    "name": "allow1",
+                    "action-definition-id": "Action-Allow"
+                }
+            ]
+        },
+        "subnet": [
+            {
+                "id": "subnet-10.0.35.0/24",
+                "ip-prefix": "10.0.35.1/24",
+                "parent": "flood-domain-1",
+                "virtual-router-ip": "10.0.35.1"
+            },
+            {
+                "id": "subnet-10.0.36.0/24",
+                "ip-prefix": "10.0.36.1/24",
+                "parent": "flood-domain1",
+                "virtual-router-ip": "10.0.36.1"
+            }
+        ]
+    }
+}
diff --git a/csit/variables/gbp/master/tenants.json b/csit/variables/gbp/master/tenants.json
new file mode 100644 (file)
index 0000000..462f45d
--- /dev/null
@@ -0,0 +1,183 @@
+{
+    "policy:tenants": {
+        "policy:tenant": [
+            {
+                "contract": [
+                    {
+                        "clause": [
+                            {
+                                "name": "allow-http-clause",
+                                "subject-refs": [
+                                    "allow-http-subject",
+                                    "allow-icmp-subject"
+                                ]
+                            }
+                        ],
+                        "id": "icmp-http-contract",
+                        "subject": [
+                            {
+                                "name": "allow-http-subject",
+                                "rule": [
+                                    {
+                                        "classifier-ref": [
+                                            {
+                                                "direction": "in",
+                                                "name": "http-dest",
+                                                "instance-name": "http-dest"
+                                            },
+                                            {
+                                                "direction": "out",
+                                                "name": "http-src",
+                                                "instance-name": "http-src"
+                                            }
+                                        ],
+                                        "action-ref": [
+                                            {
+                                                "name": "allow1",
+                                                "order": 0
+                                            }
+                                        ],
+                                        "name": "allow-http-rule"
+                                    }
+                                ]
+                            },
+                            {
+                                "name": "allow-icmp-subject",
+                                "rule": [
+                                    {
+                                        "classifier-ref": [
+                                            {
+                                                "name": "icmp",
+                                                "instance-name": "icmp"
+                                            }
+                                        ],
+                                        "action-ref": [
+                                            {
+                                                "name": "allow1",
+                                                "order": 0
+                                            }
+                                        ],
+                                        "name": "allow-icmp-rule"
+                                    }
+                                ]
+                            }
+                        ]
+                    }
+                ],
+                "endpoint-group": [
+                    {
+                        "consumer-named-selector": [
+                            {
+                                "contract": [
+                                    "icmp-http-contract"
+                                ],
+                                "name": "webservers-clients-icmp-http-contract"
+                            }
+                        ],
+                        "id": "clients",
+                        "provider-named-selector": []
+                    },
+                    {
+                        "consumer-named-selector": [],
+                        "id": "webservers",
+                        "provider-named-selector": [
+                            {
+                                "contract": [
+                                    "icmp-http-contract"
+                                ],
+                                "name": "webservers-clients-icmp-http-contract"
+                            }
+                        ]
+                    }
+                ],
+                "id": "tenant-red",
+                "l2-bridge-domain": [
+                    {
+                        "id": "bridge-domain1",
+                        "parent": "l3-context-vrf-red"
+                    }
+                ],
+                "l2-flood-domain": [
+                    {
+                        "id": "flood-domain-1",
+                        "parent": "bridge-domain1"
+                    },
+                    {
+                        "id": "flood-domain1",
+                        "parent": "bridge-domain1"
+                    }
+                ],
+                "l3-context": [
+                    {
+                        "id": "l3-context-vrf-red"
+                    }
+                ],
+                "name": "GBPPOC",
+                "subject-feature-instances": {
+                    "classifier-instance": [
+                        {
+                            "classifier-definition-id": "Classifier-L4",
+                            "name": "http-dest",
+                            "parameter-value": [
+                                {
+                                    "int-value": "6",
+                                    "name": "proto"
+                                },
+                                {
+                                    "int-value": "80",
+                                    "name": "destport"
+                                }
+                            ]
+                        },
+                        {
+                            "classifier-definition-id": "Classifier-L4",
+                            "name": "http-src",
+                            "parameter-value": [
+                                {
+                                    "int-value": "6",
+                                    "name": "proto"
+                                },
+                                {
+                                    "int-value": "80",
+                                    "name": "sourceport"
+                                }
+                            ]
+                        },
+                        {
+                            "classifier-definition-id": "Classifier-IP-Protocol",
+                            "name": "icmp",
+                            "parameter-value": [
+                                {
+                                    "int-value": "1",
+                                    "name": "proto"
+                                }
+                            ]
+                        }
+                    ],
+                    "action-instance": [
+                        {
+                            "name": "allow1",
+                            "action-definition-id": "Action-Allow"
+                        }
+                    ]
+                },
+                "subnet": [
+                    {
+                        "id": "subnet-10.0.35.0/24",
+                        "ip-prefix": "10.0.35.1/24",
+                        "parent": "flood-domain-1",
+                        "virtual-router-ip": "10.0.35.1"
+                    },
+                    {
+                        "id": "subnet-10.0.36.0/24",
+                        "ip-prefix": "10.0.36.1/24",
+                        "parent": "flood-domain1",
+                        "virtual-router-ip": "10.0.36.1"
+                    }
+                ]
+            }
+        ]
+    }
+}
+
+