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=233fbaf846fa4a40855113c6c3114222832aaf46;hpb=c3342a09a1bec20195a9617ad5b31f5bd9ac7e00;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 233fbaf8..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
@@ -160,7 +160,7 @@ module GENERIC-RESOURCE-API {
    grouping service-topology {
       container service-topology {
          uses service-topology-identifier;
-         uses ecomp-model-information;
+         uses onap-model-information;
          uses service-assignments;
          uses service-parameters;
       }
@@ -225,7 +225,7 @@ module GENERIC-RESOURCE-API {
          leaf network-type {
             type string;
          }
-         uses ecomp-model-information;
+         uses onap-model-information;
       }
    }
    grouping network-request-input {
@@ -243,7 +243,7 @@ module GENERIC-RESOURCE-API {
       container network-topology {
          uses network-topology-identifier-structure;
          uses region-identifier;
-         uses ecomp-model-information;
+         uses onap-model-information;
          uses network-assignments;
          uses network-parameters;
       }
@@ -313,7 +313,7 @@ module GENERIC-RESOURCE-API {
             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)";
             type string;
          }
-         uses ecomp-model-information;
+         uses onap-model-information;
       }
    }
    grouping vnf-request-input {
@@ -342,7 +342,7 @@ module GENERIC-RESOURCE-API {
       container vnf-topology {
          uses vnf-topology-identifier-structure;
          uses region-identifier;
-         uses ecomp-model-information;
+         uses onap-model-information;
          uses vnf-resource-assignments;
          container vnf-parameters-data {
             uses param;
@@ -458,7 +458,7 @@ module GENERIC-RESOURCE-API {
          leaf vf-module-type {
             type string;
          }
-         uses ecomp-model-information;
+         uses onap-model-information;
       }
    }
    grouping vf-module-request-input {
@@ -480,7 +480,7 @@ module GENERIC-RESOURCE-API {
       container vf-module-topology {
          uses vf-module-topology-identifier;
          uses region-identifier;
-         uses ecomp-model-information;
+         uses onap-model-information;
          uses vf-module-assignments;
          container vf-module-parameters {
             uses param;
@@ -691,7 +691,7 @@ module GENERIC-RESOURCE-API {
    grouping contrail-route-topology {
       container contrail-route-topology {
          uses allotted-resource-identifiers;
-         uses ecomp-model-information;
+         uses onap-model-information;
          uses contrail-route-assignments;
          container contrail-route-parameters {
             uses param;
@@ -762,7 +762,7 @@ module GENERIC-RESOURCE-API {
    grouping security-zone-topology {
       container security-zone-topology {
          uses allotted-resource-identifiers;
-         uses ecomp-model-information;
+         uses onap-model-information;
          uses security-zone-assignments;
          container security-zone-parameters {
             uses param;
@@ -798,6 +798,119 @@ module GENERIC-RESOURCE-API {
          }
       }
    }
+   grouping tunnelxconn-operation-information {
+       uses sdnc-request-header;
+       uses request-information;
+       uses service-information;
+       uses allotted-resource-information;
+       uses tunnelxconn-request-input;
+   }
+   grouping tunnelxconn-request-input {
+
+       container tunnelxconn-request-input {
+           leaf brg-wan-mac-address {
+               type string;
+           }
+       }
+   }
+   grouping tunnelxconn-topology {
+       container tunnelxconn-topology {
+           uses allotted-resource-identifiers;
+           uses onap-model-information;
+           uses tunnelxconn-assignments;
+           container tunnelxconn-parameters {
+               uses param;
+           }
+       }
+   }
+   grouping tunnelxconn-assignments {
+	   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;
+       uses request-information;
+       uses service-information;
+       uses allotted-resource-information;
+       uses brg-request-input;
+   }
+   grouping brg-request-input {
+       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 {
+       container brg-topology {
+           uses allotted-resource-identifiers;
+           uses onap-model-information;
+           uses brg-assignments;
+           container brg-parameters {
+               uses param;
+           }
+       }
+   }
+   grouping brg-assignments {
+	   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 {
@@ -811,7 +924,7 @@ module GENERIC-RESOURCE-API {
             description "Service-instance-id of the parent service to which this allotted resource belongs.";
             type string;
          }
-         uses ecomp-model-information;
+         uses onap-model-information;
       }
    }
    grouping allotted-resource-identifiers {
@@ -952,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 {
@@ -978,7 +1109,7 @@ module GENERIC-RESOURCE-API {
             description "used to reference a&ai subscription-service-type. For example, we show as vIPR-ATM in example.";
             type string;
          }
-         uses ecomp-model-information;
+         uses onap-model-information;
          leaf service-instance-id {
             type string;
          }
@@ -992,8 +1123,8 @@ module GENERIC-RESOURCE-API {
          }
       }
    }
-   grouping ecomp-model-information {
-      container ecomp-model-information {
+   grouping onap-model-information {
+      container onap-model-information {
          leaf model-invariant-uuid {
             description "identifies the invariant uuid for this service or resource";
             type string;
@@ -1088,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 {
@@ -1144,6 +1293,21 @@ module GENERIC-RESOURCE-API {
          uses instance-reference;
       }
    }
+   grouping tunnelxconn-response-information {
+       container tunnelxconn-response-information {
+           uses instance-reference;
+       }
+   }
+   grouping brg-response-information {
+       container brg-response-information {
+           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";
@@ -1229,7 +1393,7 @@ module GENERIC-RESOURCE-API {
             }
          }
          list vnf-networks {
-            key "";
+            key "network-role";
             uses vnf-network;
             uses sriov-vlan-filter-list;
          }
@@ -1253,7 +1417,7 @@ module GENERIC-RESOURCE-API {
             }
          }
          list vm-networks {
-            key "";
+            key "network-role";
             uses vm-network;
          }
       }
@@ -1584,6 +1748,66 @@ module GENERIC-RESOURCE-API {
          uses allotted-resource-status;
       }
    }
+   container tunnelxconn-allotted-resources {
+       list tunnelxconn-allotted-resource {
+           key "allotted-resource-id";
+           leaf allotted-resource-id {
+               type string;
+               mandatory true;
+           }
+           container allotted-resource-data {
+               container allotted-resource-operation-information {
+                   uses tunnelxconn-operation-information;
+               }
+               uses tunnelxconn-topology;
+               container tunnelxconn-parameters {
+                   uses param;
+               }
+               uses allotted-resource-oper-status;
+           }
+           uses allotted-resource-status;
+       }
+   }
+   container brg-allotted-resources {
+       list brg-allotted-resource {
+           key "allotted-resource-id";
+           leaf allotted-resource-id {
+               type string;
+               mandatory true;
+           }
+           container allotted-resource-data {
+               container allotted-resource-operation-information {
+                   uses brg-operation-information;
+               }
+               uses brg-topology;
+               container brg-parameters {
+                   uses param;
+               }
+               uses allotted-resource-oper-status;
+           }
+           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;
@@ -1644,6 +1868,26 @@ module GENERIC-RESOURCE-API {
          uses service-response-information;
       }
    }
+   rpc tunnelxconn-topology-operation {
+       input {
+           uses tunnelxconn-operation-information;
+       }
+       output {
+           uses topology-response-common;
+           uses tunnelxconn-response-information;
+           uses service-response-information;
+       }
+   }
+   rpc brg-topology-operation {
+       input {
+           uses brg-operation-information;
+       }
+       output {
+           uses topology-response-common;
+           uses brg-response-information;
+           uses service-response-information;
+       }
+   }
    container preload-vnfs {
       uses preload-model-information;
    }
@@ -1667,4 +1911,16 @@ module GENERIC-RESOURCE-API {
          uses vnf-topology-response-body;
       }
    }
+
+   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