Changed GBP data based on change 30901

Change-Id: Ibc1dd4e2fb890ee555594ca2e807f1489726e386
Signed-off-by: Martin Sunal <msunal@cisco.com>

diff --git a/csit/variables/gbp/3node/master/tenant1.json b/csit/variables/gbp/3node/master/tenant1.json
index b9eb3456f348adc59dad2b46f35a90ada972e6b5..9f31b79550532671cfc1a4c59b68ede78bb403d6 100644 (file)
--- a/csit/variables/gbp/3node/master/tenant1.json
+++ b/csit/variables/gbp/3node/master/tenant1.json
@@ -1,177 +1,181 @@
 {
-    "policy:tenant": {
-        "contract": [
+  "policy:tenant": {
+    "id": "tenant-red",
+    "name": "GBPPOC",
+    "forwarding-context": {
+      "l2-bridge-domain": [
+        {
+          "id": "bridge-domain1",
+          "parent": "l3-context-vrf-red"
+        }
+      ],
+      "l2-flood-domain": [
+        {
+          "id": "flood-domain-1",
+          "parent": "bridge-domain1"
+        },
+        {
+          "id": "flood-domain1",
+          "parent": "bridge-domain1"
+        }
+      ],
+      "l3-context": [
+        {
+          "id": "l3-context-vrf-red"
+        }
+      ],
+      "subnet": [
+        {
+          "id": "subnet-10.0.35.0/24",
+          "ip-prefix": "10.0.35.1/24",
+          "parent": "flood-domain-1",
+          "virtual-router-ip": "10.0.35.1"
+        },
+        {
+          "id": "subnet-10.0.36.0/24",
+          "ip-prefix": "10.0.36.1/24",
+          "parent": "flood-domain1",
+          "virtual-router-ip": "10.0.36.1"
+        }
+      ]
+    },
+    "policy": {
+      "contract": [
+        {
+          "clause": [
             {
-                "clause": [
-                    {
-                        "name": "allow-http-clause",
-                        "subject-refs": [
-                            "allow-http-subject",
-                            "allow-icmp-subject"
-                        ]
-                    }
-                ],
-                "id": "icmp-http-contract",
-                "subject": [
+              "name": "allow-http-clause",
+              "subject-refs": [
+                "allow-http-subject",
+                "allow-icmp-subject"
+              ]
+            }
+          ],
+          "id": "icmp-http-contract",
+          "subject": [
+            {
+              "name": "allow-http-subject",
+              "rule": [
+                {
+                  "classifier-ref": [
                     {
-                        "name": "allow-http-subject",
-                        "rule": [
-                            {
-                                "classifier-ref": [
-                                    {
-                                        "direction": "in",
-                                        "name": "http-dest",
-                                        "instance-name": "http-dest"
-                                    },
-                                    {
-                                        "direction": "out",
-                                        "name": "http-src",
-                                        "instance-name": "http-src"
-                                    }
-                                ],
-                                "action-ref": [
-                                    {
-                                        "name": "allow1",
-                                        "order": 0
-                                    }
-                                ],
-                                "name": "allow-http-rule"
-                            }
-                        ]
+                      "direction": "in",
+                      "name": "http-dest",
+                      "instance-name": "http-dest"
                     },
                     {
-                        "name": "allow-icmp-subject",
-                        "rule": [
-                            {
-                                "classifier-ref": [
-                                    {
-                                        "name": "icmp",
-                                        "instance-name": "icmp"
-                                    }
-                                ],
-                                "action-ref": [
-                                    {
-                                        "name": "allow1",
-                                        "order": 0
-                                    }
-                                ],
-                                "name": "allow-icmp-rule"
-                            }
-                        ]
+                      "direction": "out",
+                      "name": "http-src",
+                      "instance-name": "http-src"
                     }
-                ]
-            }
-        ],
-        "endpoint-group": [
-            {
-                "consumer-named-selector": [
+                  ],
+                  "action-ref": [
                     {
-                        "contract": [
-                            "icmp-http-contract"
-                        ],
-                        "name": "webservers-clients-icmp-http-contract"
+                      "name": "allow1",
+                      "order": 0
                     }
-                ],
-                "id": "clients",
-                "provider-named-selector": []
+                  ],
+                  "name": "allow-http-rule"
+                }
+              ]
             },
             {
-                "consumer-named-selector": [],
-                "id": "webservers",
-                "provider-named-selector": [
+              "name": "allow-icmp-subject",
+              "rule": [
+                {
+                  "classifier-ref": [
                     {
-                        "contract": [
-                            "icmp-http-contract"
-                        ],
-                        "name": "webservers-clients-icmp-http-contract"
+                      "name": "icmp",
+                      "instance-name": "icmp"
                     }
-                ]
-            }
-        ],
-        "id": "tenant-red",
-        "l2-bridge-domain": [
-            {
-                "id": "bridge-domain1",
-                "parent": "l3-context-vrf-red"
-            }
-        ],
-        "l2-flood-domain": [
-            {
-                "id": "flood-domain-1",
-                "parent": "bridge-domain1"
-            },
-            {
-                "id": "flood-domain1",
-                "parent": "bridge-domain1"
+                  ],
+                  "action-ref": [
+                    {
+                      "name": "allow1",
+                      "order": 0
+                    }
+                  ],
+                  "name": "allow-icmp-rule"
+                }
+              ]
             }
-        ],
-        "l3-context": [
+          ]
+        }
+      ],
+      "endpoint-group": [
+        {
+          "consumer-named-selector": [
             {
-                "id": "l3-context-vrf-red"
+              "contract": [
+                "icmp-http-contract"
+              ],
+              "name": "webservers-clients-icmp-http-contract"
             }
-        ],
-        "name": "GBPPOC",
-        "subject-feature-instances": {
-            "classifier-instance": [
-                {
-                    "classifier-definition-id": "Classifier-L4",
-                    "name": "http-dest",
-                    "parameter-value": [
-                        {
-                            "int-value": "6",
-                            "name": "proto"
-                        },
-                        {
-                            "int-value": "80",
-                            "name": "destport"
-                        }
-                    ]
-                },
-                {
-                    "classifier-definition-id": "Classifier-L4",
-                    "name": "http-src",
-                    "parameter-value": [
-                        {
-                            "int-value": "6",
-                            "name": "proto"
-                        },
-                        {
-                            "int-value": "80",
-                            "name": "sourceport"
-                        }
-                    ]
-                },
-                {
-                    "classifier-definition-id": "Classifier-IP-Protocol",
-                    "name": "icmp",
-                    "parameter-value": [
-                        {
-                            "int-value": "1",
-                            "name": "proto"
-                        }
-                    ]
-                }
-            ],
-            "action-instance": [
-                {
-                    "name": "allow1",
-                    "action-definition-id": "Action-Allow"
-                }
-            ]
+          ],
+          "id": "clients",
+          "provider-named-selector": []
         },
-        "subnet": [
-            {
-                "id": "subnet-10.0.35.0/24",
-                "ip-prefix": "10.0.35.1/24",
-                "parent": "flood-domain-1",
-                "virtual-router-ip": "10.0.35.1"
-            },
+        {
+          "consumer-named-selector": [],
+          "id": "webservers",
+          "provider-named-selector": [
             {
-                "id": "subnet-10.0.36.0/24",
-                "ip-prefix": "10.0.36.1/24",
-                "parent": "flood-domain1",
-                "virtual-router-ip": "10.0.36.1"
+              "contract": [
+                "icmp-http-contract"
+              ],
+              "name": "webservers-clients-icmp-http-contract"
             }
+          ]
+        }
+      ],
+      "subject-feature-instances": {
+        "classifier-instance": [
+          {
+            "classifier-definition-id": "Classifier-L4",
+            "name": "http-dest",
+            "parameter-value": [
+              {
+                "int-value": "6",
+                "name": "proto"
+              },
+              {
+                "int-value": "80",
+                "name": "destport"
+              }
+            ]
+          },
+          {
+            "classifier-definition-id": "Classifier-L4",
+            "name": "http-src",
+            "parameter-value": [
+              {
+                "int-value": "6",
+                "name": "proto"
+              },
+              {
+                "int-value": "80",
+                "name": "sourceport"
+              }
+            ]
+          },
+          {
+            "classifier-definition-id": "Classifier-IP-Protocol",
+            "name": "icmp",
+            "parameter-value": [
+              {
+                "int-value": "1",
+                "name": "proto"
+              }
+            ]
+          }
+        ],
+        "action-instance": [
+          {
+            "name": "allow1",
+            "action-definition-id": "Action-Allow"
+          }
         ]
+      }
     }
-}
+  }
+}
\ No newline at end of file

diff --git a/csit/variables/gbp/3node/master/tenant2.json b/csit/variables/gbp/3node/master/tenant2.json
index 1e1f623db02c1f55ad5014699b509c247f151093..9e8bf2b6ea5ff5e23aaa058245eda41e0aabbde4 100644 (file)
--- a/csit/variables/gbp/3node/master/tenant2.json
+++ b/csit/variables/gbp/3node/master/tenant2.json
@@ -1,177 +1,181 @@
 {
-    "policy:tenant": {
-        "contract": [
+  "policy:tenant": {
+    "id": "tenant-blue",
+    "name": "GBPPOC",
+    "forwarding-context": {
+      "l2-bridge-domain": [
+        {
+          "id": "bridge-domain1",
+          "parent": "l3-context-vrf-red"
+        }
+      ],
+      "l2-flood-domain": [
+        {
+          "id": "flood-domain-1",
+          "parent": "bridge-domain1"
+        },
+        {
+          "id": "flood-domain1",
+          "parent": "bridge-domain1"
+        }
+      ],
+      "l3-context": [
+        {
+          "id": "l3-context-vrf-red"
+        }
+      ],
+      "subnet": [
+        {
+          "id": "subnet-10.0.35.0/24",
+          "ip-prefix": "10.0.35.1/24",
+          "parent": "flood-domain-1",
+          "virtual-router-ip": "10.0.35.1"
+        },
+        {
+          "id": "subnet-10.0.36.0/24",
+          "ip-prefix": "10.0.36.1/24",
+          "parent": "flood-domain1",
+          "virtual-router-ip": "10.0.36.1"
+        }
+      ]
+    },
+    "policy": {
+      "contract": [
+        {
+          "clause": [
             {
-                "clause": [
-                    {
-                        "name": "allow-http-clause",
-                        "subject-refs": [
-                            "allow-http-subject",
-                            "allow-icmp-subject"
-                        ]
-                    }
-                ],
-                "id": "icmp-http-contract",
-                "subject": [
+              "name": "allow-http-clause",
+              "subject-refs": [
+                "allow-http-subject",
+                "allow-icmp-subject"
+              ]
+            }
+          ],
+          "id": "icmp-http-contract",
+          "subject": [
+            {
+              "name": "allow-http-subject",
+              "rule": [
+                {
+                  "classifier-ref": [
                     {
-                        "name": "allow-http-subject",
-                        "rule": [
-                            {
-                                "classifier-ref": [
-                                    {
-                                        "direction": "in",
-                                        "name": "http-dest",
-                                        "instance-name": "http-dest"
-                                    },
-                                    {
-                                        "direction": "out",
-                                        "name": "http-src",
-                                        "instance-name": "http-src"
-                                    }
-                                ],
-                                "action-ref": [
-                                    {
-                                        "name": "allow1",
-                                        "order": 0
-                                    }
-                                ],
-                                "name": "allow-http-rule"
-                            }
-                        ]
+                      "direction": "in",
+                      "name": "http-dest",
+                      "instance-name": "http-dest"
                     },
                     {
-                        "name": "allow-icmp-subject",
-                        "rule": [
-                            {
-                                "classifier-ref": [
-                                    {
-                                        "name": "icmp",
-                                        "instance-name": "icmp"
-                                    }
-                                ],
-                                "action-ref": [
-                                    {
-                                        "name": "allow1",
-                                        "order": 0
-                                    }
-                                ],
-                                "name": "allow-icmp-rule"
-                            }
-                        ]
+                      "direction": "out",
+                      "name": "http-src",
+                      "instance-name": "http-src"
                     }
-                ]
-            }
-        ],
-        "endpoint-group": [
-            {
-                "consumer-named-selector": [
+                  ],
+                  "action-ref": [
                     {
-                        "contract": [
-                            "icmp-http-contract"
-                        ],
-                        "name": "webservers-clients-icmp-http-contract"
+                      "name": "allow1",
+                      "order": 0
                     }
-                ],
-                "id": "clients",
-                "provider-named-selector": []
+                  ],
+                  "name": "allow-http-rule"
+                }
+              ]
             },
             {
-                "consumer-named-selector": [],
-                "id": "webservers",
-                "provider-named-selector": [
+              "name": "allow-icmp-subject",
+              "rule": [
+                {
+                  "classifier-ref": [
                     {
-                        "contract": [
-                            "icmp-http-contract"
-                        ],
-                        "name": "webservers-clients-icmp-http-contract"
+                      "name": "icmp",
+                      "instance-name": "icmp"
                     }
-                ]
-            }
-        ],
-        "id": "tenant-blue",
-        "l2-bridge-domain": [
-            {
-                "id": "bridge-domain1",
-                "parent": "l3-context-vrf-red"
-            }
-        ],
-        "l2-flood-domain": [
-            {
-                "id": "flood-domain-1",
-                "parent": "bridge-domain1"
-            },
-            {
-                "id": "flood-domain1",
-                "parent": "bridge-domain1"
+                  ],
+                  "action-ref": [
+                    {
+                      "name": "allow1",
+                      "order": 0
+                    }
+                  ],
+                  "name": "allow-icmp-rule"
+                }
+              ]
             }
-        ],
-        "l3-context": [
+          ]
+        }
+      ],
+      "endpoint-group": [
+        {
+          "consumer-named-selector": [
             {
-                "id": "l3-context-vrf-red"
+              "contract": [
+                "icmp-http-contract"
+              ],
+              "name": "webservers-clients-icmp-http-contract"
             }
-        ],
-        "name": "GBPPOC",
-        "subject-feature-instances": {
-            "classifier-instance": [
-                {
-                    "classifier-definition-id": "Classifier-L4",
-                    "name": "http-dest",
-                    "parameter-value": [
-                        {
-                            "int-value": "6",
-                            "name": "proto"
-                        },
-                        {
-                            "int-value": "80",
-                            "name": "destport"
-                        }
-                    ]
-                },
-                {
-                    "classifier-definition-id": "Classifier-L4",
-                    "name": "http-src",
-                    "parameter-value": [
-                        {
-                            "int-value": "6",
-                            "name": "proto"
-                        },
-                        {
-                            "int-value": "80",
-                            "name": "sourceport"
-                        }
-                    ]
-                },
-                {
-                    "classifier-definition-id": "Classifier-IP-Protocol",
-                    "name": "icmp",
-                    "parameter-value": [
-                        {
-                            "int-value": "1",
-                            "name": "proto"
-                        }
-                    ]
-                }
-            ],
-            "action-instance": [
-                {
-                    "name": "allow1",
-                    "action-definition-id": "Action-Allow"
-                }
-            ]
+          ],
+          "id": "clients",
+          "provider-named-selector": []
         },
-        "subnet": [
-            {
-                "id": "subnet-10.0.35.0/24",
-                "ip-prefix": "10.0.35.1/24",
-                "parent": "flood-domain-1",
-                "virtual-router-ip": "10.0.35.1"
-            },
+        {
+          "consumer-named-selector": [],
+          "id": "webservers",
+          "provider-named-selector": [
             {
-                "id": "subnet-10.0.36.0/24",
-                "ip-prefix": "10.0.36.1/24",
-                "parent": "flood-domain1",
-                "virtual-router-ip": "10.0.36.1"
+              "contract": [
+                "icmp-http-contract"
+              ],
+              "name": "webservers-clients-icmp-http-contract"
             }
+          ]
+        }
+      ],
+      "subject-feature-instances": {
+        "classifier-instance": [
+          {
+            "classifier-definition-id": "Classifier-L4",
+            "name": "http-dest",
+            "parameter-value": [
+              {
+                "int-value": "6",
+                "name": "proto"
+              },
+              {
+                "int-value": "80",
+                "name": "destport"
+              }
+            ]
+          },
+          {
+            "classifier-definition-id": "Classifier-L4",
+            "name": "http-src",
+            "parameter-value": [
+              {
+                "int-value": "6",
+                "name": "proto"
+              },
+              {
+                "int-value": "80",
+                "name": "sourceport"
+              }
+            ]
+          },
+          {
+            "classifier-definition-id": "Classifier-IP-Protocol",
+            "name": "icmp",
+            "parameter-value": [
+              {
+                "int-value": "1",
+                "name": "proto"
+              }
+            ]
+          }
+        ],
+        "action-instance": [
+          {
+            "name": "allow1",
+            "action-definition-id": "Action-Allow"
+          }
         ]
+      }
     }
-}
+  }
+}
\ No newline at end of file

diff --git a/csit/variables/gbp/master/tenant1.json b/csit/variables/gbp/master/tenant1.json
index b9eb3456f348adc59dad2b46f35a90ada972e6b5..9f31b79550532671cfc1a4c59b68ede78bb403d6 100644 (file)
--- a/csit/variables/gbp/master/tenant1.json
+++ b/csit/variables/gbp/master/tenant1.json
@@ -1,177 +1,181 @@
 {
-    "policy:tenant": {
-        "contract": [
+  "policy:tenant": {
+    "id": "tenant-red",
+    "name": "GBPPOC",
+    "forwarding-context": {
+      "l2-bridge-domain": [
+        {
+          "id": "bridge-domain1",
+          "parent": "l3-context-vrf-red"
+        }
+      ],
+      "l2-flood-domain": [
+        {
+          "id": "flood-domain-1",
+          "parent": "bridge-domain1"
+        },
+        {
+          "id": "flood-domain1",
+          "parent": "bridge-domain1"
+        }
+      ],
+      "l3-context": [
+        {
+          "id": "l3-context-vrf-red"
+        }
+      ],
+      "subnet": [
+        {
+          "id": "subnet-10.0.35.0/24",
+          "ip-prefix": "10.0.35.1/24",
+          "parent": "flood-domain-1",
+          "virtual-router-ip": "10.0.35.1"
+        },
+        {
+          "id": "subnet-10.0.36.0/24",
+          "ip-prefix": "10.0.36.1/24",
+          "parent": "flood-domain1",
+          "virtual-router-ip": "10.0.36.1"
+        }
+      ]
+    },
+    "policy": {
+      "contract": [
+        {
+          "clause": [
             {
-                "clause": [
-                    {
-                        "name": "allow-http-clause",
-                        "subject-refs": [
-                            "allow-http-subject",
-                            "allow-icmp-subject"
-                        ]
-                    }
-                ],
-                "id": "icmp-http-contract",
-                "subject": [
+              "name": "allow-http-clause",
+              "subject-refs": [
+                "allow-http-subject",
+                "allow-icmp-subject"
+              ]
+            }
+          ],
+          "id": "icmp-http-contract",
+          "subject": [
+            {
+              "name": "allow-http-subject",
+              "rule": [
+                {
+                  "classifier-ref": [
                     {
-                        "name": "allow-http-subject",
-                        "rule": [
-                            {
-                                "classifier-ref": [
-                                    {
-                                        "direction": "in",
-                                        "name": "http-dest",
-                                        "instance-name": "http-dest"
-                                    },
-                                    {
-                                        "direction": "out",
-                                        "name": "http-src",
-                                        "instance-name": "http-src"
-                                    }
-                                ],
-                                "action-ref": [
-                                    {
-                                        "name": "allow1",
-                                        "order": 0
-                                    }
-                                ],
-                                "name": "allow-http-rule"
-                            }
-                        ]
+                      "direction": "in",
+                      "name": "http-dest",
+                      "instance-name": "http-dest"
                     },
                     {
-                        "name": "allow-icmp-subject",
-                        "rule": [
-                            {
-                                "classifier-ref": [
-                                    {
-                                        "name": "icmp",
-                                        "instance-name": "icmp"
-                                    }
-                                ],
-                                "action-ref": [
-                                    {
-                                        "name": "allow1",
-                                        "order": 0
-                                    }
-                                ],
-                                "name": "allow-icmp-rule"
-                            }
-                        ]
+                      "direction": "out",
+                      "name": "http-src",
+                      "instance-name": "http-src"
                     }
-                ]
-            }
-        ],
-        "endpoint-group": [
-            {
-                "consumer-named-selector": [
+                  ],
+                  "action-ref": [
                     {
-                        "contract": [
-                            "icmp-http-contract"
-                        ],
-                        "name": "webservers-clients-icmp-http-contract"
+                      "name": "allow1",
+                      "order": 0
                     }
-                ],
-                "id": "clients",
-                "provider-named-selector": []
+                  ],
+                  "name": "allow-http-rule"
+                }
+              ]
             },
             {
-                "consumer-named-selector": [],
-                "id": "webservers",
-                "provider-named-selector": [
+              "name": "allow-icmp-subject",
+              "rule": [
+                {
+                  "classifier-ref": [
                     {
-                        "contract": [
-                            "icmp-http-contract"
-                        ],
-                        "name": "webservers-clients-icmp-http-contract"
+                      "name": "icmp",
+                      "instance-name": "icmp"
                     }
-                ]
-            }
-        ],
-        "id": "tenant-red",
-        "l2-bridge-domain": [
-            {
-                "id": "bridge-domain1",
-                "parent": "l3-context-vrf-red"
-            }
-        ],
-        "l2-flood-domain": [
-            {
-                "id": "flood-domain-1",
-                "parent": "bridge-domain1"
-            },
-            {
-                "id": "flood-domain1",
-                "parent": "bridge-domain1"
+                  ],
+                  "action-ref": [
+                    {
+                      "name": "allow1",
+                      "order": 0
+                    }
+                  ],
+                  "name": "allow-icmp-rule"
+                }
+              ]
             }
-        ],
-        "l3-context": [
+          ]
+        }
+      ],
+      "endpoint-group": [
+        {
+          "consumer-named-selector": [
             {
-                "id": "l3-context-vrf-red"
+              "contract": [
+                "icmp-http-contract"
+              ],
+              "name": "webservers-clients-icmp-http-contract"
             }
-        ],
-        "name": "GBPPOC",
-        "subject-feature-instances": {
-            "classifier-instance": [
-                {
-                    "classifier-definition-id": "Classifier-L4",
-                    "name": "http-dest",
-                    "parameter-value": [
-                        {
-                            "int-value": "6",
-                            "name": "proto"
-                        },
-                        {
-                            "int-value": "80",
-                            "name": "destport"
-                        }
-                    ]
-                },
-                {
-                    "classifier-definition-id": "Classifier-L4",
-                    "name": "http-src",
-                    "parameter-value": [
-                        {
-                            "int-value": "6",
-                            "name": "proto"
-                        },
-                        {
-                            "int-value": "80",
-                            "name": "sourceport"
-                        }
-                    ]
-                },
-                {
-                    "classifier-definition-id": "Classifier-IP-Protocol",
-                    "name": "icmp",
-                    "parameter-value": [
-                        {
-                            "int-value": "1",
-                            "name": "proto"
-                        }
-                    ]
-                }
-            ],
-            "action-instance": [
-                {
-                    "name": "allow1",
-                    "action-definition-id": "Action-Allow"
-                }
-            ]
+          ],
+          "id": "clients",
+          "provider-named-selector": []
         },
-        "subnet": [
-            {
-                "id": "subnet-10.0.35.0/24",
-                "ip-prefix": "10.0.35.1/24",
-                "parent": "flood-domain-1",
-                "virtual-router-ip": "10.0.35.1"
-            },
+        {
+          "consumer-named-selector": [],
+          "id": "webservers",
+          "provider-named-selector": [
             {
-                "id": "subnet-10.0.36.0/24",
-                "ip-prefix": "10.0.36.1/24",
-                "parent": "flood-domain1",
-                "virtual-router-ip": "10.0.36.1"
+              "contract": [
+                "icmp-http-contract"
+              ],
+              "name": "webservers-clients-icmp-http-contract"
             }
+          ]
+        }
+      ],
+      "subject-feature-instances": {
+        "classifier-instance": [
+          {
+            "classifier-definition-id": "Classifier-L4",
+            "name": "http-dest",
+            "parameter-value": [
+              {
+                "int-value": "6",
+                "name": "proto"
+              },
+              {
+                "int-value": "80",
+                "name": "destport"
+              }
+            ]
+          },
+          {
+            "classifier-definition-id": "Classifier-L4",
+            "name": "http-src",
+            "parameter-value": [
+              {
+                "int-value": "6",
+                "name": "proto"
+              },
+              {
+                "int-value": "80",
+                "name": "sourceport"
+              }
+            ]
+          },
+          {
+            "classifier-definition-id": "Classifier-IP-Protocol",
+            "name": "icmp",
+            "parameter-value": [
+              {
+                "int-value": "1",
+                "name": "proto"
+              }
+            ]
+          }
+        ],
+        "action-instance": [
+          {
+            "name": "allow1",
+            "action-definition-id": "Action-Allow"
+          }
         ]
+      }
     }
-}
+  }
+}
\ No newline at end of file

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