Separating SFC JSON files for Lithium and Master

- The Lithium JSON have a different format than for Master
- PatchSet 2 : minor fix from Jamo comments, and calling Install a feature
- PatchSet 3 : Now the lithium/master features will be set in releng yamls
- PatchSet 4 : Correcting Suite Setup

Change-Id: I3535cf0303b2ab7d684481fe11bc6d8061ad5ea2
Signed-off-by: Brady Johnson <brady.allen.johnson@ericsson.com>

diff --git a/csit/suites/sfc/Clustering_Datastore/020_simple_clustering.robot b/csit/suites/sfc/Clustering_Datastore/020_simple_clustering.robot
index 61818742708155b74d062adf448acf14255c83c4..ea82c3c82e52489f33349bec0682446d246e0bab 100644 (file)
--- a/csit/suites/sfc/Clustering_Datastore/020_simple_clustering.robot
+++ b/csit/suites/sfc/Clustering_Datastore/020_simple_clustering.robot
@@ -1,5 +1,6 @@
 *** Settings ***
 Documentation     Test suite for SFC Service Functions, Operates functions from Restconf APIs.
+Suite Setup       Init Variables
 Suite Teardown    Delete All Sessions
 Library           RequestsLibrary
 Library           SSHLibrary
@@ -8,10 +9,6 @@ Library           OperatingSystem
 Variables         ../../../variables/Variables.py
 Resource          ../../../libraries/Utils.robot
 
-*** Variables ***
-${SFC_API}        /restconf/config/service-function:service-functions
-${SFC_FUNCTIONS_FILE}    ${CURDIR}/../../../variables/sfc/service-functions.json
-
 *** Test Cases ***
 Add Service Functions To First Node
     [Documentation]    Add service functions from JSON file
@@ -45,3 +42,19 @@ Read JSON From File
     ${body}    OperatingSystem.Get File    ${filepath}
     ${jsonbody}    To Json    ${body}
     [Return]    ${jsonbody}
+
+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 Suite Variable    ${SFC_API}            /restconf/config/service-function:service-functions
+    Set Suite Variable    ${SFC_FUNCTIONS_FILE} ${CURDIR}/../../../variables/sfc/master/service-functions.json
+
+Init Variables Lithium
+    [Documentation]    Sets variables specific to Lithium version
+    Set Suite Variable    ${SFC_API}            /restconf/config/service-function:service-functions
+    Set Suite Variable    ${SFC_FUNCTIONS_FILE} ${CURDIR}/../../../variables/sfc/lithium/service-functions.json

diff --git a/csit/variables/sfc/lithium/service-function-chains.json b/csit/variables/sfc/lithium/service-function-chains.json
new file mode 100644 (file)
index 0000000..a7d8cd0
--- /dev/null
+++ b/csit/variables/sfc/lithium/service-function-chains.json
@@ -0,0 +1,41 @@
+{
+  "service-function-chains": {
+    "service-function-chain": [
+      {
+        "name": "SFC1",
+        "sfc-service-function": [
+          {
+            "name": "dpi-abstract1",
+            "type": "service-function-type:dpi",
+            "order" : 0
+          },
+          {
+            "name": "napt44-abstract1",
+            "type": "service-function-type:napt44",
+            "order" : 1
+          },
+          {
+            "name": "firewall-abstract1",
+            "type": "service-function-type:firewall",
+            "order" : 2
+          }
+        ]
+      },
+      {
+        "name": "SFC2",
+        "sfc-service-function": [
+          {
+            "name": "firewall-abstract2",
+            "type": "service-function-type:firewall",
+            "order" : 0
+          },
+          {
+            "name": "napt44-abstract2",
+            "type": "service-function-type:napt44",
+            "order" : 1
+          }
+        ]
+      }
+    ]
+  }
+}

diff --git a/csit/variables/sfc/lithium/service-function-forwarders.json b/csit/variables/sfc/lithium/service-function-forwarders.json
new file mode 100644 (file)
index 0000000..a1758dc
--- /dev/null
+++ b/csit/variables/sfc/lithium/service-function-forwarders.json
@@ -0,0 +1,90 @@
+{
+  "service-function-forwarders": {
+    "service-function-forwarder": [
+      {
+        "name": "SFF-bootstrap",
+        "service-node": "OVSDB1",
+        "rest-uri": "http://localhost:5000",
+        "sff-data-plane-locator": [
+          {
+            "name": "eth0",
+            "data-plane-locator": {
+              "port": 5000,
+              "ip": "192.168.1.1",
+              "transport": "service-locator:vxlan-gpe"
+            }
+          }
+        ],
+        "service-function-dictionary": [
+          {
+            "sff-sf-data-plane-locator": {
+              "port": 5000,
+              "ip": "10.1.1.1"
+            },
+            "name": "SF1",
+            "type": "service-function-type:dpi"
+          },
+          {
+            "sff-sf-data-plane-locator": {
+              "port": 5000,
+              "ip": "10.1.1.2"
+            },
+            "name": "SF2",
+            "type": "service-function-type:firewall"
+          }
+        ],
+        "connected-sff-dictionary": [
+          {
+            "sff-sff-data-plane-locator": {
+              "port": 5000,
+              "ip": "192.168.1.2"
+            },
+            "name": "br-int-ovs-2"
+          }
+        ]
+      },
+      {
+        "name": "br-int-ovs-2",
+        "service-node": "OVSDB2",
+        "rest-uri": "http://localhost:5000",
+        "sff-data-plane-locator": [
+          {
+            "name": "eth0",
+            "data-plane-locator": {
+              "port": 5000,
+              "ip": "192.168.1.2",
+              "transport": "service-locator:vxlan-gpe"
+            }
+          }
+        ],
+        "service-function-dictionary": [
+          {
+            "sff-sf-data-plane-locator": {
+              "port": 5000,
+              "ip": "10.1.1.5"
+            },
+            "name": "SF5",
+            "type": "service-function-type:dpi"
+          },
+          {
+            "sff-sf-data-plane-locator": {
+              "port": 5000,
+              "ip": "10.1.1.6"
+            },
+            "name": "SF6",
+            "type": "service-function-type:napt44"
+          }
+        ],
+        "connected-sff-dictionary": [
+          {
+            "sff-sff-data-plane-locator": {
+              "port": 5000,
+              "ip": "10.1.1.2"
+            },
+            "name": "SFF-bootstrap"
+          }
+        ]
+      }
+    ]
+  }
+}

diff --git a/csit/variables/sfc/service-function-paths.json b/csit/variables/sfc/lithium/service-function-paths.json
similarity index 100%
rename from csit/variables/sfc/service-function-paths.json
rename to csit/variables/sfc/lithium/service-function-paths.json

diff --git a/csit/variables/sfc/lithium/service-functions.json b/csit/variables/sfc/lithium/service-functions.json
new file mode 100644 (file)
index 0000000..8d42773
--- /dev/null
+++ b/csit/variables/sfc/lithium/service-functions.json
@@ -0,0 +1,141 @@
+{
+  "service-functions": {
+    "service-function": [
+      {
+        "rest-uri": "http://localhost:10002",
+        "ip-mgmt-address": "10.3.1.103",
+        "sf-data-plane-locator": [
+          {
+            "name": "preferred",
+            "port": 10002,
+            "ip": "10.3.1.103",
+            "service-function-forwarder": "SFF-bootstrap"
+          }
+        ],
+        "name": "napt44-103-2",
+        "type": "service-function-type:napt44",
+        "nsh-aware": true
+      },
+      {
+        "rest-uri": "http://localhost:10001",
+        "ip-mgmt-address": "10.3.1.103",
+        "sf-data-plane-locator": [
+          {
+            "name": "master",
+            "port": 10001,
+            "ip": "10.3.1.103",
+            "service-function-forwarder": "SFF-bootstrap"
+          }
+        ],
+        "name": "napt44-103-1",
+        "type": "service-function-type:napt44",
+        "nsh-aware": true
+      },
+      {
+        "rest-uri": "http://localhost:10002",
+        "ip-mgmt-address": "10.3.1.102",
+        "sf-data-plane-locator": [
+          {
+            "name": "1",
+            "port": 10002,
+            "ip": "10.3.1.102",
+            "service-function-forwarder": "SFF-bootstrap"
+          }
+        ],
+        "name": "dpi-102-2",
+        "type": "service-function-type:dpi",
+        "nsh-aware": true
+      },
+      {
+        "rest-uri": "http://localhost:10002",
+        "ip-mgmt-address": "10.3.1.101",
+        "sf-data-plane-locator": [
+          {
+            "name": "2",
+            "port": 10002,
+            "ip": "10.3.1.101",
+            "service-function-forwarder": "SFF-bootstrap"
+          }
+        ],
+        "name": "firewall-101-2",
+        "type": "service-function-type:firewall",
+        "nsh-aware": true
+      },
+      {
+        "rest-uri": "http://localhost:10002",
+        "ip-mgmt-address": "10.3.1.104",
+        "sf-data-plane-locator": [
+          {
+            "name": "3",
+            "port": 10020,
+            "ip": "10.3.1.104",
+            "service-function-forwarder": "SFF-bootstrap"
+          }
+        ],
+        "name": "napt44-104",
+        "type": "service-function-type:napt44",
+        "nsh-aware": true
+      },
+      {
+        "rest-uri": "http://localhost:10001",
+        "ip-mgmt-address": "10.3.1.102",
+        "sf-data-plane-locator": [
+          {
+            "name": "4",
+            "port": 10001,
+            "ip": "10.3.1.102",
+            "service-function-forwarder": "SFF-bootstrap"
+          }
+        ],
+        "name": "dpi-102-1",
+        "type": "service-function-type:dpi",
+        "nsh-aware": true
+      },
+      {
+        "rest-uri": "http://localhost:10001",
+        "ip-mgmt-address": "10.3.1.104",
+        "sf-data-plane-locator": [
+          {
+            "name": "my-locator",
+            "port": 10001,
+            "ip": "10.3.1.104",
+            "service-function-forwarder": "SFF-bootstrap"
+          }
+        ],
+        "name": "firewall-104",
+        "type": "service-function-type:firewall",
+        "nsh-aware": true
+      },
+      {
+        "rest-uri": "http://localhost:10003",
+        "ip-mgmt-address": "10.3.1.102",
+        "sf-data-plane-locator": [
+          {
+            "name": "101",
+            "port": 10003,
+            "ip": "10.3.1.102",
+            "service-function-forwarder": "SFF-bootstrap"
+          }
+        ],
+        "name": "dpi-102-3",
+        "type": "service-function-type:dpi",
+        "nsh-aware": true
+      },
+      {
+        "rest-uri": "http://localhost:10001",
+        "ip-mgmt-address": "10.3.1.101",
+        "sf-data-plane-locator": [
+          {
+            "name": "007",
+            "port": 10001,
+            "ip": "10.3.1.101",
+            "service-function-forwarder": "SFF-bootstrap"
+          }
+        ],
+        "name": "firewall-101-1",
+        "type": "service-function-type:firewall",
+        "nsh-aware": true
+      }
+    ]
+  }
+}

diff --git a/csit/variables/sfc/service-loadbalance-schedule-type.json b/csit/variables/sfc/lithium/service-loadbalance-schedule-type.json
similarity index 100%
rename from csit/variables/sfc/service-loadbalance-schedule-type.json
rename to csit/variables/sfc/lithium/service-loadbalance-schedule-type.json

diff --git a/csit/variables/sfc/service-nodes.json b/csit/variables/sfc/lithium/service-nodes.json
similarity index 100%
rename from csit/variables/sfc/service-nodes.json
rename to csit/variables/sfc/lithium/service-nodes.json

diff --git a/csit/variables/sfc/service-random-schedule-type.json b/csit/variables/sfc/lithium/service-random-schedule-type.json
similarity index 100%
rename from csit/variables/sfc/service-random-schedule-type.json
rename to csit/variables/sfc/lithium/service-random-schedule-type.json

diff --git a/csit/variables/sfc/service-roundrobin-schedule-type.json b/csit/variables/sfc/lithium/service-roundrobin-schedule-type.json
similarity index 100%
rename from csit/variables/sfc/service-roundrobin-schedule-type.json
rename to csit/variables/sfc/lithium/service-roundrobin-schedule-type.json

diff --git a/csit/variables/sfc/service-schedule-types.json b/csit/variables/sfc/lithium/service-schedule-types.json
similarity index 100%
rename from csit/variables/sfc/service-schedule-types.json
rename to csit/variables/sfc/lithium/service-schedule-types.json

diff --git a/csit/variables/sfc/service-shortestpath-schedule-type.json b/csit/variables/sfc/lithium/service-shortestpath-schedule-type.json
similarity index 100%
rename from csit/variables/sfc/service-shortestpath-schedule-type.json
rename to csit/variables/sfc/lithium/service-shortestpath-schedule-type.json

diff --git a/csit/variables/sfc/service-wsp-schedule-type.json b/csit/variables/sfc/lithium/service-wsp-schedule-type.json
similarity index 100%
rename from csit/variables/sfc/service-wsp-schedule-type.json
rename to csit/variables/sfc/lithium/service-wsp-schedule-type.json

diff --git a/csit/variables/sfc/lithium/sf_dpi_102_100.json b/csit/variables/sfc/lithium/sf_dpi_102_100.json
new file mode 100644 (file)
index 0000000..8acbc95
--- /dev/null
+++ b/csit/variables/sfc/lithium/sf_dpi_102_100.json
@@ -0,0 +1,19 @@
+{
+    "service-function": [
+        {
+            "name": "dpi-102-100",
+            "type": "service-function-type:dpi",
+            "nsh-aware": true,
+            "sf-data-plane-locator": [
+                {
+                    "name": "dpl-100",
+                    "port": 10100,
+                    "ip": "10.3.1.102",
+                    "service-function-forwarder": "SFF-bootstrap"
+                }
+            ],
+            "ip-mgmt-address": "10.3.1.102",
+            "rest-uri": "http://localhost:10100"
+        }
+    ]
+}

diff --git a/csit/variables/sfc/sf_dpl_101.json b/csit/variables/sfc/lithium/sf_dpl_101.json
similarity index 100%
rename from csit/variables/sfc/sf_dpl_101.json
rename to csit/variables/sfc/lithium/sf_dpl_101.json

diff --git a/csit/variables/sfc/lithium/sfc_chain_100.json b/csit/variables/sfc/lithium/sfc_chain_100.json
new file mode 100644 (file)
index 0000000..f8702a1
--- /dev/null
+++ b/csit/variables/sfc/lithium/sfc_chain_100.json
@@ -0,0 +1,24 @@
+{
+    "service-function-chain": [
+        {
+            "name": "SFC100",
+            "sfc-service-function": [
+                {
+                    "name": "dpi-abstract100",
+                    "order": 0,
+                    "type": "service-function-type:firewall"
+                },
+                {
+                    "name": "napt44-abstract100",
+                    "order": 1,
+                    "type": "service-function-type:dpi"
+                },
+                {
+                    "name": "firewall-abstract100",
+                    "order": 2,
+                    "type": "service-function-type:napt44"
+                }
+            ]
+        }
+    ]
+}

diff --git a/csit/variables/sfc/lithium/sfc_chain_100_sfids.json b/csit/variables/sfc/lithium/sfc_chain_100_sfids.json
new file mode 100644 (file)
index 0000000..d6d6025
--- /dev/null
+++ b/csit/variables/sfc/lithium/sfc_chain_100_sfids.json
@@ -0,0 +1,9 @@
+{
+    "sfc-service-function": [
+        {
+            "name": "ids-abstract100",
+            "order": 3,
+            "type": "service-function-type:ids"
+        }
+    ]
+}

diff --git a/csit/variables/sfc/sff_csd_locator.json b/csit/variables/sfc/lithium/sff_csd_locator.json
similarity index 100%
rename from csit/variables/sfc/sff_csd_locator.json
rename to csit/variables/sfc/lithium/sff_csd_locator.json

diff --git a/csit/variables/sfc/sff_csd_sff100.json b/csit/variables/sfc/lithium/sff_csd_sff100.json
similarity index 100%
rename from csit/variables/sfc/sff_csd_sff100.json
rename to csit/variables/sfc/lithium/sff_csd_sff100.json

diff --git a/csit/variables/sfc/sff_dpl_101.json b/csit/variables/sfc/lithium/sff_dpl_101.json
similarity index 100%
rename from csit/variables/sfc/sff_dpl_101.json
rename to csit/variables/sfc/lithium/sff_dpl_101.json

diff --git a/csit/variables/sfc/sff_dpl_locator.json b/csit/variables/sfc/lithium/sff_dpl_locator.json
similarity index 100%
rename from csit/variables/sfc/sff_dpl_locator.json
rename to csit/variables/sfc/lithium/sff_dpl_locator.json

diff --git a/csit/variables/sfc/lithium/sff_ovs_100.json b/csit/variables/sfc/lithium/sff_ovs_100.json
new file mode 100644 (file)
index 0000000..b9fcad6
--- /dev/null
+++ b/csit/variables/sfc/lithium/sff_ovs_100.json
@@ -0,0 +1,29 @@
+{
+    "service-function-forwarder": [
+      {
+        "name": "ovs-100",
+        "service-node": "OVSDB2",
+        "rest-uri": "http://localhost:6000",
+        "sff-data-plane-locator": [
+          {
+            "name": "eth0",
+            "data-plane-locator": {
+              "port": 6000,
+              "ip": "192.168.1.2",
+              "transport": "service-locator:vxlan-gpe"
+            }
+          }
+        ],
+        "service-function-dictionary": [
+          {
+            "sff-sf-data-plane-locator": {
+              "port": 6000,
+              "ip": "10.1.1.7"
+            },
+            "name": "SF7",
+            "type": "service-function-type:dpi"
+          }
+        ]
+      }
+    ]
+}

diff --git a/csit/variables/sfc/lithium/sff_sfd_locator.json b/csit/variables/sfc/lithium/sff_sfd_locator.json
new file mode 100644 (file)
index 0000000..3967026
--- /dev/null
+++ b/csit/variables/sfc/lithium/sff_sfd_locator.json
@@ -0,0 +1,6 @@
+{
+    "sff-sf-data-plane-locator": {
+         "port": 6000,
+         "ip": "10.1.1.1"
+    }
+}

diff --git a/csit/variables/sfc/lithium/sff_sfd_sf100.json b/csit/variables/sfc/lithium/sff_sfd_sf100.json
new file mode 100644 (file)
index 0000000..68915bd
--- /dev/null
+++ b/csit/variables/sfc/lithium/sff_sfd_sf100.json
@@ -0,0 +1,12 @@
+{
+    "service-function-dictionary": [
+        {
+            "name": "SF100",
+            "sff-sf-data-plane-locator": {
+              "port": 5100,
+              "ip": "10.1.1.1"
+            },
+            "type": "service-function-type:napt44"
+        }
+    ]
+}

diff --git a/csit/variables/sfc/sfp_sfc1_path400.json b/csit/variables/sfc/lithium/sfp_sfc1_path400.json
similarity index 100%
rename from csit/variables/sfc/sfp_sfc1_path400.json
rename to csit/variables/sfc/lithium/sfp_sfc1_path400.json

diff --git a/csit/variables/sfc/sn_node_100.json b/csit/variables/sfc/lithium/sn_node_100.json
similarity index 100%
rename from csit/variables/sfc/sn_node_100.json
rename to csit/variables/sfc/lithium/sn_node_100.json

diff --git a/csit/variables/sfc/service-function-chains.json b/csit/variables/sfc/master/service-function-chains.json
similarity index 100%
rename from csit/variables/sfc/service-function-chains.json
rename to csit/variables/sfc/master/service-function-chains.json

diff --git a/csit/variables/sfc/service-function-forwarders.json b/csit/variables/sfc/master/service-function-forwarders.json
similarity index 100%
rename from csit/variables/sfc/service-function-forwarders.json
rename to csit/variables/sfc/master/service-function-forwarders.json

diff --git a/csit/variables/sfc/master/service-function-paths.json b/csit/variables/sfc/master/service-function-paths.json
new file mode 100644 (file)
index 0000000..4b1eadf
--- /dev/null
+++ b/csit/variables/sfc/master/service-function-paths.json
@@ -0,0 +1,26 @@
+{
+  "service-function-paths": {
+    "service-function-path": [
+      {
+        "name": "SFC1-100",
+        "service-chain-name": "SFC1"
+      },
+      {
+        "name": "SFC1-200",
+        "service-chain-name": "SFC1"
+      },
+      {
+        "name": "SFC1-300",
+        "service-chain-name": "SFC1"
+      },
+      {
+        "name": "SFC2-100",
+        "service-chain-name": "SFC2"
+      },
+      {
+        "name": "SFC2-200",
+        "service-chain-name": "SFC2"
+      }
+    ]
+  }
+}

diff --git a/csit/variables/sfc/service-functions.json b/csit/variables/sfc/master/service-functions.json
similarity index 100%
rename from csit/variables/sfc/service-functions.json
rename to csit/variables/sfc/master/service-functions.json

diff --git a/csit/variables/sfc/master/service-loadbalance-schedule-type.json b/csit/variables/sfc/master/service-loadbalance-schedule-type.json
new file mode 100644 (file)
index 0000000..e5780f3
--- /dev/null
+++ b/csit/variables/sfc/master/service-loadbalance-schedule-type.json
@@ -0,0 +1,9 @@
+{
+    "service-function-scheduler-type": [
+        {
+            "type": "service-function-scheduler-type:load-balance",
+            "enabled": true,
+            "name": "load-balance"
+        }
+    ]
+}

diff --git a/csit/variables/sfc/master/service-nodes.json b/csit/variables/sfc/master/service-nodes.json
new file mode 100644 (file)
index 0000000..36787c1
--- /dev/null
+++ b/csit/variables/sfc/master/service-nodes.json
@@ -0,0 +1,39 @@
+{
+    "service-nodes": {
+        "service-node": [
+            {
+                "name": "node-101",
+                "service-function": [
+                    "firewall-101-2",
+                    "firewall-101-1"
+                ],
+                "ip-mgmt-address": "10.3.1.101"
+            },
+            {
+                "name": "node-102",
+                "service-function": [
+                    "dpi-102-1",
+                    "dpi-102-2",
+                    "dpi-102-3"
+                ],
+                "ip-mgmt-address": "10.3.1.102"
+            },
+            {
+                "name": "node-103",
+                "service-function": [
+                    "napt44-103-1",
+                    "napt44-103-2"
+                ],
+                "ip-mgmt-address": "10.3.1.103"
+            },
+            {
+                "name": "node-104",
+                "service-function": [
+                    "firewall-104",
+                    "napt44-104"
+                ],
+                "ip-mgmt-address": "10.3.1.104"
+            }
+        ]
+    }
+}
\ No newline at end of file

diff --git a/csit/variables/sfc/master/service-random-schedule-type.json b/csit/variables/sfc/master/service-random-schedule-type.json
new file mode 100644 (file)
index 0000000..63b413c
--- /dev/null
+++ b/csit/variables/sfc/master/service-random-schedule-type.json
@@ -0,0 +1,9 @@
+{
+    "service-function-scheduler-type": [
+        {
+            "type": "service-function-scheduler-type:random",
+            "enabled": true,
+            "name": "random"
+        }
+    ]
+}

diff --git a/csit/variables/sfc/master/service-roundrobin-schedule-type.json b/csit/variables/sfc/master/service-roundrobin-schedule-type.json
new file mode 100644 (file)
index 0000000..c716838
--- /dev/null
+++ b/csit/variables/sfc/master/service-roundrobin-schedule-type.json
@@ -0,0 +1,9 @@
+{
+    "service-function-scheduler-type": [
+        {
+            "type": "service-function-scheduler-type:round-robin",
+            "enabled": true,
+            "name": "round-robin"
+        }
+    ]
+}

diff --git a/csit/variables/sfc/master/service-schedule-types.json b/csit/variables/sfc/master/service-schedule-types.json
new file mode 100644 (file)
index 0000000..44aacd4
--- /dev/null
+++ b/csit/variables/sfc/master/service-schedule-types.json
@@ -0,0 +1,27 @@
+{
+  "service-function-scheduler-types": {
+    "service-function-scheduler-type": [
+      {
+        "name": "random",
+        "type": "service-function-scheduler-type:random",
+        "enabled": false
+      },
+      {
+        "name": "round-robin",
+        "type": "service-function-scheduler-type:round-robin",
+        "enabled": true
+      },
+      {
+        "name": "load-balance",
+        "type": "service-function-scheduler-type:load-balance",
+        "enabled": false
+      },
+      {
+        "name": "shortest-path",
+        "type": "service-function-scheduler-type:shortest-path",
+        "enabled": false
+      }
+    ]
+  }
+}
+

diff --git a/csit/variables/sfc/master/service-shortestpath-schedule-type.json b/csit/variables/sfc/master/service-shortestpath-schedule-type.json
new file mode 100644 (file)
index 0000000..5655917
--- /dev/null
+++ b/csit/variables/sfc/master/service-shortestpath-schedule-type.json
@@ -0,0 +1,9 @@
+{
+    "service-function-scheduler-type": [
+        {
+            "type": "service-function-scheduler-type:shortest-path",
+            "enabled": true,
+            "name": "shortest-path"
+        }
+    ]
+}

diff --git a/csit/variables/sfc/master/service-wsp-schedule-type.json b/csit/variables/sfc/master/service-wsp-schedule-type.json
new file mode 100644 (file)
index 0000000..85adbd0
--- /dev/null
+++ b/csit/variables/sfc/master/service-wsp-schedule-type.json
@@ -0,0 +1,9 @@
+{
+    "service-function-scheduler-type": [
+        {
+            "type": "service-function-scheduler-type:weighted-shortest-path",
+            "enabled": false,
+            "name": "weighted-shortest-path"
+        }
+    ]
+}

diff --git a/csit/variables/sfc/sf_dpi_102_100.json b/csit/variables/sfc/master/sf_dpi_102_100.json
similarity index 100%
rename from csit/variables/sfc/sf_dpi_102_100.json
rename to csit/variables/sfc/master/sf_dpi_102_100.json

diff --git a/csit/variables/sfc/master/sf_dpl_101.json b/csit/variables/sfc/master/sf_dpl_101.json
new file mode 100644 (file)
index 0000000..fb1ed3e
--- /dev/null
+++ b/csit/variables/sfc/master/sf_dpl_101.json
@@ -0,0 +1,10 @@
+{
+    "sf-data-plane-locator": [
+        {
+            "name": "dpl-101",
+            "port": 10101,
+            "ip": "10.3.1.102",
+            "service-function-forwarder": "SFF-bootstrap"
+        }
+    ]
+}

diff --git a/csit/variables/sfc/sfc_chain_100.json b/csit/variables/sfc/master/sfc_chain_100.json
similarity index 100%
rename from csit/variables/sfc/sfc_chain_100.json
rename to csit/variables/sfc/master/sfc_chain_100.json

diff --git a/csit/variables/sfc/sfc_chain_100_sfids.json b/csit/variables/sfc/master/sfc_chain_100_sfids.json
similarity index 100%
rename from csit/variables/sfc/sfc_chain_100_sfids.json
rename to csit/variables/sfc/master/sfc_chain_100_sfids.json

diff --git a/csit/variables/sfc/master/sff_csd_locator.json b/csit/variables/sfc/master/sff_csd_locator.json
new file mode 100644 (file)
index 0000000..7ac28e7
--- /dev/null
+++ b/csit/variables/sfc/master/sff_csd_locator.json
@@ -0,0 +1,6 @@
+{
+    "sff-sff-data-plane-locator": {
+        "ip": "10.1.1.1",
+        "port": 6000
+    }
+}

diff --git a/csit/variables/sfc/master/sff_csd_sff100.json b/csit/variables/sfc/master/sff_csd_sff100.json
new file mode 100644 (file)
index 0000000..e2715bb
--- /dev/null
+++ b/csit/variables/sfc/master/sff_csd_sff100.json
@@ -0,0 +1,17 @@
+{
+    "connected-sff-dictionary": [
+        {
+            "name": "SFF100",
+            "sff-interfaces": [
+                {
+                    "sff-interface": "dpl-100"
+                }
+            ],
+            "sff-sff-data-plane-locator": {
+              "port": 6000,
+              "ip": "10.1.1.2"
+            },
+            "failmode": "service-function-forwarder:open"
+        }
+    ]
+}

diff --git a/csit/variables/sfc/master/sff_dpl_101.json b/csit/variables/sfc/master/sff_dpl_101.json
new file mode 100644 (file)
index 0000000..0fd51ef
--- /dev/null
+++ b/csit/variables/sfc/master/sff_dpl_101.json
@@ -0,0 +1,12 @@
+{
+    "sff-data-plane-locator": [
+        {
+            "name": "dpl-101",
+            "data-plane-locator": {
+                "ip": "192.168.1.1",
+                "port": 6101,
+                "transport": "service-locator:vxlan-gpe"
+            }
+        }
+    ]
+}

diff --git a/csit/variables/sfc/master/sff_dpl_locator.json b/csit/variables/sfc/master/sff_dpl_locator.json
new file mode 100644 (file)
index 0000000..3da405b
--- /dev/null
+++ b/csit/variables/sfc/master/sff_dpl_locator.json
@@ -0,0 +1,7 @@
+{
+    "data-plane-locator": {
+        "ip": "192.168.1.1",
+        "port": 5000,
+        "transport": "service-locator:vxlan-gpe"
+    }
+}

diff --git a/csit/variables/sfc/sff_ovs_100.json b/csit/variables/sfc/master/sff_ovs_100.json
similarity index 100%
rename from csit/variables/sfc/sff_ovs_100.json
rename to csit/variables/sfc/master/sff_ovs_100.json

diff --git a/csit/variables/sfc/sff_sfd_locator.json b/csit/variables/sfc/master/sff_sfd_locator.json
similarity index 100%
rename from csit/variables/sfc/sff_sfd_locator.json
rename to csit/variables/sfc/master/sff_sfd_locator.json

diff --git a/csit/variables/sfc/sff_sfd_sf100.json b/csit/variables/sfc/master/sff_sfd_sf100.json
similarity index 100%
rename from csit/variables/sfc/sff_sfd_sf100.json
rename to csit/variables/sfc/master/sff_sfd_sf100.json

diff --git a/csit/variables/sfc/master/sfp_sfc1_path400.json b/csit/variables/sfc/master/sfp_sfc1_path400.json
new file mode 100644 (file)
index 0000000..9a17f8e
--- /dev/null
+++ b/csit/variables/sfc/master/sfp_sfc1_path400.json
@@ -0,0 +1,8 @@
+{
+    "service-function-path": [
+        {
+            "name": "SFC1-400",
+            "service-chain-name": "SFC1"
+        }
+    ]
+}

diff --git a/csit/variables/sfc/master/sn_node_100.json b/csit/variables/sfc/master/sn_node_100.json
new file mode 100644 (file)
index 0000000..2562724
--- /dev/null
+++ b/csit/variables/sfc/master/sn_node_100.json
@@ -0,0 +1,12 @@
+{
+    "service-node": [
+        {
+            "name": "node-100",
+            "ip-mgmt-address": "10.3.1.100",
+            "service-function": [
+                "dpi-100-1",
+                "firewall-102-1"
+            ]
+        }
+    ]
+}