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=2574dcac68024aa8c54748fb050a74bad306706f;hb=f62dc263b5bdb2791566bb741e7a71e7b844fb7a;hp=7a0b52bb060785d71cc5b586959add3933050629;hpb=7bfcacb00d386d2a9bb68532f26f61b098d4e844;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 7a0b52bb..2574dcac 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
@@ -881,6 +881,28 @@ module GENERIC-RESOURCE-API {
             ordered-by user;
          }
       }
+      container sriov-parameters {
+         container heat-vlan-filters {
+            leaf-list heat-vlan-filter {
+               type string;
+               ordered-by user;
+            }
+         }
+         container application-tags {
+            container c-tags {
+               leaf-list c-tag {
+                  type string;
+                  ordered-by user;
+               }
+            }
+            container s-tags {
+               leaf-list s-tag {
+                  type string;
+                  ordered-by user;
+               }
+            }
+         }
+      }
       leaf is-trunked {
          type boolean;
       }
@@ -1472,7 +1494,7 @@ module GENERIC-RESOURCE-API {
             description "port-index when multiple CPs connect to same network. Default zero (0)";
             type string;
          }
-         list vlan-tags {
+         list vlan-data {
             key "vlan-uuid";
             leaf vlan-uuid {
                description "Key to vlan-tag uuid object in A&AI Generated by vlan mS";
@@ -1977,7 +1999,7 @@ module GENERIC-RESOURCE-API {
    }
 
    grouping connection-attachment-topology {
-      container brg-topology {
+      container connection-attachment-topology {
          uses allotted-resource-identifiers;
          uses onap-model-information;
          uses connection-attachment-assignments;
@@ -2206,6 +2228,7 @@ module GENERIC-RESOURCE-API {
                enum "disable";
                enum "enable";
                enum "update";
+               enum "reoptimize";
             }
          }
          leaf svc-notification-url {
@@ -2268,6 +2291,23 @@ module GENERIC-RESOURCE-API {
                enum "CreateForwardingPathInstance";
                enum "DeleteForwardingPathInstance";
                enum "UpdateForwardingPathInstance";
+               enum "CreateSDWANConnectivityInstance";
+               enum "ActivateSDWANConnectivityInstance";
+               enum "DeactivateSDWANConnectivityInstance";
+               enum "DeleteSDWANConnectivityInstance";
+               enum "CreateSDWANDeviceInstance";
+               enum "ActivateSDWANDeviceInstance";
+               enum "DeactivateSDWANDeviceInstance";
+               enum "DeleteSDWANDeviceInstance";
+               enum "CreateSDWANPortInstance";
+               enum "ActivateSDWANPortInstance";
+               enum "DeactivateSDWANPortInstance";
+               enum "DeleteSDWANPortInstance";
+               enum "CreateSDWANAttachmentInstance";
+               enum "ActivateSDWANAttachmentInstance";
+               enum "DeactivateSDWANAttachmentInstance";
+               enum "DeleteSDWANAttachmentInstance";
+               enum "ReoptimizeSOTNInstance";
             }
          }
          leaf source {
@@ -2422,6 +2462,7 @@ module GENERIC-RESOURCE-API {
             enum "deactivate";
             enum "create";
             enum "changeassign";
+            enum "reoptimize";
          }
       }
       leaf last-action {
@@ -2472,6 +2513,23 @@ module GENERIC-RESOURCE-API {
             enum "CreateForwardingPathInstance";
             enum "DeleteForwardingPathInstance";
             enum "UpdateForwardingPathInstance";
+            enum "CreateSDWANConnectivityInstance";
+            enum "ActivateSDWANConnectivityInstance";
+            enum "DeactivateSDWANConnectivityInstance";
+            enum "DeleteSDWANConnectivityInstance";
+            enum "CreateSDWANDeviceInstance";
+            enum "ActivateSDWANDeviceInstance";
+            enum "DeactivateSDWANDeviceInstance";
+            enum "DeleteSDWANDeviceInstance";
+            enum "CreateSDWANPortInstance";
+            enum "ActivateSDWANPortInstance";
+            enum "DeactivateSDWANPortInstance";
+            enum "DeleteSDWANPortInstance";
+            enum "CreateSDWANAttachmentInstance";
+            enum "ActivateSDWANAttachmentInstance";
+            enum "DeactivateSDWANAttachmentInstance";
+            enum "DeleteSDWANAttachmentInstance";
+            enum "ReoptimizeSOTNInstance";
          }
       }
       leaf last-svc-request-id {