Bug 4724 added containers to tenant

[groupbasedpolicy.git] / demos / gbpsfc-env / demo-gbp1 / rest.py

diff --git a/demos/gbpsfc-env/demo-gbp1/rest.py b/demos/gbpsfc-env/demo-gbp1/rest.py
index 9b5ef3277e9a838dd39c29ad959da8f76f335339..b0188ae1d9233d2ce7b2047de4a16d902e33b5cb 100644 (file)
--- a/demos/gbpsfc-env/demo-gbp1/rest.py
+++ b/demos/gbpsfc-env/demo-gbp1/rest.py
@@ -57,184 +57,186 @@ def post(host, port, uri, data, debug=False):
 
 def get_tenant_data():
     return {
-    "policy:tenant": {
-        "contract": [
-            {
+        "policy:tenant": {
+          "id": "tenant-dobre",
+          "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": [
-                    {
-                        "name": "allow-http-clause", 
-                        "subject-refs": [
-                            "allow-http-subject", 
-                            "allow-icmp-subject"
-                        ]
-                    }
-                ], 
-                "id": "icmp-http-contract", 
+                  {
+                    "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": "allow-http-subject",
+                    "rule": [
                       {
-                        "name": "allow1",
-                        "order": 0
+                        "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-http-rule"
-                            }
-                        ]
-                    }, 
-                    {
-                        "name": "allow-icmp-subject", 
-                        "rule": [
-                            {
-                                "classifier-ref": [
-                                    {
-                                        "name": "icmp",
-                                       "instance-name" : "icmp"
-                                    }
-                                ], 
-                                                    "action-ref": [
+                    ]
+                  },
+                  {
+                    "name": "allow-icmp-subject",
+                    "rule": [
                       {
-                        "name": "allow1",
-                        "order": 0
+                        "classifier-ref": [
+                          {
+                            "name": "icmp",
+                            "instance-name": "icmp"
+                          }
+                        ],
+                        "action-ref": [
+                          {
+                            "name": "allow1",
+                            "order": 0
+                          }
+                        ],
+                        "name": "allow-icmp-rule"
                       }
-                    ],
-
-                                "name": "allow-icmp-rule"
-                            }
-                        ]
-                    }
+                    ]
+                  }
                 ]
-            }
-        ], 
-        "endpoint-group": [
-            {
+              }
+            ],
+            "endpoint-group": [
+              {
                 "consumer-named-selector": [
-                    {
-                        "contract": [
-                            "icmp-http-contract"
-                        ], 
-                        "name": "webservers-clients-icmp-http-contract"
-                    }
-                ], 
-                "id": "clients", 
+                  {
+                    "contract": [
+                      "icmp-http-contract"
+                    ],
+                    "name": "webservers-clients-icmp-http-contract"
+                  }
+                ],
+                "id": "clients",
                 "provider-named-selector": []
-            }, 
-            {
-                "consumer-named-selector": [], 
-                "id": "webservers", 
+              },
+              {
+                "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"
+                    },
                     {
-                        "contract": [
-                            "icmp-http-contract"
-                        ], 
-                        "name": "webservers-clients-icmp-http-contract"
+                      "int-value": "80",
+                      "name": "destport"
                     }
-                ]
-            }
-        ], 
-        "id": "tenant-dobre", 
-        "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"
-            }
-        ], 
-        "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-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": [
                 {
-                    "classifier-definition-id": "Classifier-IP-Protocol",
-                    "name": "icmp", 
-                    "parameter-value": [
-                        {
-                            "int-value": "1", 
-                            "name": "proto"
-                        }
-                    ]
+                  "name": "allow1",
+                  "action-definition-id": "Action-Allow"
                 }
-            ],
-          "action-instance": [
-            {
-              "name": "allow1",
-              "action-definition-id": "Action-Allow"
+              ]
             }
-          ]
-        }, 
-        "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"
-            }
-        ]
+          }
+        }
     }
-            }
 
 # Main definition - constants