Add connection point and related to GR-API

[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 7892351..7a0b52b 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
@@ -255,6 +255,9 @@ module GENERIC-RESOURCE-API {
          leaf network-type {\r
             type string;\r
          }\r
+         leaf network-technology {\r
+             type string;\r
+         }\r
          leaf from-preload {\r
             description "Indicates if source is preload data";\r
             type boolean;\r
@@ -313,6 +316,15 @@ module GENERIC-RESOURCE-API {
          leaf eipam-v6-address-plan {\r
             type string;\r
          }\r
+         leaf is-trunked {\r
+             type boolean;\r
+         }\r
+         leaf segmentation-id {\r
+            type string;\r
+         }\r
+         container related-networks {\r
+            uses related-network;\r
+         }\r
       }\r
    }\r
    grouping network-assignments {\r
@@ -418,6 +430,7 @@ module GENERIC-RESOURCE-API {
       uses service-information;\r
       uses vnf-information;\r
       uses vnf-request-input;\r
+      uses license-information;\r
    }\r
    grouping vnf-information {\r
       container vnf-information {\r
@@ -579,8 +592,29 @@ module GENERIC-RESOURCE-API {
                   enum "N";\r
                }\r
             }\r
+            leaf network-start-address {\r
+               description "start-address of the subnet";\r
+               type inet:ip-address;\r
+            }\r
+            leaf gateway-address {\r
+               description "subnet gateway address";\r
+               type inet:ip-address;\r
+            }\r
+            leaf cidr-mask {\r
+               description "cidr mask";\r
+               type string;\r
+            }\r
          }\r
       }\r
+      leaf is-trunked {\r
+          type boolean;\r
+       }\r
+       leaf segmentation-id {\r
+          type string;\r
+       }\r
+       container related-networks {\r
+          uses related-network;\r
+       }\r
    }\r
    grouping vnf-level-oper-status {\r
       container vnf-level-oper-status {\r
@@ -675,6 +709,7 @@ module GENERIC-RESOURCE-API {
          type string;\r
          mandatory true;\r
       }\r
+      uses onap-model-information;\r
       leaf nfc-naming-code {\r
          description "used in vm naming(draft 29: changed from nfc-code)";\r
          type string;\r
@@ -712,14 +747,13 @@ module GENERIC-RESOURCE-API {
       list vnfc-network-data {\r
          key "vnfc-network-role";\r
          leaf vnfc-network-role {\r
-            description "e.g. dummy net - parent port network role ";\r
             type string;\r
             mandatory true;\r
          }\r
          leaf vnfc-type {\r
-            description "Vm-type e.g. FW,";\r
             type string;\r
          }\r
+         uses connection-point;\r
          container vnfc-ports {\r
             list vnfc-port {\r
                key "vnfc-port-id";\r
@@ -847,27 +881,14 @@ module GENERIC-RESOURCE-API {
             ordered-by user;\r
          }\r
       }\r
-      container sriov-parameters {\r
-         container heat-vlan-filters {\r
-            leaf-list heat-vlan-filter {\r
-               type string;\r
-               ordered-by user;\r
-            }\r
-         }\r
-         container application-tags {\r
-            container c-tags {\r
-               leaf-list c-tag {\r
-                  type string;\r
-                  ordered-by user;\r
-               }\r
-            }\r
-            container s-tags {\r
-               leaf-list s-tag {\r
-                  type string;\r
-                  ordered-by user;\r
-               }\r
-            }\r
-         }\r
+      leaf is-trunked {\r
+         type boolean;\r
+      }\r
+      leaf segmentation-id {\r
+         type string;\r
+      }\r
+      container related-networks {\r
+         uses related-network;\r
       }\r
    }\r
    grouping vf-module-level-oper-status {\r
@@ -1157,6 +1178,9 @@ module GENERIC-RESOURCE-API {
          leaf lower-tag-id {\r
             type uint32;\r
          }\r
+         leaf is-private {\r
+            type boolean;\r
+         }\r
       }\r
    }\r
    grouping vlan-vnfc-instance-groups {\r
@@ -1381,6 +1405,92 @@ module GENERIC-RESOURCE-API {
          }\r
       }\r
    }\r
+   grouping license-information {\r
+      container license-information {\r
+         list entitlement-pool-list {\r
+            key "entitlement-pool-uuid action";\r
+            leaf entitlement-pool-uuid {\r
+               type string;\r
+               mandatory true;\r
+            }\r
+            leaf action {\r
+               type string;\r
+               mandatory true;\r
+            }\r
+            leaf entitlement-pool-invariant-uuid {\r
+               type string;\r
+            }\r
+            leaf entitlement-uuid {\r
+               description "assigned by ALTS";\r
+               type string;\r
+            }\r
+         }\r
+         list license-key-group-list {\r
+            key "license-key-group-uuid action";\r
+            leaf license-key-group-uuid {\r
+               type string;\r
+               mandatory true;\r
+            }\r
+            leaf action {\r
+               type string;\r
+               mandatory true;\r
+            }\r
+            leaf license-key-group-invariant-uuid {\r
+               type string;\r
+            }\r
+            leaf license-key {\r
+               description "assigned by ALTS";\r
+               type string;\r
+            }\r
+            leaf license-uuid {\r
+               description "assigned by ALTS";\r
+               type string;\r
+            }\r
+         }\r
+      }\r
+   }\r
+   grouping related-network {\r
+      list related-network {\r
+         key "network-id";\r
+         leaf network-id {\r
+            description "Key to l3-network object";\r
+            type string;\r
+         }\r
+         leaf network-role {\r
+            type string;\r
+         }\r
+         uses vlan-tags;\r
+      }\r
+   }\r
+   grouping connection-point {\r
+      container connection-point {\r
+         leaf connection-point-id {\r
+            description "Key to CP object in A&AI";\r
+            type string;\r
+         }\r
+         leaf port-id {\r
+            description "port-index when multiple CPs connect to same network. Default zero (0)";\r
+            type string;\r
+         }\r
+         list vlan-tags {\r
+            key "vlan-uuid";\r
+            leaf vlan-uuid {\r
+               description "Key to vlan-tag uuid object in A&AI Generated by vlan mS";\r
+               type string;\r
+            }\r
+            leaf vlan-tag-id {\r
+               type string;\r
+            }\r
+            leaf vlan-tag-description {\r
+               type string;\r
+            }\r
+            leaf vlan-role {\r
+               description "Inner/Outer roles";\r
+               type string;\r
+            }\r
+         }\r
+      }\r
+   }\r
    grouping pnf-information {\r
       container pnf-information {\r
          leaf pnf-name {\r