Modified SFC test suite for creating flows in sff's and classifiers

[integration/test.git] / csit / variables / sfc / master / full-deploy / service-function-forwarders.json

diff --git a/csit/variables/sfc/master/full-deploy/service-function-forwarders.json b/csit/variables/sfc/master/full-deploy/service-function-forwarders.json
index e8beb202337f68587e45f0743cf4b5894af7c83f..f5187e8484d228056d696944b915ec6790576021 100644 (file)
--- a/csit/variables/sfc/master/full-deploy/service-function-forwarders.json
+++ b/csit/variables/sfc/master/full-deploy/service-function-forwarders.json
@@ -2,18 +2,17 @@
   "service-function-forwarders": {
     "service-function-forwarder": [
       {
-        "name": "SFF-1",
-        "service-node": "SFF-1",
-        "rest-uri": "http://localhost:5000",
+        "name": "Classifier1",
+        "service-node": "classifier1",
         "service-function-forwarder-ovs:ovs-bridge": {
-                    "bridge-name": "br-sfc"
+                    "bridge-name": "br-int"
         },
         "sff-data-plane-locator": [
           {
-            "name": "SFF-1-DPL",
+            "name": "sff0-dpl",
             "data-plane-locator": {
-              "port": 5000,
-              "ip": "172.17.0.3",
+              "port": 6633,
+              "ip": "ovs-node-6",
               "transport": "service-locator:vxlan-gpe"
             },
             "service-function-forwarder-ovs:ovs-options": {
@@ -28,39 +27,57 @@
                 "nshc4": "flow"
             }
           }
-        ],
-        "service-function-dictionary": [
+        ]
+      },
+      {
+        "name": "SFF1",
+        "service-node": "sff1",
+        "service-function-forwarder-ovs:ovs-bridge": {
+                    "bridge-name": "br-int"
+        },
+        "sff-data-plane-locator": [
           {
-            "sff-sf-data-plane-locator": {
-              "sf-dpl-name": "SF-1-DPL",
-              "sff-dpl-name": "SFF-1-DPL"
+            "name": "sff1-dpl",
+            "data-plane-locator": {
+              "port": 6633,
+              "ip": "ovs-node-5",
+              "transport": "service-locator:vxlan-gpe"
             },
-            "name": "SF1"
+            "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"
+            }
           }
         ],
-        "connected-sff-dictionary": [
+        "service-function-dictionary": [
           {
-            "sff-sff-data-plane-locator": {
-              "port": 5000,
-              "ip": "172.17.0.5"
-            },
-            "name": "SFF-2"
+            "name": "dpi-1",
+            "sff-sf-data-plane-locator": {
+              "sf-dpl-name": "dpi-1-dpl",
+              "sff-dpl-name": "sff1-dpl"
+            }
           }
         ]
       },
       {
-        "name": "SFF-2",
-        "service-node": "SFF-2",
+        "name": "SFF2",
+        "service-node": "sff2",
         "service-function-forwarder-ovs:ovs-bridge": {
-                    "bridge-name": "br-sfc"
+                    "bridge-name": "br-int"
         },
-        "rest-uri": "http://localhost:5000",
         "sff-data-plane-locator": [
           {
-            "name": "SFF-2-DPL",
+            "name": "sff2-dpl",
             "data-plane-locator": {
-              "port": 5000,
-              "ip": "172.17.0.5",
+              "port": 6633,
+              "ip": "ovs-node-3",
               "transport": "service-locator:vxlan-gpe"
             },
             "service-function-forwarder-ovs:ovs-options": {
@@ -78,20 +95,39 @@
         ],
         "service-function-dictionary": [
           {
+            "name": "firewall-1",
             "sff-sf-data-plane-locator": {
-              "sf-dpl-name": "SF-2-DPL",
-              "sff-dpl-name": "SFF-2-DPL"
-            },
-            "name": "SF2"
+              "sf-dpl-name": "firewall-1-dpl",
+              "sff-dpl-name": "sff2-dpl"
+            }
           }
-        ],
-        "connected-sff-dictionary": [
+        ]
+      },
+      {
+        "name": "Classifier2",
+        "service-node": "classifier2",
+        "service-function-forwarder-ovs:ovs-bridge": {
+                    "bridge-name": "br-int"
+        },
+        "sff-data-plane-locator": [
           {
-            "sff-sff-data-plane-locator": {
-              "port": 5000,
-              "ip": "172.17.0.3"
+            "name": "sff3-dpl",
+            "data-plane-locator": {
+              "port": 6633,
+              "ip": "ovs-node-1",
+              "transport": "service-locator:vxlan-gpe"
             },
-            "name": "SFF-1"
+            "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"
+            }
           }
         ]
       }