Fix GENERIC-RESOURCE-API yang model

[sdnc/northbound.git] / generic-resource-api / model / src / main / yang / GENERIC-RESOURCE-API.yang

diff --git a/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang b/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang
index 4340ae4..d82b630 100644 (file)
--- a/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang
+++ b/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang
@@ -806,8 +806,11 @@ module GENERIC-RESOURCE-API {
        uses tunnelxconn-request-input;\r
    }\r
    grouping tunnelxconn-request-input {\r
-       leaf brg-wan-mac-address {\r
-           type string;\r
+\r
+       container tunnelxconn-request-input {\r
+           leaf brg-wan-mac-address {\r
+               type string;\r
+           }\r
        }\r
    }\r
    grouping tunnelxconn-topology {\r
@@ -821,18 +824,24 @@ module GENERIC-RESOURCE-API {
        }\r
    }\r
    grouping tunnelxconn-assignments {\r
-       leaf vni {\r
-           description "The Network Controller will assign a VNI value from the associated vGMUX VNI pool";\r
-           type string;\r
-       }\r
-       leaf vgmux-bearer-ip {\r
-           description "The Network Controller will look up the vgmux bearer ip from the vgmux vf module";\r
-           type inet:ip-address;\r
-       }\r
-       leaf vgmux-lan-up {\r
-           description "The Network Controller will look up the vgmux lan ip from the vgmux vg module";\r
-           type inet:ip-address;\r
-       }\r
+          container tunnelxconn-assignments {\r
+              leaf vni {\r
+                  description "The Network Controller will assign a VNI value from the associated vGMUX VNI pool";\r
+                  type string;\r
+              }\r
+              leaf vgmux-bearer-ip {\r
+                  description "The Network Controller will look up the vgmux bearer ip from the vgmux vf module";\r
+                  type inet:ip-address;\r
+              }\r
+              leaf vgmux-lan-ip {\r
+                  description "The Network Controller will look up the vgmux lan ip from the vgmux vg module";\r
+                  type inet:ip-address;\r
+              }\r
+              leaf vg-ip {\r
+                  description "The Network Controller will assign the VG IP address from local inventory";\r
+                  type inet:ip-address;\r
+              }\r
+          }\r
    }\r
    grouping brg-operation-information {\r
        uses sdnc-request-header;\r
@@ -842,14 +851,16 @@ module GENERIC-RESOURCE-API {
        uses brg-request-input;\r
    }\r
    grouping brg-request-input {\r
-       leaf vgmux-bearer-ip {\r
-           type inet:ip-address;\r
-       }\r
-       leaf vni {\r
-           type string;\r
-       }\r
-       leaf brg-wan-ip-address {\r
-           type inet:ip-address;\r
+       container brg-request-input {\r
+           leaf vgmux-bearer-ip {\r
+               type inet:ip-address;\r
+           }\r
+           leaf vni {\r
+               type string;\r
+           }\r
+           leaf brg-wan-mac-address {\r
+               type string;\r
+           }\r
        }\r
    }\r
    grouping brg-topology {\r
@@ -863,9 +874,11 @@ module GENERIC-RESOURCE-API {
        }\r
    }\r
    grouping brg-assignments {\r
-       leaf vbrg-wan-ip {\r
-           type inet:ip-address;\r
-       }\r
+          container brg-assignments {\r
+              leaf vbrg-wan-ip {\r
+                  type inet:ip-address;\r
+              }\r
+          }\r
    }\r
    grouping allotted-resource-information {\r
       container allotted-resource-information {\r
@@ -1021,6 +1034,12 @@ module GENERIC-RESOURCE-API {
                enum "DeleteContrailRouteInstance";\r
                enum "CreateSecurityZoneInstance";\r
                enum "DeleteSecurityZoneInstance";\r
+               enum "ActivateDCINetworkInstance";\r
+               enum "DeActivateDCINetworkInstance";\r
+               enum "CreateTunnelXConnInstance";\r
+               enum "DeleteTunnelXConnInstance";\r
+               enum "CreateBRGInstance";\r
+               enum "DeleteBRGInstance";\r
             }\r
          }\r
          leaf source {\r
@@ -1683,7 +1702,7 @@ module GENERIC-RESOURCE-API {
            uses allotted-resource-status;\r
        }\r
    }\r
-   container brg-allotted-respources {\r
+   container brg-allotted-resources {\r
        list brg-allotted-resource {\r
            key "allotted-resource-id";\r
            leaf allotted-resource-id {\r