Add the request-action types

[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 2f45ae2..2a607cb 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-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
+          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,10 +874,43 @@ 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
+\r
+   grouping connection-attachment-operation-information {\r
+      uses sdnc-request-header;\r
+      uses request-information;\r
+      uses service-information;\r
+      uses allotted-resource-information;\r
+      uses connection-attachment-request-input;\r
+   }\r
+\r
+   grouping connection-attachment-request-input {\r
+      container connection-attachment-request-input {\r
+         uses param;\r
+      }\r
+   }\r
+\r
+   grouping connection-attachment-topology {\r
+      container brg-topology {\r
+         uses allotted-resource-identifiers;\r
+         uses onap-model-information;\r
+         uses connection-attachment-assignments;\r
+         container connection-attachment-parameters {\r
+            uses param;\r
+         }\r
+      }\r
    }\r
+\r
+   grouping connection-attachment-assignments {\r
+      container connection-attachment-assignments {\r
+      }\r
+   }\r
+\r
    grouping allotted-resource-information {\r
       container allotted-resource-information {\r
          leaf allotted-resource-id {\r
@@ -1023,6 +1067,22 @@ module GENERIC-RESOURCE-API {
                enum "DeleteSecurityZoneInstance";\r
                enum "ActivateDCINetworkInstance";\r
                enum "DeActivateDCINetworkInstance";\r
+               enum "CreateTunnelXConnInstance";\r
+               enum "DeleteTunnelXConnInstance";\r
+               enum "CreateBRGInstance";\r
+               enum "DeleteBRGInstance";\r
+               enum "CreateSOTNConnectivityInstance";\r
+               enum "ActivateSOTNConnectivityInstance";\r
+               enum "DeactivateSOTNConnectivityInstance";\r
+               enum "DeleteSOTNConnectivityInstance";\r
+               enum "CreateSOTNAttachmentInstance";\r
+               enum "ActivateSOTNAttachmentInstance";\r
+               enum "DeactivateSOTNAttachmentInstance";\r
+               enum "DeleteSOTNAttachmentInstance";\r
+               enum "CreateSiteInstance";\r
+               enum "ActivateSiteInstance";\r
+               enum "DeactivateSiteInstance";\r
+               enum "DeleteSiteInstance";\r
             }\r
          }\r
          leaf source {\r
@@ -1159,6 +1219,24 @@ 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
+            enum "CreateSOTNConnectivityInstance";\r
+            enum "ActivateSOTNConnectivityInstance";\r
+            enum "DeactivateSOTNConnectivityInstance";\r
+            enum "DeleteSOTNConnectivityInstance";\r
+            enum "CreateSOTNAttachmentInstance";\r
+            enum "ActivateSOTNAttachmentInstance";\r
+            enum "DeactivateSOTNAttachmentInstance";\r
+            enum "DeleteSOTNAttachmentInstance";\r
+            enum "CreateSiteInstance";\r
+            enum "ActivateSiteInstance";\r
+            enum "DeactivateSiteInstance";\r
+            enum "DeleteSiteInstance";\r
          }\r
       }\r
       leaf last-svc-request-id {\r
@@ -1225,6 +1303,11 @@ module GENERIC-RESOURCE-API {
            uses instance-reference;\r
        }\r
    }\r
+   grouping connection-attachment-response-information {\r
+      container connection-attachment-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
@@ -1685,7 +1768,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
@@ -1705,6 +1788,26 @@ module GENERIC-RESOURCE-API {
            uses allotted-resource-status;\r
        }\r
    }\r
+   container connection-attachment-allotted-resources {\r
+      list connection-attachment-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 connection-attachment-operation-information;\r
+            }\r
+            uses connection-attachment-topology;\r
+            container connection-attachment-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
@@ -1809,4 +1912,15 @@ module GENERIC-RESOURCE-API {
       }\r
    }\r
 \r
+   rpc connection-attachment-topology-operation {\r
+       input {\r
+           uses connection-attachment-operation-information;\r
+       }\r
+       output {\r
+           uses topology-response-common;\r
+           uses connection-attachment-response-information;\r
+           uses service-response-information;\r
+       }\r
+   }\r
+\r
 } ////closes the module\r