From: Oleksandr Zharov <oleksandr.zharov@pantheon.tech>
Date: Wed, 3 Jan 2024 19:54:33 +0000 (+0100)
Subject: Remove variables for sfc
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F11%2F109611%2F16;p=integration%2Ftest.git

Remove variables for sfc

Removed variables for sfc project.

JIRA: INTTEST-140
Change-Id: I7918811d2c176cd294c53cf34c8ecd4b1a2d1b67
Signed-off-by: Oleksandr Zharov <oleksandr.zharov@pantheon.tech>
---

diff --git a/csit/variables/sfc/Modules.py b/csit/variables/sfc/Modules.py
deleted file mode 100644
index 41a5c1ad03..0000000000
--- a/csit/variables/sfc/Modules.py
+++ /dev/null
@@ -1,23 +0,0 @@
-sfc_data_models = [
-    "config/ietf-access-control-list:access-lists",
-    "config/ietf-interfaces:interfaces",
-    "config/interface-service-bindings:service-bindings",
-    "config/network-topology:network-topology/topology/ovsdb:1",
-    "config/opendaylight-inventory:nodes",
-    "config/rendered-service-path:rendered-service-path",
-    "config/service-function-chain:service-function-chains",
-    "config/service-function-classifier:service-function-classifiers",
-    "config/service-function-forwarder:service-function-forwarders",
-    "config/service-function-group:service-function-groups",
-    "config/service-function-mapping:sff-dpl-by-sf-dpl-mappings",
-    "config/service-function-path:service-function-paths",
-    "config/service-function-path-metadata:service-function-metadata",
-    "config/service-function-type:service-function-types",
-    "config/service-function:service-functions",
-    "config/sfc-of-renderer:sfc-of-renderer-config",
-    "operational/ietf-interfaces:interfaces-state",
-    "operational/network-topology:network-topology/topology/ovsdb:1",
-    "operational/opendaylight-inventory:nodes",
-    "operational/rendered-service-path:rendered-service-paths",
-    "operational/service-function-path:service-function-paths-state",
-]
diff --git a/csit/variables/sfc/Variables.robot b/csit/variables/sfc/Variables.robot
deleted file mode 100644
index b1b53b605f..0000000000
--- a/csit/variables/sfc/Variables.robot
+++ /dev/null
@@ -1,33 +0,0 @@
-*** Variables ***
-# Generic Service Function Chaining URIs
-${REST_CONFIG}                              /restconf/config
-${REST_OPER}                                /restconf/operational
-${OPERATIONAL_RSPS_URI}                     ${REST_OPER}/rendered-service-path:rendered-service-paths
-${OPERATIONAL_RSP_URI}
-...                                         ${REST_OPER}/rendered-service-path:rendered-service-paths/rendered-service-path
-${OVSDB_TOPOLOGY_URI}                       ${REST_OPER}/network-topology:network-topology/topology/ovsdb:1
-${RENDERED_SERVICE_PATHS_URI}               ${REST_CONFIG}/rendered-service-path:rendered-service-paths
-${SERVICE_CHAINS_URI}                       ${REST_CONFIG}/service-function-chain:service-function-chains
-${SERVICE_CHAIN_URI}                        ${SERVICE_CHAINS_URI}/service-function-chain
-${SERVICE_CLASSIFIERS_URI}                  ${REST_CONFIG}/service-function-classifier:service-function-classifiers
-${SERVICE_FORWARDERS_URI}                   ${REST_CONFIG}/service-function-forwarder:service-function-forwarders
-${SERVICE_FORWARDER_URI}                    ${SERVICE_FORWARDERS_URI}/service-function-forwarder
-${SERVICE_FUNCTIONS_URI}                    ${REST_CONFIG}/service-function:service-functions
-${SERVICE_FUNCTION_URI}                     ${SERVICE_FUNCTIONS_URI}/service-function
-${SERVICE_FUNCTION_ACLS_URI}                ${REST_CONFIG}/ietf-access-control-list:access-lists
-${SERVICE_FUNCTION_PATHS_STATE_URI}         ${REST_OPER}/service-function-path:service-function-paths-state
-${SERVICE_FUNCTION_PATH_STATE_URI}          ${SERVICE_FUNCTION_PATHS_STATE_URI}/service-function-path-state
-${SERVICE_FUNCTION_PATHS_URI}               ${REST_CONFIG}/service-function-path:service-function-paths
-${SERVICE_FUNCTION_PATH_URI}                ${SERVICE_FUNCTION_PATHS_URI}/service-function-path
-${SERVICE_FUNCTION_TYPES_URI}               ${REST_CONFIG}/service-function-type:service-function-types
-${SERVICE_METADATA_URI}                     ${REST_CONFIG}/service-function-path-metadata:service-function-metadata
-${SERVICE_NODES_URI}                        ${REST_CONFIG}/service-node:service-nodes
-${SERVICE_NODE_URI}                         ${SERVICE_NODES_URI}/service-node
-${SERVICE_SCHED_TYPES_URI}
-...                                         ${REST_CONFIG}/service-function-scheduler-type:service-function-scheduler-types
-${SERVICE_SCHED_TYPE_URI_BASE}
-...                                         ${SERVICE_SCHED_TYPES_URI}/service-function-scheduler-type/service-function-scheduler-type:
-${SERVICE_RANDOM_SCHED_TYPE_URI}            ${SERVICE_SCHED_TYPE_URI_BASE}random
-${SERVICE_LOADBALANCE_SCHED_TYPE_URI}       ${SERVICE_SCHED_TYPE_URI_BASE}load-balance
-${SERVICE_ROUNDROBIN_SCHED_TYPE_URI}        ${SERVICE_SCHED_TYPE_URI_BASE}round-robin
-${SERVICE_SHORTESTPATH_SCHED_TYPE_URI}      ${SERVICE_SCHED_TYPE_URI_BASE}shortest-path
diff --git a/csit/variables/sfc/master/full-deploy/service-function-acls.json b/csit/variables/sfc/master/full-deploy/service-function-acls.json
deleted file mode 100644
index c58a9e64e1..0000000000
--- a/csit/variables/sfc/master/full-deploy/service-function-acls.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "access-lists": {
-    "acl": [
-      {
-        "acl-name": "ACL1",
-        "acl-type": "ietf-access-control-list:ipv4-acl",
-        "access-list-entries": {
-          "ace": [
-            {
-              "rule-name": "ACE1",
-              "actions": {
-                "service-function-acl:rendered-service-path": "$RSP1"
-              },
-              "matches": {
-                "destination-ipv4-network": "192.168.2.0/24",
-                "source-ipv4-network": "192.168.2.0/24",
-                "protocol": "6",
-                "source-port-range": {
-                    "lower-port": 0
-                },
-                "destination-port-range": {
-                    "lower-port": 80
-                }
-              }
-            }
-          ]
-        }
-      },
-      {
-        "acl-name": "ACL2",
-        "acl-type": "ietf-access-control-list:ipv4-acl",
-        "access-list-entries": {
-          "ace": [
-            {
-              "rule-name": "ACE2",
-              "actions": {
-                "service-function-acl:rendered-service-path": "$RSP1_Reverse"
-              },
-              "matches": {
-                "destination-ipv4-network": "192.168.2.0/24",
-                "source-ipv4-network": "192.168.2.0/24",
-                "protocol": "6",
-                "source-port-range": {
-                    "lower-port": 80
-                },
-                "destination-port-range": {
-                    "lower-port": 0
-                }
-              }
-            }
-          ]
-        }
-      }
-    ]
-  }
-}
diff --git a/csit/variables/sfc/master/full-deploy/service-function-chains.json b/csit/variables/sfc/master/full-deploy/service-function-chains.json
deleted file mode 100644
index c1a92ec75e..0000000000
--- a/csit/variables/sfc/master/full-deploy/service-function-chains.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "service-function-chains": {
-    "service-function-chain": [
-      {
-        "name": "SFC1",
-        "sfc-service-function": [
-          {
-            "name": "dpi-abstract1",
-            "type": "dpi"
-          },
-          {
-            "name": "firewall-abstract1",
-            "type": "firewall"
-          }
-        ]
-      },
-      {
-          "name": "SFC2",
-          "symmetric": "true",
-          "sfc-service-function": [
-              {
-                  "name": "dpi-abstract1",
-                  "type": "dpi"
-              }
-          ]
-      }
-    ]
-  }
-}
diff --git a/csit/variables/sfc/master/full-deploy/service-function-classifiers.json b/csit/variables/sfc/master/full-deploy/service-function-classifiers.json
deleted file mode 100644
index cbf072a4d1..0000000000
--- a/csit/variables/sfc/master/full-deploy/service-function-classifiers.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "service-function-classifiers": {
-    "service-function-classifier": [
-      {
-        "name": "Classifier1",
-        "scl-service-function-forwarder": [
-          {
-            "name": "Classifier1",
-            "interface": "v-ovsnsn6g1"
-          }
-        ],
-        "acl": {
-            "name": "ACL1",
-            "type": "ietf-access-control-list:ipv4-acl"
-         }
-      },
-      {
-        "name": "Classifier2",
-        "scl-service-function-forwarder": [
-          {
-            "name": "Classifier2",
-            "interface": "v-ovsnsn1g1"
-          }
-        ],
-        "acl": {
-            "name": "ACL2",
-            "type": "ietf-access-control-list:ipv4-acl"
-         }
-      }
-    ]
-  }
-}
diff --git a/csit/variables/sfc/master/full-deploy/service-function-forwarders.json b/csit/variables/sfc/master/full-deploy/service-function-forwarders.json
deleted file mode 100644
index f5187e8484..0000000000
--- a/csit/variables/sfc/master/full-deploy/service-function-forwarders.json
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-  "service-function-forwarders": {
-    "service-function-forwarder": [
-      {
-        "name": "Classifier1",
-        "service-node": "classifier1",
-        "service-function-forwarder-ovs:ovs-bridge": {
-                    "bridge-name": "br-int"
-        },
-        "sff-data-plane-locator": [
-          {
-            "name": "sff0-dpl",
-            "data-plane-locator": {
-              "port": 6633,
-              "ip": "ovs-node-6",
-              "transport": "service-locator:vxlan-gpe"
-            },
-            "service-function-forwarder-ovs:ovs-options": {
-                "remote-ip": "flow",
-                "dst-port": "6633",
-                "key": "flow",
-                "nsp": "flow",
-                "nsi": "flow",
-                "nshc1": "flow",
-                "nshc2": "flow",
-                "nshc3": "flow",
-                "nshc4": "flow"
-            }
-          }
-        ]
-      },
-      {
-        "name": "SFF1",
-        "service-node": "sff1",
-        "service-function-forwarder-ovs:ovs-bridge": {
-                    "bridge-name": "br-int"
-        },
-        "sff-data-plane-locator": [
-          {
-            "name": "sff1-dpl",
-            "data-plane-locator": {
-              "port": 6633,
-              "ip": "ovs-node-5",
-              "transport": "service-locator:vxlan-gpe"
-            },
-            "service-function-forwarder-ovs:ovs-options": {
-                "remote-ip": "flow",
-                "dst-port": "6633",
-                "key": "flow",
-                "nsp": "flow",
-                "nsi": "flow",
-                "nshc1": "flow",
-                "nshc2": "flow",
-                "nshc3": "flow",
-                "nshc4": "flow"
-            }
-          }
-        ],
-        "service-function-dictionary": [
-          {
-            "name": "dpi-1",
-            "sff-sf-data-plane-locator": {
-              "sf-dpl-name": "dpi-1-dpl",
-              "sff-dpl-name": "sff1-dpl"
-            }
-          }
-        ]
-      },
-      {
-        "name": "SFF2",
-        "service-node": "sff2",
-        "service-function-forwarder-ovs:ovs-bridge": {
-                    "bridge-name": "br-int"
-        },
-        "sff-data-plane-locator": [
-          {
-            "name": "sff2-dpl",
-            "data-plane-locator": {
-              "port": 6633,
-              "ip": "ovs-node-3",
-              "transport": "service-locator:vxlan-gpe"
-            },
-            "service-function-forwarder-ovs:ovs-options": {
-                "remote-ip": "flow",
-                "dst-port": "6633",
-                "key": "flow",
-                "nsp": "flow",
-                "nsi": "flow",
-                "nshc1": "flow",
-                "nshc2": "flow",
-                "nshc3": "flow",
-                "nshc4": "flow"
-            }
-          }
-        ],
-        "service-function-dictionary": [
-          {
-            "name": "firewall-1",
-            "sff-sf-data-plane-locator": {
-              "sf-dpl-name": "firewall-1-dpl",
-              "sff-dpl-name": "sff2-dpl"
-            }
-          }
-        ]
-      },
-      {
-        "name": "Classifier2",
-        "service-node": "classifier2",
-        "service-function-forwarder-ovs:ovs-bridge": {
-                    "bridge-name": "br-int"
-        },
-        "sff-data-plane-locator": [
-          {
-            "name": "sff3-dpl",
-            "data-plane-locator": {
-              "port": 6633,
-              "ip": "ovs-node-1",
-              "transport": "service-locator:vxlan-gpe"
-            },
-            "service-function-forwarder-ovs:ovs-options": {
-                "remote-ip": "flow",
-                "dst-port": "6633",
-                "key": "flow",
-                "nsp": "flow",
-                "nsi": "flow",
-                "nshc1": "flow",
-                "nshc2": "flow",
-                "nshc3": "flow",
-                "nshc4": "flow"
-            }
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/csit/variables/sfc/master/full-deploy/service-function-metadata.json b/csit/variables/sfc/master/full-deploy/service-function-metadata.json
deleted file mode 100644
index c73f3eec90..0000000000
--- a/csit/variables/sfc/master/full-deploy/service-function-metadata.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "service-function-metadata": {
-    "context-metadata": [
-      {
-        "name": "NSH1",
-        "context-header1": "1",
-        "context-header2": "2",
-        "context-header3": "3",
-        "context-header4": "4"
-      }
-    ]
-  }
-}
diff --git a/csit/variables/sfc/master/full-deploy/service-function-paths.json b/csit/variables/sfc/master/full-deploy/service-function-paths.json
deleted file mode 100644
index e1a5eb76d0..0000000000
--- a/csit/variables/sfc/master/full-deploy/service-function-paths.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "service-function-paths": {
-    "service-function-path": [
-      {
-        "name": "SFP1",
-        "service-chain-name": "SFC1",
-        "starting-index": 255,
-        "symmetric": "true",
-        "context-metadata": "NSH1",
-        "service-path-hop": [
-                    {
-                        "hop-number": 0,
-                        "service-function-name": "dpi-1"
-                    }
-                ]
-      }
-    ]
-  }
-}
diff --git a/csit/variables/sfc/master/full-deploy/service-functions.json b/csit/variables/sfc/master/full-deploy/service-functions.json
deleted file mode 100644
index 076bfe3541..0000000000
--- a/csit/variables/sfc/master/full-deploy/service-functions.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "service-functions": {
-    "service-function": [
-      {
-        "ip-mgmt-address": "ovs-node-4",
-        "sf-data-plane-locator": [
-          {
-            "name": "dpi-1-dpl",
-            "port": 6633,
-            "ip": "ovs-node-4",
-            "transport": "service-locator:vxlan-gpe",
-            "service-function-forwarder": "SFF1"
-          }
-        ],
-        "name": "dpi-1",
-        "type": "dpi",
-        "rest-uri": "http://ovs-node-4:5000"
-      },
-      {
-        "ip-mgmt-address": "ovs-node-2",
-        "sf-data-plane-locator": [
-          {
-            "name": "firewall-1-dpl",
-            "port": 6633,
-            "ip": "ovs-node-2",
-            "transport": "service-locator:vxlan-gpe",
-            "service-function-forwarder": "SFF2"
-          }
-        ],
-        "name": "firewall-1",
-        "type": "firewall",
-        "rest-uri": "http://ovs-node-2:5000"
-      }
-   ]
-  }
-}
diff --git a/csit/variables/sfc/master/full-deploy/service-nodes.json b/csit/variables/sfc/master/full-deploy/service-nodes.json
deleted file mode 100644
index 0729763656..0000000000
--- a/csit/variables/sfc/master/full-deploy/service-nodes.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "service-nodes": {
-        "service-node": [
-            {
-                "name": "sf1",
-                "service-function": [
-                    "dpi-1"
-                ],
-                "ip-mgmt-address": "ovs-node-4"
-            },
-            {
-                "name": "sf2",
-                "service-function": [
-                    "firewall-1"
-                ],
-                "ip-mgmt-address": "ovs-node-2"
-            },
-            {
-                "name": "sff1",
-                "ip-mgmt-address": "ovs-node-5"
-            },
-            {
-                "name": "sff2",
-                "ip-mgmt-address": "ovs-node-3"
-            },
-            {
-                "name": "classifier1",
-                "ip-mgmt-address": "ovs-node-6"
-            },
-            {
-                "name": "classifier2",
-                "ip-mgmt-address": "ovs-node-1"
-            }
-       ]
-    }
-}
diff --git a/csit/variables/sfc/master/full-deploy/service-random-schedule-type.json b/csit/variables/sfc/master/full-deploy/service-random-schedule-type.json
deleted file mode 100644
index 63b413c5dd..0000000000
--- a/csit/variables/sfc/master/full-deploy/service-random-schedule-type.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "service-function-scheduler-type": [
-        {
-            "type": "service-function-scheduler-type:random",
-            "enabled": true,
-            "name": "random"
-        }
-    ]
-}
diff --git a/csit/variables/sfc/master/full-deploy/service-roundrobin-schedule-type.json b/csit/variables/sfc/master/full-deploy/service-roundrobin-schedule-type.json
deleted file mode 100644
index c7168381f6..0000000000
--- a/csit/variables/sfc/master/full-deploy/service-roundrobin-schedule-type.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "service-function-scheduler-type": [
-        {
-            "type": "service-function-scheduler-type:round-robin",
-            "enabled": true,
-            "name": "round-robin"
-        }
-    ]
-}
diff --git a/csit/variables/sfc/master/service-function-acl.json b/csit/variables/sfc/master/service-function-acl.json
deleted file mode 100644
index 3fb7a35ad3..0000000000
--- a/csit/variables/sfc/master/service-function-acl.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "access-lists": {
-    "acl": [
-      {
-        "acl-name": "ACL1",
-        "acl-type": "ietf-access-control-list:ipv4-acl",
-        "access-list-entries": {
-          "ace": [
-            {
-              "rule-name": "ACE1",
-              "actions": {
-                "service-function-acl:rendered-service-path": "RSP1"
-              },
-              "matches": {
-                "destination-ipv4-network": "192.168.2.0/24",
-                "source-ipv4-network": "192.168.2.0/24",
-                "protocol": "6",
-                "source-port-range": {
-                    "lower-port": 0
-                },
-                "destination-port-range": {
-                    "lower-port": 80
-                }
-              }
-            }
-          ]
-        }
-      },
-      {
-        "acl-name": "ACL2",
-        "acl-type": "ietf-access-control-list:ipv4-acl",
-        "access-list-entries": {
-          "ace": [
-            {
-              "rule-name": "ACE2",
-              "actions": {
-                "service-function-acl:rendered-service-path": "RSP1-Reverse"
-              },
-              "matches": {
-                "destination-ipv4-network": "192.168.2.0/24",
-                "source-ipv4-network": "192.168.2.0/24",
-                "protocol": "6",
-                "source-port-range": {
-                    "lower-port": 80
-                },
-                "destination-port-range": {
-                    "lower-port": 0
-                }
-              }
-            }
-          ]
-        }
-      }
-    ]
-  }
-}
diff --git a/csit/variables/sfc/master/service-function-chain-firewall-napt44-dpi.json b/csit/variables/sfc/master/service-function-chain-firewall-napt44-dpi.json
deleted file mode 100644
index 74d26f266a..0000000000
--- a/csit/variables/sfc/master/service-function-chain-firewall-napt44-dpi.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "service-function-chains": {
-    "service-function-chain": [
-      {
-        "name": "SFC1",
-        "sfc-service-function": [
-          {
-            "name": "firewall-abstract1",
-            "type": "firewall",
-            "order" : 0
-          },
-          {
-            "name": "napt44-abstract1",
-            "type": "napt44",
-            "order" : 1
-          },
-          {
-            "name": "dpi-abstract1",
-            "type": "dpi",
-            "order" : 2
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/csit/variables/sfc/master/service-function-chains-logicalsff.json b/csit/variables/sfc/master/service-function-chains-logicalsff.json
deleted file mode 100644
index 29eb1573f2..0000000000
--- a/csit/variables/sfc/master/service-function-chains-logicalsff.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "service-function-chains": {
-        "service-function-chain": [
-            {
-                "name": "SFC1",
-                "symmetric": "true",
-                "sfc-service-function": [
-                    {
-                        "name": "dpi-abstract1",
-                        "type": "dpi",
-                        "order": 0
-                    },
-                    {
-                        "name": "firewall-abstract1",
-                        "type": "firewall",
-                        "order": 1
-                    }
-                ]
-            },
-            {
-                "name": "SFC2",
-                "symmetric": "true",
-                "sfc-service-function": [
-                    {
-                        "name": "dpi-abstract1",
-                        "type": "dpi",
-                        "order": 0
-                    }
-                ]
-            }
-        ]
-    }
-}
diff --git a/csit/variables/sfc/master/service-function-chains.json b/csit/variables/sfc/master/service-function-chains.json
deleted file mode 100644
index b485e2b07d..0000000000
--- a/csit/variables/sfc/master/service-function-chains.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "service-function-chains": {
-    "service-function-chain": [
-      {
-        "name": "SFC1",
-        "sfc-service-function": [
-          {
-            "name": "dpi-abstract1",
-            "type": "dpi",
-            "order" : 0
-          },
-          {
-            "name": "napt44-abstract1",
-            "type": "napt44",
-            "order" : 1
-          },
-          {
-            "name": "firewall-abstract1",
-            "type": "firewall",
-            "order" : 2
-          }
-        ]
-      },
-      {
-        "name": "SFC2",
-        "sfc-service-function": [
-          {
-            "name": "firewall-abstract2",
-            "type": "firewall",
-            "order" : 0
-          },
-          {
-            "name": "napt44-abstract2",
-            "type": "napt44",
-            "order" : 1
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/csit/variables/sfc/master/service-function-classifiers.json b/csit/variables/sfc/master/service-function-classifiers.json
deleted file mode 100644
index 70e1c12089..0000000000
--- a/csit/variables/sfc/master/service-function-classifiers.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "service-function-classifiers": {
-    "service-function-classifier": [
-      {
-        "name": "Classifier1",
-        "scl-service-function-forwarder": [
-          {
-            "name": "Classifier1",
-            "interface": "veth-br"
-          }
-        ],
-        "acl": {
-            "name": "ACL1",
-            "type": "ietf-access-control-list:ipv4-acl"
-         }
-      },
-      {
-        "name": "Classifier2",
-        "scl-service-function-forwarder": [
-          {
-            "name": "Classifier2",
-            "interface": "veth-br"
-          }
-        ],
-        "acl": {
-            "name": "ACL2",
-            "type": "ietf-access-control-list:ipv4-acl"
-         }
-      }
-    ]
-  }
-}
diff --git a/csit/variables/sfc/master/service-function-forwarder-logicallsff1.json b/csit/variables/sfc/master/service-function-forwarder-logicallsff1.json
deleted file mode 100644
index 93dc43cad4..0000000000
--- a/csit/variables/sfc/master/service-function-forwarder-logicallsff1.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-        "service-function-forwarder": [
-           {
-                "name": "sfflogical1"
-            }
-        ]
-}
diff --git a/csit/variables/sfc/master/service-function-forwarders-logicallsff.json b/csit/variables/sfc/master/service-function-forwarders-logicallsff.json
deleted file mode 100644
index 387410aee8..0000000000
--- a/csit/variables/sfc/master/service-function-forwarders-logicallsff.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "service-function-forwarders": {
-        "service-function-forwarder": [
-           {
-                "name": "sfflogical1"
-            }
-        ]
-    }
-}
diff --git a/csit/variables/sfc/master/service-function-forwarders.json b/csit/variables/sfc/master/service-function-forwarders.json
deleted file mode 100644
index 2a361bf7e0..0000000000
--- a/csit/variables/sfc/master/service-function-forwarders.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-  "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": {
-              "sf-dpl-name": "SF1-DPL",
-              "sff-dpl-name": "eth0"
-            },
-            "name": "SF1"
-          },
-          {
-            "sff-sf-data-plane-locator": {
-              "sf-dpl-name": "SF2-DPL",
-              "sff-dpl-name": "eth0"
-            },
-            "name": "SF2"
-          }
-        ],
-        "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": {
-              "sf-dpl-name": "SF5-DPL",
-              "sff-dpl-name": "eth0"
-            },
-            "name": "SF5"
-          },
-          {
-            "sff-sf-data-plane-locator": {
-              "sf-dpl-name": "SF6-DPL",
-              "sff-dpl-name": "eth0"
-            },
-            "name": "SF6"
-          }
-        ],
-        "connected-sff-dictionary": [
-          {
-            "sff-sff-data-plane-locator": {
-              "port": 5000,
-              "ip": "10.1.1.2"
-            },
-            "name": "SFF-bootstrap"
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/csit/variables/sfc/master/service-function-paths-logicalsff.json b/csit/variables/sfc/master/service-function-paths-logicalsff.json
deleted file mode 100644
index c79ff92cdd..0000000000
--- a/csit/variables/sfc/master/service-function-paths-logicalsff.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "service-function-paths": {
-        "service-function-path": [
-            {
-                "name": "SFP1",
-                "service-chain-name": "SFC1",
-                "starting-index": 255,
-                "symmetric": "true",
-                "context-metadata": "NSH1",
-                "transport-type": "service-locator:vxlan-gpe"
-            }
-        ]
-    }
-}
diff --git a/csit/variables/sfc/master/service-function-paths-with-one-hop.json b/csit/variables/sfc/master/service-function-paths-with-one-hop.json
deleted file mode 100644
index c78ac8a771..0000000000
--- a/csit/variables/sfc/master/service-function-paths-with-one-hop.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "service-function-paths": {
-    "service-function-path": [
-      {
-        "name": "SFC1-100",
-        "service-chain-name": "SFC1",
-         "service-path-hop": [
-                    {
-                        "hop-number": 0,
-                        "service-function-name": "firewall-104"
-                    }
-         ]
-      }
-    ]
-  }
-}
diff --git a/csit/variables/sfc/master/service-function-paths-with-three-hops-firewall-napt44-dpi.json b/csit/variables/sfc/master/service-function-paths-with-three-hops-firewall-napt44-dpi.json
deleted file mode 100644
index bd979fb09d..0000000000
--- a/csit/variables/sfc/master/service-function-paths-with-three-hops-firewall-napt44-dpi.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "service-function-paths": {
-    "service-function-path": [
-      {
-        "name": "SFC1-100",
-        "service-chain-name": "SFC1",
-         "service-path-hop": [
-                    {
-                        "hop-number": 0,
-                        "service-function-name": "firewall-104"
-                    },
-                    {
-                        "hop-number": 1,
-                        "service-function-name": "napt44-103-2"
-                    },
-                    {
-                        "hop-number": 2,
-                        "service-function-name": "dpi-102-2"
-                    }
-         ]
-      }
-    ]
-  }
-}
diff --git a/csit/variables/sfc/master/service-function-paths.json b/csit/variables/sfc/master/service-function-paths.json
deleted file mode 100644
index 4b1eadf20c..0000000000
--- a/csit/variables/sfc/master/service-function-paths.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "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/master/service-functions-logicalsff.json b/csit/variables/sfc/master/service-functions-logicalsff.json
deleted file mode 100644
index 03e9c712c5..0000000000
--- a/csit/variables/sfc/master/service-functions-logicalsff.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "service-functions": {
-        "service-function": [
-            {
-                "name": "firewall-1",
-                "type": "firewall",
-                "sf-data-plane-locator": [
-                    {
-                        "name": "firewall-dpl",
-                        "interface-name": "eccb57ae-5a2e-467f-823e-45d7bb2a6a9a",
-                        "transport": "service-locator:mac",
-                        "service-function-forwarder": "sfflogical1"
-                    }
-                ]
-            },
-                        {
-                "name": "dpi-1",
-                "type": "dpi",
-                "sf-data-plane-locator": [
-                    {
-                        "name": "dpi-dpl",
-                        "interface-name": "df15ac52-e8ef-4e9a-8340-ae0738aba0c0",
-                        "transport": "service-locator:mac",
-                        "service-function-forwarder": "sfflogical1"
-                    }
-                ]
-            }
-        ]
-    }
-}
diff --git a/csit/variables/sfc/master/service-functions.json b/csit/variables/sfc/master/service-functions.json
deleted file mode 100644
index 239b0c0f77..0000000000
--- a/csit/variables/sfc/master/service-functions.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "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": "napt44"
-      },
-      {
-        "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": "napt44"
-      },
-      {
-        "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": "dpi"
-      },
-      {
-        "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": "firewall"
-      },
-      {
-        "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": "napt44"
-      },
-      {
-        "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": "dpi"
-      },
-      {
-        "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": "firewall"
-      },
-      {
-        "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": "dpi"
-      },
-      {
-        "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": "firewall"
-      }
-    ]
-  }
-}
diff --git a/csit/variables/sfc/master/service-loadbalance-schedule-type.json b/csit/variables/sfc/master/service-loadbalance-schedule-type.json
deleted file mode 100644
index e5780f372b..0000000000
--- a/csit/variables/sfc/master/service-loadbalance-schedule-type.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "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
deleted file mode 100644
index 36787c139a..0000000000
--- a/csit/variables/sfc/master/service-nodes.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "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
deleted file mode 100644
index 63b413c5dd..0000000000
--- a/csit/variables/sfc/master/service-random-schedule-type.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "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
deleted file mode 100644
index c7168381f6..0000000000
--- a/csit/variables/sfc/master/service-roundrobin-schedule-type.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "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
deleted file mode 100644
index 44aacd4110..0000000000
--- a/csit/variables/sfc/master/service-schedule-types.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "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
deleted file mode 100644
index 56559177f0..0000000000
--- a/csit/variables/sfc/master/service-shortestpath-schedule-type.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "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
deleted file mode 100644
index 85adbd00fb..0000000000
--- a/csit/variables/sfc/master/service-wsp-schedule-type.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "service-function-scheduler-type": [
-        {
-            "type": "service-function-scheduler-type:weighted-shortest-path",
-            "enabled": false,
-            "name": "weighted-shortest-path"
-        }
-    ]
-}
diff --git a/csit/variables/sfc/master/sf_dpi.json b/csit/variables/sfc/master/sf_dpi.json
deleted file mode 100644
index 8f0377067f..0000000000
--- a/csit/variables/sfc/master/sf_dpi.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "service-function": [
-           {
-                "name": "dpi-1",
-                "type": "dpi",
-                "sf-data-plane-locator": [
-                    {
-                        "name": "dpi-dpl",
-                        "interface-name": "eccb57ae-5a2e-467f-823e-45d7bb2a6a9a",
-                        "transport": "service-locator:mac",
-                        "service-function-forwarder": "sfflogical1"
-                    }
-                ]
-            }
-     ]
-}
diff --git a/csit/variables/sfc/master/sf_dpi_102_100.json b/csit/variables/sfc/master/sf_dpi_102_100.json
deleted file mode 100644
index 7eff0b5848..0000000000
--- a/csit/variables/sfc/master/sf_dpi_102_100.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "service-function": [
-        {
-            "name": "dpi-102-100",
-            "type": "dpi",
-            "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/master/sf_dpl_101.json b/csit/variables/sfc/master/sf_dpl_101.json
deleted file mode 100644
index fb1ed3e683..0000000000
--- a/csit/variables/sfc/master/sf_dpl_101.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "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/master/sfc_chain_100.json b/csit/variables/sfc/master/sfc_chain_100.json
deleted file mode 100644
index a10950b9bc..0000000000
--- a/csit/variables/sfc/master/sfc_chain_100.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "service-function-chain": [
-        {
-            "name": "SFC100",
-            "sfc-service-function": [
-                {
-                    "name": "dpi-abstract100",
-                    "order": 0,
-                    "type": "firewall"
-                },
-                {
-                    "name": "napt44-abstract100",
-                    "order": 1,
-                    "type": "dpi"
-                },
-                {
-                    "name": "firewall-abstract100",
-                    "order": 2,
-                    "type": "napt44"
-                }
-            ]
-        }
-    ]
-}
diff --git a/csit/variables/sfc/master/sfc_chain_100_sfids.json b/csit/variables/sfc/master/sfc_chain_100_sfids.json
deleted file mode 100644
index c6a77a705b..0000000000
--- a/csit/variables/sfc/master/sfc_chain_100_sfids.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "sfc-service-function": [
-        {
-            "name": "ids-abstract100",
-            "order": 3,
-            "type": "ids"
-        }
-    ]
-}
diff --git a/csit/variables/sfc/master/sff_csd_locator.json b/csit/variables/sfc/master/sff_csd_locator.json
deleted file mode 100644
index 7ac28e7964..0000000000
--- a/csit/variables/sfc/master/sff_csd_locator.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "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
deleted file mode 100644
index e2715bbb3a..0000000000
--- a/csit/variables/sfc/master/sff_csd_sff100.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "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
deleted file mode 100644
index 0fd51efd08..0000000000
--- a/csit/variables/sfc/master/sff_dpl_101.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "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
deleted file mode 100644
index 3da405be36..0000000000
--- a/csit/variables/sfc/master/sff_dpl_locator.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "data-plane-locator": {
-        "ip": "192.168.1.1",
-        "port": 5000,
-        "transport": "service-locator:vxlan-gpe"
-    }
-}
diff --git a/csit/variables/sfc/master/sff_ovs_100.json b/csit/variables/sfc/master/sff_ovs_100.json
deleted file mode 100644
index 645e61822b..0000000000
--- a/csit/variables/sfc/master/sff_ovs_100.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "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": {
-              "sf-dpl-name": "SF7-DPL",
-              "sff-dpl-name": "eth0"
-            },
-            "name": "SF7"
-          }
-        ]
-      }
-    ]
-}
diff --git a/csit/variables/sfc/master/sff_sfd_locator.json b/csit/variables/sfc/master/sff_sfd_locator.json
deleted file mode 100644
index 23ef837216..0000000000
--- a/csit/variables/sfc/master/sff_sfd_locator.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "sff-sf-data-plane-locator": {
-        "sf-dpl-name": "SF2-DPL",
-        "sff-dpl-name": "eth0"
-    }
-}
diff --git a/csit/variables/sfc/master/sff_sfd_sf100.json b/csit/variables/sfc/master/sff_sfd_sf100.json
deleted file mode 100644
index e33c050ad0..0000000000
--- a/csit/variables/sfc/master/sff_sfd_sf100.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "service-function-dictionary": [
-        {
-            "name": "SF100",
-            "sff-sf-data-plane-locator": {
-                "sf-dpl-name": "SF2-DPL",
-                "sff-dpl-name": "eth0"
-            }
-        }
-    ]
-}
diff --git a/csit/variables/sfc/master/sfp_sfc1_path400.json b/csit/variables/sfc/master/sfp_sfc1_path400.json
deleted file mode 100644
index 9a17f8eccb..0000000000
--- a/csit/variables/sfc/master/sfp_sfc1_path400.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "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
deleted file mode 100644
index 2562724c3b..0000000000
--- a/csit/variables/sfc/master/sn_node_100.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "service-node": [
-        {
-            "name": "node-100",
-            "ip-mgmt-address": "10.3.1.100",
-            "service-function": [
-                "dpi-100-1",
-                "firewall-102-1"
-            ]
-        }
-    ]
-}
diff --git a/csit/variables/sfc/master/symmetricRSP/service_function_chains.json b/csit/variables/sfc/master/symmetricRSP/service_function_chains.json
deleted file mode 100644
index 705a174ec3..0000000000
--- a/csit/variables/sfc/master/symmetricRSP/service_function_chains.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "service-function-chains": {
-        "service-function-chain": [
-            {
-                "name": "SFC1",
-                "sfc-service-function": [
-                    {
-                        "name": "dpi-abstract1",
-                        "type": "dpi-bidirectional"
-                    },
-                    {
-                        "name": "firewall-abstract1",
-                        "type": "firewall"
-                    }
-                ]
-            },
-            {
-                "name": "SFC2",
-                "sfc-service-function": [
-                    {
-                        "name": "dpi-abstract2",
-                        "type": "dpi-non-bidirectional"
-                    },
-                    {
-                        "name": "firewall-abstract1",
-                        "type": "firewall"
-                    }
-                ]
-            }
-        ]
-    }
-}
diff --git a/csit/variables/sfc/master/symmetricRSP/service_function_forwarders.json b/csit/variables/sfc/master/symmetricRSP/service_function_forwarders.json
deleted file mode 100644
index f8ade963eb..0000000000
--- a/csit/variables/sfc/master/symmetricRSP/service_function_forwarders.json
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-    "service-function-forwarders": {
-        "service-function-forwarder": [
-           {
-                "name": "Classifier1",
-                "service-node": "classifier1",
-                "service-function-forwarder-ovs:ovs-bridge": {
-                    "bridge-name": "br-sfc"
-                },
-                "sff-data-plane-locator": [
-                    {
-                        "name": "sff0-dpl",
-                        "data-plane-locator": {
-                            "transport": "service-locator:vxlan-gpe",
-                            "port": 6633,
-                            "ip": "192.168.1.10"
-                        },
-                        "service-function-forwarder-ovs:ovs-options": {
-                            "remote-ip": "flow",
-                            "dst-port": "6633",
-                            "key": "flow",
-                            "nsp": "flow",
-                            "nsi": "flow",
-                            "nshc1": "flow",
-                            "nshc2": "flow",
-                            "nshc3": "flow",
-                            "nshc4": "flow"
-                        }
-                    }
-                ]
-            },
-            {
-                "name": "SFF1",
-                "service-node": "sff1",
-                "service-function-forwarder-ovs:ovs-bridge": {
-                    "bridge-name": "br-sfc"
-                },
-                "sff-data-plane-locator": [
-                    {
-                        "name": "sff1-dpl",
-                        "data-plane-locator": {
-                            "transport": "service-locator:vxlan-gpe",
-                            "port": 6633,
-                            "ip": "192.168.1.20"
-                        },
-                        "service-function-forwarder-ovs:ovs-options": {
-                            "remote-ip": "flow",
-                            "dst-port": "6633",
-                            "key": "flow",
-                            "nsp": "flow",
-                            "nsi": "flow",
-                            "nshc1": "flow",
-                            "nshc2": "flow",
-                            "nshc3": "flow",
-                            "nshc4": "flow"
-                        }
-                    }
-                ],
-                "service-function-dictionary": [
-                    {
-                        "name": "dpi-1",
-                        "sff-sf-data-plane-locator": {
-                             "sf-dpl-name": "dpi-1-dpl",
-                             "sff-dpl-name": "sff1-dpl"
-                        }
-                    }
-                ]
-            },
-            {
-                "name": "SFF2",
-                "service-node": "sff2",
-                "service-function-forwarder-ovs:ovs-bridge": {
-                    "bridge-name": "br-sfc"
-                },
-                "sff-data-plane-locator": [
-                    {
-                        "name": "sff2-dpl",
-                        "data-plane-locator": {
-                            "transport": "service-locator:vxlan-gpe",
-                            "port": 6633,
-                            "ip": "192.168.1.50"
-                        },
-                        "service-function-forwarder-ovs:ovs-options": {
-                            "remote-ip": "flow",
-                            "dst-port": "6633",
-                            "key": "flow",
-                            "nsp": "flow",
-                            "nsi": "flow",
-                            "nshc1": "flow",
-                            "nshc2": "flow",
-                            "nshc3": "flow",
-                            "nshc4": "flow"
-                        }
-                    }
-                ],
-                "service-function-dictionary": [
-                    {
-                        "name": "firewall-1",
-                        "sff-sf-data-plane-locator": {
-                            "sf-dpl-name": "firewall-1-dpl",
-                            "sff-dpl-name": "sff2-dpl"
-                        }
-                    }
-                ]
-            },
-            {
-                "name": "Classifier2",
-                "service-node": "classifier2",
-                "service-function-forwarder-ovs:ovs-bridge": {
-                    "bridge-name": "br-sfc"
-                },
-                "sff-data-plane-locator": [
-                    {
-                        "name": "sff3-dpl",
-                        "data-plane-locator": {
-                            "transport": "service-locator:vxlan-gpe",
-                            "port": 6633,
-                            "ip": "192.168.1.60"
-                        },
-                        "service-function-forwarder-ovs:ovs-options": {
-                            "remote-ip": "flow",
-                            "dst-port": "6633",
-                            "key": "flow",
-                            "nsp": "flow",
-                            "nsi": "flow",
-                            "nshc1": "flow",
-                            "nshc2": "flow",
-                            "nshc3": "flow",
-                            "nshc4": "flow"
-                        }
-                    }
-                ]
-            }
-        ]
-    }
-}
diff --git a/csit/variables/sfc/master/symmetricRSP/service_function_paths.json b/csit/variables/sfc/master/symmetricRSP/service_function_paths.json
deleted file mode 100644
index 614fd4dd42..0000000000
--- a/csit/variables/sfc/master/symmetricRSP/service_function_paths.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    "service-function-paths": {
-        "service-function-path": [
-            {
-                "name": "SFP1",
-                "service-chain-name": "SFC1",
-                "starting-index": 255,
-                "context-metadata": "NSH1",
-                "service-path-hop": [
-                    {
-                        "hop-number": 0,
-                        "service-function-name": "dpi-1"
-                    },
-                    {
-                        "hop-number": 1,
-                        "service-function-name": "firewall-1"
-                    }
-                ]
-            },
-            {
-                "name": "SFP2",
-                "service-chain-name": "SFC2",
-                "starting-index": 255,
-                "context-metadata": "NSH1",
-                "service-path-hop": [
-                    {
-                        "hop-number": 0,
-                        "service-function-name": "dpi-2"
-                    },
-                    {
-                        "hop-number": 1,
-                        "service-function-name": "firewall-1"
-                    }
-                ]
-            },
-            {
-                "name": "SFP3",
-                "service-chain-name": "SFC1",
-                "starting-index": 255,
-                "context-metadata": "NSH1",
-                "symmetric": "false",
-                "service-path-hop": [
-                    {
-                        "hop-number": 0,
-                        "service-function-name": "dpi-1"
-                    },
-                    {
-                        "hop-number": 1,
-                        "service-function-name": "firewall-1"
-                    }
-                ]
-            }
-        ]
-    }
-}
diff --git a/csit/variables/sfc/master/symmetricRSP/service_function_types.json b/csit/variables/sfc/master/symmetricRSP/service_function_types.json
deleted file mode 100644
index 8d7d990e64..0000000000
--- a/csit/variables/sfc/master/symmetricRSP/service_function_types.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "service-function-types": {
-    "service-function-type": [
-      {
-        "type": "dpi-bidirectional",
-        "bidirectional": "true",
-        "nsh-aware": "true"
-      },
-      {
-        "type": "dpi-non-bidirectional",
-        "bidirectional": "false",
-        "nsh-aware": "true"
-      }
-    ]
-  }
-}
diff --git a/csit/variables/sfc/master/symmetricRSP/service_functions.json b/csit/variables/sfc/master/symmetricRSP/service_functions.json
deleted file mode 100644
index f51117aad0..0000000000
--- a/csit/variables/sfc/master/symmetricRSP/service_functions.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "service-functions": {
-        "service-function": [
-            {
-                "name": "dpi-1",
-                "ip-mgmt-address": "192.168.1.30",
-                "rest-uri": "http://192.168.1.30:5000",
-                "type": "dpi-bidirectional",
-                "sf-data-plane-locator": [
-                    {
-                        "name": "dpi-1-dpl",
-                        "port": 6633,
-                        "ip": "192.168.1.30",
-                        "transport": "service-locator:vxlan-gpe",
-                        "service-function-forwarder": "SFF1"
-                    }
-                ]
-            },
-            {
-                "name": "firewall-1",
-                "ip-mgmt-address": "192.168.1.40",
-                "rest-uri": "http://192.168.1.40:5000",
-                "type": "firewall",
-                "sf-data-plane-locator": [
-                    {
-                        "name": "firewall-1-dpl",
-                        "port": 6633,
-                        "ip": "192.168.1.40",
-                        "transport": "service-locator:vxlan-gpe",
-                        "service-function-forwarder": "SFF2"
-                    }
-                ]
-            },
-            {
-                "name": "dpi-2",
-                "ip-mgmt-address": "192.168.1.35",
-                "rest-uri": "http://192.168.1.35:5000",
-                "type": "dpi-non-bidirectional",
-                "sf-data-plane-locator": [
-                    {
-                        "name": "dpi-2-dpl",
-                        "port": 6633,
-                        "ip": "192.168.1.35",
-                        "transport": "service-locator:vxlan-gpe",
-                        "service-function-forwarder": "SFF1"
-                    }
-                ]
-            }
-        ]
-    }
-}
diff --git a/csit/variables/sfc/master/symmetricRSP/service_nodes.json b/csit/variables/sfc/master/symmetricRSP/service_nodes.json
deleted file mode 100644
index 59d829846e..0000000000
--- a/csit/variables/sfc/master/symmetricRSP/service_nodes.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "service-nodes": {
-        "service-node": [
-            {
-                "name": "classifier1",
-                "service-function": [
-                ],
-                "ip-mgmt-address": "192.168.1.10"
-            },
-            {
-                "name": "sff1",
-                "service-function": [
-                ],
-                "ip-mgmt-address": "192.168.1.20"
-            },
-            {
-                "name": "sf1",
-                "service-function": [
-                    "dpi-1"
-                ],
-                "ip-mgmt-address": "192.168.1.30"
-            },
-            {
-                "name": "sf2",
-                "service-function": [
-                    "firewall-1"
-                ],
-                "ip-mgmt-address": "192.168.1.40"
-            },
-            {
-                "name": "sf3",
-                "service-function": [
-                    "dpi-2"
-                ],
-                "ip-mgmt-address": "192.168.1.35"
-            },
-            {
-                "name": "sff2",
-                "service-function": [
-                ],
-                "ip-mgmt-address": "192.168.1.50"
-            },
-            {
-                "name": "classifier2",
-                "service-function": [
-                ],
-                "ip-mgmt-address": "192.168.1.60"
-            }
-        ]
-    }
-}