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=b03196c3908d73b231267047849bb1f88a40670b;hb=3df91c638c31f756ed1dfcb47ce635a5c8458b35;hp=5e5fc152597a31d2b8842dd8a0254ddeafce6223;hpb=8c4fa88671c47377c56a0e47fae5518b66defbaa;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 5e5fc152..b03196c3 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
@@ -385,6 +385,7 @@ module GENERIC-RESOURCE-API {
                type string;
             }
          }
+         uses aggregate-routes;
          uses subnets;
          leaf subnet-key-value {
             description "key-value provided to EIPAM when  creating shared subnet";
@@ -881,6 +882,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 +1495,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";
@@ -1491,6 +1514,25 @@ module GENERIC-RESOURCE-API {
          }
       }
    }
+   grouping aggregate-routes {
+      list aggregate-routes {
+         key "route-id";
+         leaf route-id {
+            description "Unique id";
+            type string;
+         }
+         leaf start-address {
+            type inet:ip-address;
+         }
+         leaf cidr-mask {
+            type string;
+         }
+         leaf ip-version {
+            description "Use values 4 or 6.";
+            type string;
+         }
+      }
+   }
    grouping pnf-information {
       container pnf-information {
          leaf pnf-name {
@@ -1843,6 +1885,16 @@ module GENERIC-RESOURCE-API {
          container input-parameters {
             uses param;
          }
+         leaf rebuild {
+            description "Value will indicate what to rebuild";
+            type string;
+         }
+         list configuration-ids {
+            key "configuration-id";
+            leaf configuration-id {
+               type string;
+            }
+         }
       }
    }
    grouping vnr-parameters {
@@ -1992,6 +2044,43 @@ module GENERIC-RESOURCE-API {
       }
    }
 
+   grouping vnf-vnr-rebuild-data {
+      container vnf-vnr-rebuild-data {
+         leaf vnf-id {
+            type string;
+         }
+         leaf vnf-service-instance-id {
+            type string;
+         }
+         list vnrs-data {
+            key "configuration-id";
+            leaf configuration-id {
+               type string;
+            }
+            leaf network-instance-group-id {
+               type string;
+            }
+            leaf network-id {
+               type string;
+            }
+            leaf vnfc-instance-group-function {
+               type string;
+            }
+            leaf network-instance-group-function {
+               type string;
+            }
+            leaf parent-port-role {
+               type string;
+            }
+            leaf upper-tag-id {
+               type uint32;
+            }
+            leaf lower-tag-id {
+               type uint32;
+            }
+         }
+      }
+   }
    grouping allotted-resource-information {
       container allotted-resource-information {
          leaf allotted-resource-id {
@@ -2206,6 +2295,8 @@ module GENERIC-RESOURCE-API {
                enum "disable";
                enum "enable";
                enum "update";
+               enum "reoptimize";
+               enum "rebuild";
             }
          }
          leaf svc-notification-url {
@@ -2260,6 +2351,7 @@ module GENERIC-RESOURCE-API {
                enum "DeletePortMirrorConfigurationInstance";
                enum "ChangePortMirrorConfigurationInstance";
                enum "CreateGenericConfigurationInstance";
+               enum "RebuildGenericConfigurationInstance";
                enum "DeleteGenericConfigurationInstance";
                enum "PreloadVfModuleRequest";
                enum "DeletePreloadVfModuleRequest";
@@ -2268,6 +2360,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 {
@@ -2338,6 +2447,10 @@ module GENERIC-RESOURCE-API {
          description "The AIC cloud region which maps to contrail versions";
          type string;
       }
+      leaf cloud-owner {
+         description "The cloud owner provided by the caller";
+         type string;
+      }
       leaf aic-clli {
          description "Not expected to be used";
          type string;
@@ -2422,6 +2535,7 @@ module GENERIC-RESOURCE-API {
             enum "deactivate";
             enum "create";
             enum "changeassign";
+            enum "reoptimize";
          }
       }
       leaf last-action {
@@ -2472,6 +2586,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 {
@@ -2786,6 +2917,7 @@ module GENERIC-RESOURCE-API {
             type string;
          }
          uses vnr-parameters;
+         uses vnf-vnr-rebuild-data;
       }
    }
    container services {