X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fvariables%2Fgbp%2F6node%2Fdemo-symmetric-chain%2Fmaster%2Ftenants.json;fp=csit%2Fvariables%2Fgbp%2F6node%2Fdemo-symmetric-chain%2Fmaster%2Ftenants.json;h=41742f066c8334a9b06b5d33fcb2f98d1c53597b;hb=18dca374846b169c4852f0a7ea33046487a2207f;hp=f1599ddaddde747d54181a04779f3f7e7a64be14;hpb=b91a9e0dee3eab772340f1f7209fe20ccd46ff58;p=integration%2Ftest.git

diff --git a/csit/variables/gbp/6node/demo-symmetric-chain/master/tenants.json b/csit/variables/gbp/6node/demo-symmetric-chain/master/tenants.json
index f1599ddadd..41742f066c 100644
--- a/csit/variables/gbp/6node/demo-symmetric-chain/master/tenants.json
+++ b/csit/variables/gbp/6node/demo-symmetric-chain/master/tenants.json
@@ -1,201 +1,205 @@
 {
-    "tenant": [
-        {
-            "id": "tenant-red",
-            "l2-flood-domain": [
-                {
-                    "id": "flood-domain-1",
-                    "parent": "bridge-domain1"
-                },
-                {
-                    "id": "flood-domain-2",
-                    "parent": "bridge-domain1"
-                }
-            ],
-            "name": "DockerTenant",
-            "l3-context": [
-                {
-                    "id": "l3-context-vrf-red"
-                }
-            ],
-            "l2-bridge-domain": [
-                {
-                    "id": "bridge-domain1",
-                    "parent": "l3-context-vrf-red"
-                }
-            ],
-            "subnet": [
-                {
-                    "id": "subnet-10.0.36.0/24",
-                    "virtual-router-ip": "10.0.36.1",
-                    "parent": "flood-domain-2",
-                    "ip-prefix": "10.0.36.1/24"
-                },
-                {
-                    "id": "subnet-10.0.35.0/24",
-                    "virtual-router-ip": "10.0.35.1",
-                    "parent": "flood-domain-1",
-                    "ip-prefix": "10.0.35.1/24"
-                }
-            ],
-            "endpoint-group": [
-                {
-                    "id": "webservers",
-                    "name": "webservers",
-                    "provider-named-selector": [
-                        {
-                            "name": "webservers-clients-icmp-http-contract",
-                            "contract": [
-                                "icmp-http-contract"
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "id": "clients",
-                    "name": "clients",
-                    "consumer-named-selector": [
-                        {
-                            "name": "webservers-clients-icmp-http-contract",
-                            "contract": [
-                                "icmp-http-contract"
-                            ]
-                        }
-                    ]
-                }
-            ],
-            "subject-feature-instances": {
-                "classifier-instance": [
-                    {
-                        "name": "icmp",
-                        "classifier-definition-id": "Classifier-IP-Protocol",
-                        "parameter-value": [
-                            {
-                                "name": "proto",
-                                "int-value": 1
-                            }
-                        ]
-                    },
-                    {
-                        "name": "http-dest",
-                        "classifier-definition-id": "Classifier-L4",
-                        "parameter-value": [
-                            {
-                                "int-value": "6",
-                                "name": "proto"
-                            },
-                            {
-                                "int-value": "80",
-                                "name": "destport"
-                            }
-                        ]
-                    },
-                    {
-                        "name": "http-src",
-                        "classifier-definition-id": "Classifier-L4",
-                        "parameter-value": [
-                            {
-                                "int-value": "6",
-                                "name": "proto"
-                            },
-                            {
-                                "int-value": "80",
-                                "name": "sourceport"
-                            }
-                        ]
-                    }
-                ],
-                "action-instance": [
-                    {
-                        "name": "chain1",
-                        "action-definition-id": "Action-Chain",
-                        "parameter-value": [
-                            {
-                                "name": "sfc-chain-name",
-                                "string-value": "SFCGBP"
-                            }
-                        ]
-                    },
-                    {
-                        "name": "allow1",
-                        "action-definition-id": "Action-Allow"
-                    }
-                ]
-            },
-            "contract": [
-                {
-                    "id": "icmp-http-contract",
-                    "subject": [
-                        {
-                            "name": "icmp-subject",
-                            "rule": [
-                                {
-                                    "name": "allow-icmp-rule",
-                                    "order": 0,
-                                    "classifier-ref": [
-                                        {
-                                            "name": "icmp",
-                                            "instance-name": "icmp"
-                                        }
-                                    ],
-                                    "action-ref": [
-                                        {
-                                            "name": "allow1",
-                                            "order": 0
-                                        }
-                                    ]
-                                }
-                            ]
-                        },
-                        {
-                            "name": "http-subject",
-                            "rule": [
-                                {
-                                    "name": "http-chain-rule-in",
-                                    "classifier-ref": [
-                                        {
-                                            "name": "http-dest",
-                                            "instance-name": "http-dest",
-                                            "direction": "in"
-                                        }
-                                    ],
-                                    "action-ref": [
-                                        {
-                                            "name": "chain1",
-                                            "order": 0
-                                        }
-                                    ]
-                                },
-                                {
-                                    "name": "http-chain-rule-out",
-                                    "classifier-ref": [
-                                        {
-                                            "name": "http-src",
-                                            "instance-name": "http-src",
-                                            "direction": "out"
-                                        }
-                                    ],
-                                    "action-ref": [
-                                        {
-                                            "name": "chain1",
-                                            "order": 0
-                                        }
-                                    ]
-                                }
-                            ]
-                        }
-                    ],
-                    "clause": [
-                        {
-                            "name": "icmp-http-clause",
-                            "subject-refs": [
-                                "icmp-subject",
-                                "http-subject"
-                            ]
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}
+         "tenant": [
+           {
+             "id": "tenant-red",
+             "name": "DockerTenant",
+             "forwarding-context": {
+               "l2-flood-domain": [
+                 {
+                   "id": "flood-domain-1",
+                   "parent": "bridge-domain1"
+                 },
+                 {
+                   "id": "flood-domain-2",
+                   "parent": "bridge-domain1"
+                 }
+               ],
+               "l3-context": [
+                 {
+                   "id": "l3-context-vrf-red"
+                 }
+               ],
+               "l2-bridge-domain": [
+                 {
+                   "id": "bridge-domain1",
+                   "parent": "l3-context-vrf-red"
+                 }
+               ],
+               "subnet": [
+                 {
+                   "id": "subnet-10.0.36.0/24",
+                   "virtual-router-ip": "10.0.36.1",
+                   "parent": "flood-domain-2",
+                   "ip-prefix": "10.0.36.1/24"
+                 },
+                 {
+                   "id": "subnet-10.0.35.0/24",
+                   "virtual-router-ip": "10.0.35.1",
+                   "parent": "flood-domain-1",
+                   "ip-prefix": "10.0.35.1/24"
+                 }
+               ]
+             },
+             "policy": {
+               "endpoint-group": [
+                 {
+                   "id": "webservers",
+                   "name": "webservers",
+                   "provider-named-selector": [
+                     {
+                       "name": "webservers-clients-icmp-http-contract",
+                       "contract": [
+                         "icmp-http-contract"
+                       ]
+                     }
+                   ]
+                 },
+                 {
+                   "id": "clients",
+                   "name": "clients",
+                   "consumer-named-selector": [
+                     {
+                       "name": "webservers-clients-icmp-http-contract",
+                       "contract": [
+                         "icmp-http-contract"
+                       ]
+                     }
+                   ]
+                 }
+               ],
+               "subject-feature-instances": {
+                 "classifier-instance": [
+                   {
+                     "name": "icmp",
+                     "classifier-definition-id": "Classifier-IP-Protocol",
+                     "parameter-value": [
+                       {
+                         "name": "proto",
+                         "int-value": 1
+                       }
+                     ]
+                   },
+                   {
+                     "name": "http-dest",
+                     "classifier-definition-id": "Classifier-L4",
+                     "parameter-value": [
+                       {
+                         "int-value": "6",
+                         "name": "proto"
+                       },
+                       {
+                         "int-value": "80",
+                         "name": "destport"
+                       }
+                     ]
+                   },
+                   {
+                     "name": "http-src",
+                     "classifier-definition-id": "Classifier-L4",
+                     "parameter-value": [
+                       {
+                         "int-value": "6",
+                         "name": "proto"
+                       },
+                       {
+                         "int-value": "80",
+                         "name": "sourceport"
+                       }
+                     ]
+                   }
+                 ],
+                 "action-instance": [
+                   {
+                     "name": "chain1",
+                     "action-definition-id": "Action-Chain",
+                     "parameter-value": [
+                       {
+                         "name": "sfc-chain-name",
+                         "string-value": "SFCGBP"
+                       }
+                     ]
+                   },
+                   {
+                     "name": "allow1",
+                     "action-definition-id": "Action-Allow"
+                   }
+                 ]
+               },
+               "contract": [
+                 {
+                   "id": "icmp-http-contract",
+                   "subject": [
+                     {
+                       "name": "icmp-subject",
+                       "rule": [
+                         {
+                           "name": "allow-icmp-rule",
+                           "order": 0,
+                           "classifier-ref": [
+                             {
+                               "name": "icmp",
+                               "instance-name": "icmp"
+                             }
+                           ],
+                           "action-ref": [
+                             {
+                               "name": "allow1",
+                               "order": 0
+                             }
+                           ]
+                         }
+                       ]
+                     },
+                     {
+                       "name": "http-subject",
+                       "rule": [
+                         {
+                           "name": "http-chain-rule-in",
+                           "classifier-ref": [
+                             {
+                               "name": "http-dest",
+                               "instance-name": "http-dest",
+                               "direction": "in"
+                             }
+                           ],
+                           "action-ref": [
+                             {
+                               "name": "chain1",
+                               "order": 0
+                             }
+                           ]
+                         },
+                         {
+                           "name": "http-chain-rule-out",
+                           "classifier-ref": [
+                             {
+                               "name": "http-src",
+                               "instance-name": "http-src",
+                               "direction": "out"
+                             }
+                           ],
+                           "action-ref": [
+                             {
+                               "name": "chain1",
+                               "order": 0
+                             }
+                           ]
+                         }
+                       ]
+                     }
+                   ],
+                   "clause": [
+                     {
+                       "name": "icmp-http-clause",
+                       "subject-refs": [
+                         "icmp-subject",
+                         "http-subject"
+                       ]
+                     }
+                   ]
+                 }
+               ]
+             }
+           }
+         ]
+     }
\ No newline at end of file