From 02425fdb2b5b96915ab9eb5a7048f6b6b45cb443 Mon Sep 17 00:00:00 2001 From: Martin Sunal Date: Mon, 30 Nov 2015 17:53:58 +0100 Subject: [PATCH] Fixed data for GBP tests - commit [1] changed classifier and action definition IDs [1] https://git.opendaylight.org/gerrit/#/c/30219/ Change-Id: I4c6ec4a8c62a774c0c8cee1fdf3c1f3654266b8a Signed-off-by: Martin Sunal --- csit/variables/gbp/3node/tenant1.json | 8 ++++---- csit/variables/gbp/3node/tenant2.json | 8 ++++---- csit/variables/gbp/demo-asymmetric-chain/tenants.json | 10 +++++----- csit/variables/gbp/demo-symmetric-chain/tenants.json | 10 +++++----- csit/variables/gbp/tenant1.json | 8 ++++---- csit/variables/gbp/tenants.json | 8 ++++---- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/csit/variables/gbp/3node/tenant1.json b/csit/variables/gbp/3node/tenant1.json index c830c6f43c..d7e9cd6e4c 100644 --- 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 64651db748..6cf00e4bf2 100644 --- 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 8531b97653..840e88adce 100644 --- 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 d3c871b1b2..c629242294 100644 --- 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 50993b33fe..99a297ecf3 100644 --- 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 df1cc78423..6ce8cd65aa 100644 --- 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" } ] }, -- 2.36.6