Fixed data for GBP CSIT tests for Li and Master branch.

[integration/test.git] / csit / variables / gbp / 3node / lithium / tenant1.json

diff --git a/csit/variables/gbp/tenant1.json b/csit/variables/gbp/3node/lithium/tenant1.json
similarity index 79%
rename from csit/variables/gbp/tenant1.json
rename to csit/variables/gbp/3node/lithium/tenant1.json
index 99a297ecf354d23c5cee8452124b695fd98bd533..5fef5334f4cdfea3be1cfa0128414e4457fcae25 100644 (file)
--- a/csit/variables/gbp/tenant1.json
+++ b/csit/variables/gbp/3node/lithium/tenant1.json
@@ -1,5 +1,5 @@
 {
-    "tenant": {
+    "policy:tenant": {
         "contract": [
             {
                 "clause": [
@@ -20,20 +20,21 @@
                                 "classifier-ref": [
                                     {
                                         "direction": "in",
-                                        "name": "http-dest"
+                                        "name": "http-dest",
+                                        "instance-name": "http-dest"
                                     },
                                     {
                                         "direction": "out",
-                                        "name": "http-src"
+                                        "name": "http-src",
+                                        "instance-name": "http-src"
+                                    }
+                                ],
+                                "action-ref": [
+                                    {
+                                        "name": "allow1",
+                                        "order": 0
                                     }
                                 ],
-                                                    "action-ref": [
-                      {
-                        "name": "allow1",
-                        "order": 0
-                      }
-                    ],
-
                                 "name": "allow-http-rule"
                             }
                         ]
@@ -44,16 +45,16 @@
                             {
                                 "classifier-ref": [
                                     {
-                                        "name": "icmp"
+                                        "name": "icmp",
+                                        "instance-name": "icmp"
+                                    }
+                                ],
+                                "action-ref": [
+                                    {
+                                        "name": "allow1",
+                                        "order": 0
                                     }
                                 ],
-                                                    "action-ref": [
-                      {
-                        "name": "allow1",
-                        "order": 0
-                      }
-                    ],
-
                                 "name": "allow-icmp-rule"
                             }
                         ]
@@ -115,7 +116,7 @@
         "subject-feature-instances": {
             "classifier-instance": [
                 {
-                    "classifier-definition-id": "Classifier-L4",
+                    "classifier-definition-id": "4250ab32-e8b8-445a-aebb-e1bd2cdd291f",
                     "name": "http-dest",
                     "parameter-value": [
                         {
@@ -129,7 +130,7 @@
                     ]
                 },
                 {
-                    "classifier-definition-id": "Classifier-L4",
+                    "classifier-definition-id": "4250ab32-e8b8-445a-aebb-e1bd2cdd291f",
                     "name": "http-src",
                     "parameter-value": [
                         {
@@ -143,7 +144,7 @@
                     ]
                 },
                 {
-                    "classifier-definition-id": "Classifier-IP-Protocol",
+                    "classifier-definition-id": "79c6fdb2-1e1a-4832-af57-c65baf5c2335",
                     "name": "icmp",
                     "parameter-value": [
                         {
@@ -153,12 +154,12 @@
                     ]
                 }
             ],
-          "action-instance": [
-            {
-              "name": "allow1",
-              "action-definition-id": "Action-Allow"
-            }
-          ]
+            "action-instance": [
+                {
+                    "name": "allow1",
+                    "action-definition-id": "f942e8fd-e957-42b7-bd18-f73d11266d17"
+                }
+            ]
         },
         "subnet": [
             {