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=2a607cbecb5e41817a599f9bf6df870905619df2;hb=9df83d9b66a8cf4df87bda040845ca8e5c6b7d6f;hp=4340ae40e53c7d5dbf70903df20a3991c598d203;hpb=b723f7258b8d067a5fa7039d8d8645d68b96a39c;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 4340ae40..2a607cbe 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,10 +874,43 @@ 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 connection-attachment-operation-information {
+      uses sdnc-request-header;
+      uses request-information;
+      uses service-information;
+      uses allotted-resource-information;
+      uses connection-attachment-request-input;
+   }
+
+   grouping connection-attachment-request-input {
+      container connection-attachment-request-input {
+         uses param;
+      }
+   }
+
+   grouping connection-attachment-topology {
+      container brg-topology {
+         uses allotted-resource-identifiers;
+         uses onap-model-information;
+         uses connection-attachment-assignments;
+         container connection-attachment-parameters {
+            uses param;
+         }
+      }
    }
+
+   grouping connection-attachment-assignments {
+      container connection-attachment-assignments {
+      }
+   }
+
    grouping allotted-resource-information {
       container allotted-resource-information {
          leaf allotted-resource-id {
@@ -1021,6 +1065,24 @@ module GENERIC-RESOURCE-API {
                enum "DeleteContrailRouteInstance";
                enum "CreateSecurityZoneInstance";
                enum "DeleteSecurityZoneInstance";
+               enum "ActivateDCINetworkInstance";
+               enum "DeActivateDCINetworkInstance";
+               enum "CreateTunnelXConnInstance";
+               enum "DeleteTunnelXConnInstance";
+               enum "CreateBRGInstance";
+               enum "DeleteBRGInstance";
+               enum "CreateSOTNConnectivityInstance";
+               enum "ActivateSOTNConnectivityInstance";
+               enum "DeactivateSOTNConnectivityInstance";
+               enum "DeleteSOTNConnectivityInstance";
+               enum "CreateSOTNAttachmentInstance";
+               enum "ActivateSOTNAttachmentInstance";
+               enum "DeactivateSOTNAttachmentInstance";
+               enum "DeleteSOTNAttachmentInstance";
+               enum "CreateSiteInstance";
+               enum "ActivateSiteInstance";
+               enum "DeactivateSiteInstance";
+               enum "DeleteSiteInstance";
             }
          }
          leaf source {
@@ -1157,6 +1219,24 @@ module GENERIC-RESOURCE-API {
             enum "DeleteContrailRouteInstance";
             enum "CreateSecurityZoneInstance";
             enum "DeleteSecurityZoneInstance";
+            enum "ActivateDCINetworkInstance";
+            enum "DeActivateDCINetworkInstance";
+            enum "CreateTunnelXConnInstance";
+            enum "DeleteTunnelXConnInstance";
+            enum "CreateBRGInstance";
+            enum "DeleteBRGInstance";
+            enum "CreateSOTNConnectivityInstance";
+            enum "ActivateSOTNConnectivityInstance";
+            enum "DeactivateSOTNConnectivityInstance";
+            enum "DeleteSOTNConnectivityInstance";
+            enum "CreateSOTNAttachmentInstance";
+            enum "ActivateSOTNAttachmentInstance";
+            enum "DeactivateSOTNAttachmentInstance";
+            enum "DeleteSOTNAttachmentInstance";
+            enum "CreateSiteInstance";
+            enum "ActivateSiteInstance";
+            enum "DeactivateSiteInstance";
+            enum "DeleteSiteInstance";
          }
       }
       leaf last-svc-request-id {
@@ -1223,6 +1303,11 @@ module GENERIC-RESOURCE-API {
            uses instance-reference;
        }
    }
+   grouping connection-attachment-response-information {
+      container connection-attachment-response-information {
+         uses instance-reference;
+      }
+   }
    grouping preload-model-information {
       list vnf-preload-list {
          key "vnf-name vnf-type";
@@ -1683,7 +1768,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 {
@@ -1703,6 +1788,26 @@ module GENERIC-RESOURCE-API {
            uses allotted-resource-status;
        }
    }
+   container connection-attachment-allotted-resources {
+      list connection-attachment-allotted-resource {
+         key "allotted-resource-id";
+         leaf allotted-resource-id {
+            type string;
+            mandatory true;
+         }
+         container allotted-resource-data {
+            container allotted-resource-operation-information {
+               uses connection-attachment-operation-information;
+            }
+            uses connection-attachment-topology;
+            container connection-attachment-parameters {
+               uses param;
+            }
+            uses allotted-resource-oper-status;
+         }
+         uses allotted-resource-status;
+      }
+   }
    rpc service-topology-operation {
       input {
          uses service-operation-information;
@@ -1807,4 +1912,15 @@ module GENERIC-RESOURCE-API {
       }
    }
 
+   rpc connection-attachment-topology-operation {
+       input {
+           uses connection-attachment-operation-information;
+       }
+       output {
+           uses topology-response-common;
+           uses connection-attachment-response-information;
+           uses service-response-information;
+       }
+   }
+
 } ////closes the module