Merge "Fix GENERIC-RESOURCE-API yang validation issues"

diff --combined generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang
index e840cb4,f1b8014..4340ae4
--- 1/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang
--- 2/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang
+++ b/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang
@@@ -160,7 -160,7 +160,7 @@@ module GENERIC-RESOURCE-API 
     grouping service-topology {\r
        container service-topology {\r
           uses service-topology-identifier;\r
 -         uses ecomp-model-information;\r
 +         uses onap-model-information;\r
           uses service-assignments;\r
           uses service-parameters;\r
        }\r
@@@ -225,7 -225,7 +225,7 @@@
           leaf network-type {\r
              type string;\r
           }\r
 -         uses ecomp-model-information;\r
 +         uses onap-model-information;\r
        }\r
     }\r
     grouping network-request-input {\r
@@@ -243,7 -243,7 +243,7 @@@
        container network-topology {\r
           uses network-topology-identifier-structure;\r
           uses region-identifier;\r
 -         uses ecomp-model-information;\r
 +         uses onap-model-information;\r
           uses network-assignments;\r
           uses network-parameters;\r
        }\r
@@@ -313,7 -313,7 +313,7 @@@
              description "vnf-model-id in Pats model?in Pats vnf submodule, contained within vnf-instance-topology-identifier grouping (along with vnf-name and vnf-instance-id)";\r
              type string;\r
           }\r
 -         uses ecomp-model-information;\r
 +         uses onap-model-information;\r
        }\r
     }\r
     grouping vnf-request-input {\r
@@@ -342,7 -342,7 +342,7 @@@
        container vnf-topology {\r
           uses vnf-topology-identifier-structure;\r
           uses region-identifier;\r
 -         uses ecomp-model-information;\r
 +         uses onap-model-information;\r
           uses vnf-resource-assignments;\r
           container vnf-parameters-data {\r
              uses param;\r
@@@ -458,7 -458,7 +458,7 @@@
           leaf vf-module-type {\r
              type string;\r
           }\r
 -         uses ecomp-model-information;\r
 +         uses onap-model-information;\r
        }\r
     }\r
     grouping vf-module-request-input {\r
@@@ -480,7 -480,7 +480,7 @@@
        container vf-module-topology {\r
           uses vf-module-topology-identifier;\r
           uses region-identifier;\r
 -         uses ecomp-model-information;\r
 +         uses onap-model-information;\r
           uses vf-module-assignments;\r
           container vf-module-parameters {\r
              uses param;\r
@@@ -691,7 -691,7 +691,7 @@@
     grouping contrail-route-topology {\r
        container contrail-route-topology {\r
           uses allotted-resource-identifiers;\r
 -         uses ecomp-model-information;\r
 +         uses onap-model-information;\r
           uses contrail-route-assignments;\r
           container contrail-route-parameters {\r
              uses param;\r
@@@ -762,7 -762,7 +762,7 @@@
     grouping security-zone-topology {\r
        container security-zone-topology {\r
           uses allotted-resource-identifiers;\r
 -         uses ecomp-model-information;\r
 +         uses onap-model-information;\r
           uses security-zone-assignments;\r
           container security-zone-parameters {\r
              uses param;\r
@@@ -798,75 -798,6 +798,75 @@@
           }\r
        }\r
     }\r
 +   grouping tunnelxconn-operation-information {\r
 +       uses sdnc-request-header;\r
 +       uses request-information;\r
 +       uses service-information;\r
 +       uses allotted-resource-information;\r
 +       uses tunnelxconn-request-input;\r
 +   }\r
 +   grouping tunnelxconn-request-input {\r
 +       leaf brg-wan-mac-address {\r
 +           type string;\r
 +       }\r
 +   }\r
 +   grouping tunnelxconn-topology {\r
 +       container tunnelxconn-topology {\r
 +           uses allotted-resource-identifiers;\r
 +           uses onap-model-information;\r
 +           uses tunnelxconn-assignments;\r
 +           container tunnelxconn-parameters {\r
 +               uses param;\r
 +           }\r
 +       }\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
 +   }\r
 +   grouping brg-operation-information {\r
 +       uses sdnc-request-header;\r
 +       uses request-information;\r
 +       uses service-information;\r
 +       uses allotted-resource-information;\r
 +       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
 +       }\r
 +   }\r
 +   grouping brg-topology {\r
 +       container brg-topology {\r
 +           uses allotted-resource-identifiers;\r
 +           uses onap-model-information;\r
 +           uses brg-assignments;\r
 +           container brg-parameters {\r
 +               uses param;\r
 +           }\r
 +       }\r
 +   }\r
 +   grouping brg-assignments {\r
 +       leaf vbrg-wan-ip {\r
 +           type inet:ip-address;\r
 +       }\r
 +   }\r
     grouping allotted-resource-information {\r
        container allotted-resource-information {\r
           leaf allotted-resource-id {\r
@@@ -880,7 -811,7 +880,7 @@@
              description "Service-instance-id of the parent service to which this allotted resource belongs.";\r
              type string;\r
           }\r
 -         uses ecomp-model-information;\r
 +         uses onap-model-information;\r
        }\r
     }\r
     grouping allotted-resource-identifiers {\r
@@@ -1047,7 -978,7 +1047,7 @@@
              description "used to reference a&ai subscription-service-type. For example, we show as vIPR-ATM in example.";\r
              type string;\r
           }\r
 -         uses ecomp-model-information;\r
 +         uses onap-model-information;\r
           leaf service-instance-id {\r
              type string;\r
           }\r
@@@ -1061,8 -992,8 +1061,8 @@@
           }\r
        }\r
     }\r
 -   grouping ecomp-model-information {\r
 -      container ecomp-model-information {\r
 +   grouping onap-model-information {\r
 +      container onap-model-information {\r
           leaf model-invariant-uuid {\r
              description "identifies the invariant uuid for this service or resource";\r
              type string;\r
@@@ -1213,16 -1144,6 +1213,16 @@@
           uses instance-reference;\r
        }\r
     }\r
 +   grouping tunnelxconn-response-information {\r
 +       container tunnelxconn-response-information {\r
 +           uses instance-reference;\r
 +       }\r
 +   }\r
 +   grouping brg-response-information {\r
 +       container brg-response-information {\r
 +           uses instance-reference;\r
 +       }\r
 +   }\r
     grouping preload-model-information {\r
        list vnf-preload-list {\r
           key "vnf-name vnf-type";\r
@@@ -1308,7 -1229,7 +1308,7 @@@
              }\r
           }\r
           list vnf-networks {\r
-             key "";\r
+             key "network-role";\r
              uses vnf-network;\r
              uses sriov-vlan-filter-list;\r
           }\r
@@@ -1332,7 -1253,7 +1332,7 @@@
              }\r
           }\r
           list vm-networks {\r
-             key "";\r
+             key "network-role";\r
              uses vm-network;\r
           }\r
        }\r
@@@ -1663,46 -1584,6 +1663,46 @@@
           uses allotted-resource-status;\r
        }\r
     }\r
 +   container tunnelxconn-allotted-resources {\r
 +       list tunnelxconn-allotted-resource {\r
 +           key "allotted-resource-id";\r
 +           leaf allotted-resource-id {\r
 +               type string;\r
 +               mandatory true;\r
 +           }\r
 +           container allotted-resource-data {\r
 +               container allotted-resource-operation-information {\r
 +                   uses tunnelxconn-operation-information;\r
 +               }\r
 +               uses tunnelxconn-topology;\r
 +               container tunnelxconn-parameters {\r
 +                   uses param;\r
 +               }\r
 +               uses allotted-resource-oper-status;\r
 +           }\r
 +           uses allotted-resource-status;\r
 +       }\r
 +   }\r
 +   container brg-allotted-respources {\r
 +       list brg-allotted-resource {\r
 +           key "allotted-resource-id";\r
 +           leaf allotted-resource-id {\r
 +               type string;\r
 +               mandatory true;\r
 +           }\r
 +           container allotted-resource-data {\r
 +               container allotted-resource-operation-information {\r
 +                   uses brg-operation-information;\r
 +               }\r
 +               uses brg-topology;\r
 +               container brg-parameters {\r
 +                   uses param;\r
 +               }\r
 +               uses allotted-resource-oper-status;\r
 +           }\r
 +           uses allotted-resource-status;\r
 +       }\r
 +   }\r
     rpc service-topology-operation {\r
        input {\r
           uses service-operation-information;\r
@@@ -1763,26 -1644,6 +1763,26 @@@
           uses service-response-information;\r
        }\r
     }\r
 +   rpc tunnelxconn-topology-operation {\r
 +       input {\r
 +           uses tunnelxconn-operation-information;\r
 +       }\r
 +       output {\r
 +           uses topology-response-common;\r
 +           uses tunnelxconn-response-information;\r
 +           uses service-response-information;\r
 +       }\r
 +   }\r
 +   rpc brg-topology-operation {\r
 +       input {\r
 +           uses brg-operation-information;\r
 +       }\r
 +       output {\r
 +           uses topology-response-common;\r
 +           uses brg-response-information;\r
 +           uses service-response-information;\r
 +       }\r
 +   }\r
     container preload-vnfs {\r
        uses preload-model-information;\r
     }\r
@@@ -1806,5 -1667,4 +1806,5 @@@
           uses vnf-topology-response-body;\r
        }\r
     }\r
 +\r
  } ////closes the module\r