Code Review / integration / test.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 5a07ede)
Fixed data for GBP tests 92/30392/1
authorMartin Sunal <msunal@cisco.com>
Mon, 30 Nov 2015 16:53:58 +0000 (17:53 +0100)
committerMartin Sunal <msunal@cisco.com>
Mon, 30 Nov 2015 16:55:53 +0000 (17:55 +0100)
- commit [1] changed classifier and action definition IDs

[1] https://git.opendaylight.org/gerrit/#/c/30219/

Change-Id: I4c6ec4a8c62a774c0c8cee1fdf3c1f3654266b8a
Signed-off-by: Martin Sunal <msunal@cisco.com>
csit/variables/gbp/3node/tenant1.json patch | blob | history
csit/variables/gbp/3node/tenant2.json patch | blob | history
csit/variables/gbp/demo-asymmetric-chain/tenants.json patch | blob | history
csit/variables/gbp/demo-symmetric-chain/tenants.json patch | blob | history
csit/variables/gbp/tenant1.json patch | blob | history
csit/variables/gbp/tenants.json patch | blob | history

diff --git a/csit/variables/gbp/3node/tenant1.json b/csit/variables/gbp/3node/tenant1.json
index c830c6f43cda32b78c4376ebcef9fd876ea6b8ac..d7e9cd6e4caa71882b28ccdd2be9eeda50380bbf 100644 (file)
--- a/csit/variables/gbp/3node/tenant1.json
+++ b/csit/variables/gbp/3node/tenant1.json
@@ -116,7 +116,7 @@
         "subject-feature-instances": {
             "classifier-instance": [
                 {
-                    "classifier-definition-id": "4250ab32-e8b8-445a-aebb-e1bd2cdd291f",
+                    "classifier-definition-id": "Classifier-L4",
                     "name": "http-dest",
                     "parameter-value": [
                         {
@@ -130,7 +130,7 @@
                     ]
                 },
                 {
-                    "classifier-definition-id": "4250ab32-e8b8-445a-aebb-e1bd2cdd291f",
+                    "classifier-definition-id": "Classifier-L4",
                     "name": "http-src",
                     "parameter-value": [
                         {
@@ -144,7 +144,7 @@
                     ]
                 },
                 {
-                    "classifier-definition-id": "79c6fdb2-1e1a-4832-af57-c65baf5c2335",
+                    "classifier-definition-id": "Classifier-IP-Protocol",
                     "name": "icmp",
                     "parameter-value": [
                         {
@@ -157,7 +157,7 @@
             "action-instance": [
                 {
                     "name": "allow1",
-                    "action-definition-id": "f942e8fd-e957-42b7-bd18-f73d11266d17"
+                    "action-definition-id": "Action-Allow"
                 }
             ]
         },
diff --git a/csit/variables/gbp/3node/tenant2.json b/csit/variables/gbp/3node/tenant2.json
index 64651db748f1e19001b3e242f1a9d232e2d155a4..6cf00e4bf2f3cfe1792defa0f918c940f5dde637 100644 (file)
--- a/csit/variables/gbp/3node/tenant2.json
+++ b/csit/variables/gbp/3node/tenant2.json
@@ -131,7 +131,7 @@
             "classifier-instance": [
                 {
                     "name": "icmp",
-                    "classifier-definition-id": "79c6fdb2-1e1a-4832-af57-c65baf5c2335",
+                    "classifier-definition-id": "Classifier-IP-Protocol",
                     "parameter-value": [
                         {
                             "name": "proto",
@@ -141,7 +141,7 @@
                 },
                 {
                     "name": "http-dest",
-                    "classifier-definition-id": "4250ab32-e8b8-445a-aebb-e1bd2cdd291f",
+                    "classifier-definition-id": "Classifier-L4",
                     "parameter-value": [
                         {
                             "int-value": "6",
@@ -155,7 +155,7 @@
                 },
                 {
                     "name": "http-src",
-                    "classifier-definition-id": "4250ab32-e8b8-445a-aebb-e1bd2cdd291f",
+                    "classifier-definition-id": "Classifier-L4",
                     "parameter-value": [
                         {
                             "int-value": "6",
@@ -171,7 +171,7 @@
             "action-instance": [
                 {
                     "name": "allow1",
-                    "action-definition-id": "f942e8fd-e957-42b7-bd18-f73d11266d17"
+                    "action-definition-id": "Action-Allow"
                 }
             ]
         }
diff --git a/csit/variables/gbp/demo-asymmetric-chain/tenants.json b/csit/variables/gbp/demo-asymmetric-chain/tenants.json
index 8531b97653f3343edc9389b55d45b636f00f5a25..840e88adce7d298bf4a51417e1a0f0d5a65f3436 100644 (file)
--- a/csit/variables/gbp/demo-asymmetric-chain/tenants.json
+++ b/csit/variables/gbp/demo-asymmetric-chain/tenants.json
@@ -70,7 +70,7 @@
                 "classifier-instance": [
                     {
                         "name": "icmp",
-                        "classifier-definition-id": "79c6fdb2-1e1a-4832-af57-c65baf5c2335",
+                        "classifier-definition-id": "Classifier-IP-Protocol",
                         "parameter-value": [
                             {
                                 "name": "proto",
@@ -80,7 +80,7 @@
                     },
                     {
                         "name": "http-dest",
-                        "classifier-definition-id": "4250ab32-e8b8-445a-aebb-e1bd2cdd291f",
+                        "classifier-definition-id": "Classifier-L4",
                         "parameter-value": [
                             {
                                 "int-value": "6",
@@ -94,7 +94,7 @@
                     },
                     {
                         "name": "http-src",
-                        "classifier-definition-id": "4250ab32-e8b8-445a-aebb-e1bd2cdd291f",
+                        "classifier-definition-id": "Classifier-L4",
                         "parameter-value": [
                             {
                                 "int-value": "6",
@@ -110,7 +110,7 @@
                 "action-instance": [
                     {
                         "name": "chain1",
-                        "action-definition-id": "3d886be7-059f-4c4f-bbef-0356bea40933",
+                        "action-definition-id": "Action-Chain",
                         "parameter-value": [
                             {
                                 "name": "sfc-chain-name",
@@ -120,7 +120,7 @@
                     },
                     {
                         "name": "allow1",
-                        "action-definition-id": "f942e8fd-e957-42b7-bd18-f73d11266d17"
+                        "action-definition-id": "Action-Allow"
                     }
                 ]
             },
diff --git a/csit/variables/gbp/demo-symmetric-chain/tenants.json b/csit/variables/gbp/demo-symmetric-chain/tenants.json
index d3c871b1b2a71a709222251e82eca1528ac24184..c6292422947c09d0d79783bc283a523e7073ad9f 100644 (file)
--- a/csit/variables/gbp/demo-symmetric-chain/tenants.json
+++ b/csit/variables/gbp/demo-symmetric-chain/tenants.json
@@ -70,7 +70,7 @@
                 "classifier-instance": [
                     {
                         "name": "icmp",
-                        "classifier-definition-id": "79c6fdb2-1e1a-4832-af57-c65baf5c2335",
+                        "classifier-definition-id": "Classifier-IP-Protocol",
                         "parameter-value": [
                             {
                                 "name": "proto",
@@ -80,7 +80,7 @@
                     },
                     {
                         "name": "http-dest",
-                        "classifier-definition-id": "4250ab32-e8b8-445a-aebb-e1bd2cdd291f",
+                        "classifier-definition-id": "Classifier-L4",
                         "parameter-value": [
                             {
                                 "int-value": "6",
@@ -94,7 +94,7 @@
                     },
                     {
                         "name": "http-src",
-                        "classifier-definition-id": "4250ab32-e8b8-445a-aebb-e1bd2cdd291f",
+                        "classifier-definition-id": "Classifier-L4",
                         "parameter-value": [
                             {
                                 "int-value": "6",
@@ -110,7 +110,7 @@
                 "action-instance": [
                     {
                         "name": "chain1",
-                        "action-definition-id": "3d886be7-059f-4c4f-bbef-0356bea40933",
+                        "action-definition-id": "Action-Chain",
                         "parameter-value": [
                             {
                                 "name": "sfc-chain-name",
@@ -120,7 +120,7 @@
                     },
                     {
                         "name": "allow1",
-                        "action-definition-id": "f942e8fd-e957-42b7-bd18-f73d11266d17"
+                        "action-definition-id": "Action-Allow"
                     }
                 ]
             },
diff --git a/csit/variables/gbp/tenant1.json b/csit/variables/gbp/tenant1.json
index 50993b33fe8f63a4e450ac6190e694458f8f8171..99a297ecf354d23c5cee8452124b695fd98bd533 100644 (file)
--- a/csit/variables/gbp/tenant1.json
+++ b/csit/variables/gbp/tenant1.json
@@ -115,7 +115,7 @@
         "subject-feature-instances": {
             "classifier-instance": [
                 {
-                    "classifier-definition-id": "4250ab32-e8b8-445a-aebb-e1bd2cdd291f",
+                    "classifier-definition-id": "Classifier-L4",
                     "name": "http-dest",
                     "parameter-value": [
                         {
@@ -129,7 +129,7 @@
                     ]
                 },
                 {
-                    "classifier-definition-id": "4250ab32-e8b8-445a-aebb-e1bd2cdd291f",
+                    "classifier-definition-id": "Classifier-L4",
                     "name": "http-src",
                     "parameter-value": [
                         {
@@ -143,7 +143,7 @@
                     ]
                 },
                 {
-                    "classifier-definition-id": "79c6fdb2-1e1a-4832-af57-c65baf5c2335",
+                    "classifier-definition-id": "Classifier-IP-Protocol",
                     "name": "icmp",
                     "parameter-value": [
                         {
@@ -156,7 +156,7 @@
           "action-instance": [
             {
               "name": "allow1",
-              "action-definition-id": "f942e8fd-e957-42b7-bd18-f73d11266d17"
+              "action-definition-id": "Action-Allow"
             }
           ]
         },
diff --git a/csit/variables/gbp/tenants.json b/csit/variables/gbp/tenants.json
index df1cc7842368228df1483b55a9d5320b117cd106..6ce8cd65aa9669b6bc27cd40eb16d78a81b2ce1d 100644 (file)
--- a/csit/variables/gbp/tenants.json
+++ b/csit/variables/gbp/tenants.json
@@ -117,7 +117,7 @@
         "subject-feature-instances": {
             "classifier-instance": [
                 {
-                    "classifier-definition-id": "4250ab32-e8b8-445a-aebb-e1bd2cdd291f",
+                    "classifier-definition-id": "Classifier-L4",
                     "name": "http-dest",
                     "parameter-value": [
                         {
@@ -131,7 +131,7 @@
                     ]
                 },
                 {
-                    "classifier-definition-id": "4250ab32-e8b8-445a-aebb-e1bd2cdd291f",
+                    "classifier-definition-id": "Classifier-L4",
                     "name": "http-src",
                     "parameter-value": [
                         {
@@ -145,7 +145,7 @@
                     ]
                 },
                 {
-                    "classifier-definition-id": "79c6fdb2-1e1a-4832-af57-c65baf5c2335",
+                    "classifier-definition-id": "Classifier-IP-Protocol",
                     "name": "icmp",
                     "parameter-value": [
                         {
@@ -158,7 +158,7 @@
           "action-instance": [
             {
               "name": "allow1",
-              "action-definition-id": "f942e8fd-e957-42b7-bd18-f73d11266d17"
+              "action-definition-id": "Action-Allow"
             }
           ]
         },
Integration test