X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=generic-resource-api%2Fmodel%2Fsrc%2Fmain%2Fyang%2FGENERIC-RESOURCE-API.yang;h=3b751b139b1a3877b64dd12ec67bb308197da968;hb=f9fa722e44042ae612d3a2103f355d6199034978;hp=e840cb4d87b82ee283a7ae25781062b2fad02d69;hpb=eaedb4dbd2affc607a06e297d168e074a40246c9;p=sdnc%2Fnorthbound.git

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 e840cb4d..3b751b13 100644
--- 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;
    }
    grouping tunnelxconn-request-input {
-       leaf brg-wan-mac-address {
-           type string;
+
+       container tunnelxconn-request-input {
+           leaf brg-wan-mac-address {
+               type string;
+           }
        }
    }
    grouping tunnelxconn-topology {
@@ -821,18 +824,24 @@ module GENERIC-RESOURCE-API {
        }
    }
    grouping tunnelxconn-assignments {
-       leaf vni {
-           description "The Network Controller will assign a VNI value from the associated vGMUX VNI pool";
-           type string;
-       }
-       leaf vgmux-bearer-ip {
-           description "The Network Controller will look up the vgmux bearer ip from the vgmux vf module";
-           type inet:ip-address;
-       }
-       leaf vgmux-lan-up {
-           description "The Network Controller will look up the vgmux lan ip from the vgmux vg module";
-           type inet:ip-address;
-       }
+	   container tunnelxconn-assignments {
+	       leaf vni {
+	           description "The Network Controller will assign a VNI value from the associated vGMUX VNI pool";
+	           type string;
+	       }
+	       leaf vgmux-bearer-ip {
+	           description "The Network Controller will look up the vgmux bearer ip from the vgmux vf module";
+	           type inet:ip-address;
+	       }
+	       leaf vgmux-lan-ip {
+	           description "The Network Controller will look up the vgmux lan ip from the vgmux vg module";
+	           type inet:ip-address;
+	       }
+	       leaf vg-ip {
+	           description "The Network Controller will assign the VG IP address from local inventory";
+	           type inet:ip-address;
+	       }
+	   }
    }
    grouping brg-operation-information {
        uses sdnc-request-header;
@@ -842,14 +851,16 @@ module GENERIC-RESOURCE-API {
        uses brg-request-input;
    }
    grouping brg-request-input {
-       leaf vgmux-bearer-ip {
-           type inet:ip-address;
-       }
-       leaf vni {
-           type string;
-       }
-       leaf brg-wan-ip-address {
-           type inet:ip-address;
+       container brg-request-input {
+           leaf vgmux-bearer-ip {
+               type inet:ip-address;
+           }
+           leaf vni {
+               type string;
+           }
+           leaf brg-wan-mac-address {
+               type string;
+           }
        }
    }
    grouping brg-topology {
@@ -863,9 +874,11 @@ module GENERIC-RESOURCE-API {
        }
    }
    grouping brg-assignments {
-       leaf vbrg-wan-ip {
-           type inet:ip-address;
-       }
+	   container brg-assignments {
+	       leaf vbrg-wan-ip {
+	           type inet:ip-address;
+	       }
+	   }
    }
    grouping allotted-resource-information {
       container allotted-resource-information {
@@ -1021,6 +1034,12 @@ module GENERIC-RESOURCE-API {
                enum "DeleteContrailRouteInstance";
                enum "CreateSecurityZoneInstance";
                enum "DeleteSecurityZoneInstance";
+               enum "ActivateDCINetworkInstance";
+               enum "DeActivateDCINetworkInstance";
+               enum "CreateTunnelXConnInstance";
+               enum "DeleteTunnelXConnInstance";
+               enum "CreateBRGInstance";
+               enum "DeleteBRGInstance";
             }
          }
          leaf source {
@@ -1157,6 +1176,12 @@ module GENERIC-RESOURCE-API {
             enum "DeleteContrailRouteInstance";
             enum "CreateSecurityZoneInstance";
             enum "DeleteSecurityZoneInstance";
+            enum "ActivateDCINetworkInstance";
+            enum "DeActivateDCINetworkInstance";
+            enum "CreateTunnelXConnInstance";
+            enum "DeleteTunnelXConnInstance";
+            enum "CreateBRGInstance";
+            enum "DeleteBRGInstance";
          }
       }
       leaf last-svc-request-id {
@@ -1308,7 +1333,7 @@ module GENERIC-RESOURCE-API {
             }
          }
          list vnf-networks {
-            key "";
+            key "network-role";
             uses vnf-network;
             uses sriov-vlan-filter-list;
          }
@@ -1332,7 +1357,7 @@ module GENERIC-RESOURCE-API {
             }
          }
          list vm-networks {
-            key "";
+            key "network-role";
             uses vm-network;
          }
       }
@@ -1683,7 +1708,7 @@ module GENERIC-RESOURCE-API {
            uses allotted-resource-status;
        }
    }
-   container brg-allotted-respources {
+   container brg-allotted-resources {
        list brg-allotted-resource {
            key "allotted-resource-id";
            leaf allotted-resource-id {