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=62d8c7bc2a42ed52c2ad19a2716113f9d34b43c9;hb=96b73dc371d805e658311c1544538bf11de80868;hp=78923516293d7f609dbae6581fa84bac9383d25c;hpb=0e6f956f81b67e2e18c5972561552da55ea9838c;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 78923516..62d8c7bc 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
@@ -4,7 +4,7 @@ module GENERIC-RESOURCE-API {
 
    prefix generic-resource-api;
 
-   import ietf-inet-types { prefix "inet"; revision-date "2010-09-24"; }
+   import ietf-inet-types { prefix "inet"; revision-date "2013-07-15"; }
 
    import ietf-yang-types { prefix yang; }
 
@@ -255,6 +255,9 @@ module GENERIC-RESOURCE-API {
          leaf network-type {
             type string;
          }
+         leaf network-technology {
+             type string;
+         }
          leaf from-preload {
             description "Indicates if source is preload data";
             type boolean;
@@ -313,6 +316,15 @@ module GENERIC-RESOURCE-API {
          leaf eipam-v6-address-plan {
             type string;
          }
+         leaf is-trunked {
+             type boolean;
+         }
+         leaf segmentation-id {
+            type string;
+         }
+         container related-networks {
+            uses related-network;
+         }
       }
    }
    grouping network-assignments {
@@ -373,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";
@@ -386,6 +399,10 @@ module GENERIC-RESOURCE-API {
                   type string;
                   mandatory true;
                }
+               leaf neutron-network-id {
+                  description "Neutron-network-id assigned by PO/RO";
+                  type string;
+               }
                uses vpn-bindings;
                leaf vlan-tag-id {
                   type uint32;
@@ -418,6 +435,7 @@ module GENERIC-RESOURCE-API {
       uses service-information;
       uses vnf-information;
       uses vnf-request-input;
+      uses license-information;
    }
    grouping vnf-information {
       container vnf-information {
@@ -579,8 +597,29 @@ module GENERIC-RESOURCE-API {
                   enum "N";
                }
             }
+            leaf network-start-address {
+               description "start-address of the subnet";
+               type inet:ip-address;
+            }
+            leaf gateway-address {
+               description "subnet gateway address";
+               type inet:ip-address;
+            }
+            leaf cidr-mask {
+               description "cidr mask";
+               type string;
+            }
          }
       }
+      leaf is-trunked {
+          type boolean;
+       }
+       leaf segmentation-id {
+          type string;
+       }
+       container related-networks {
+          uses related-network;
+       }
    }
    grouping vnf-level-oper-status {
       container vnf-level-oper-status {
@@ -675,6 +714,7 @@ module GENERIC-RESOURCE-API {
          type string;
          mandatory true;
       }
+      uses onap-model-information;
       leaf nfc-naming-code {
          description "used in vm naming(draft 29: changed from nfc-code)";
          type string;
@@ -712,14 +752,13 @@ module GENERIC-RESOURCE-API {
       list vnfc-network-data {
          key "vnfc-network-role";
          leaf vnfc-network-role {
-            description "e.g. dummy net - parent port network role ";
             type string;
             mandatory true;
          }
          leaf vnfc-type {
-            description "Vm-type e.g. FW,";
             type string;
          }
+         uses connection-point;
          container vnfc-ports {
             list vnfc-port {
                key "vnfc-port-id";
@@ -869,6 +908,15 @@ module GENERIC-RESOURCE-API {
             }
          }
       }
+      leaf is-trunked {
+         type boolean;
+      }
+      leaf segmentation-id {
+         type string;
+      }
+      container related-networks {
+         uses related-network;
+      }
    }
    grouping vf-module-level-oper-status {
       container vf-module-level-oper-status {
@@ -1157,6 +1205,9 @@ module GENERIC-RESOURCE-API {
          leaf lower-tag-id {
             type uint32;
          }
+         leaf is-private {
+            type boolean;
+         }
       }
    }
    grouping vlan-vnfc-instance-groups {
@@ -1245,6 +1296,20 @@ module GENERIC-RESOURCE-API {
             description "network-collection-customization-uuid stored in Network IsntanceGroup.customization-uuid in A&AI";
             type string;
          }
+         container networks {
+            list network {
+               key "network-id";
+               leaf network-id {
+                  description "Index into network-topology-identifier structure";
+                  type string;
+                  mandatory true;
+               }
+               leaf neutron-network-id {
+                  description "Neutron-network-id assigned by PO/RO";
+                  type string;
+               }
+            }
+         }
          container vnf-floating-ip {
             uses ip-addresses;
          }
@@ -1285,6 +1350,10 @@ module GENERIC-RESOURCE-API {
             type string;
             mandatory true;
          }
+         leaf neutron-network-id {
+            description "Neutron network id assigned by PO/RP";
+            type string;
+         }
          leaf network-name {
             description "Subinterface network name";
             type uint32;
@@ -1381,6 +1450,111 @@ module GENERIC-RESOURCE-API {
          }
       }
    }
+   grouping license-information {
+      container license-information {
+         list entitlement-pool-list {
+            key "entitlement-pool-uuid action";
+            leaf entitlement-pool-uuid {
+               type string;
+               mandatory true;
+            }
+            leaf action {
+               type string;
+               mandatory true;
+            }
+            leaf entitlement-pool-invariant-uuid {
+               type string;
+            }
+            leaf entitlement-uuid {
+               description "assigned by ALTS";
+               type string;
+            }
+         }
+         list license-key-group-list {
+            key "license-key-group-uuid action";
+            leaf license-key-group-uuid {
+               type string;
+               mandatory true;
+            }
+            leaf action {
+               type string;
+               mandatory true;
+            }
+            leaf license-key-group-invariant-uuid {
+               type string;
+            }
+            leaf license-key {
+               description "assigned by ALTS";
+               type string;
+            }
+            leaf license-uuid {
+               description "assigned by ALTS";
+               type string;
+            }
+         }
+      }
+   }
+   grouping related-network {
+      list related-network {
+         key "network-id";
+         leaf network-id {
+            description "Key to l3-network object";
+            type string;
+         }
+         leaf network-role {
+            type string;
+         }
+         uses vlan-tags;
+      }
+   }
+   grouping connection-point {
+      container connection-point {
+         leaf connection-point-id {
+            description "Key to CP object in A&AI";
+            type string;
+         }
+         leaf port-id {
+            description "port-index when multiple CPs connect to same network. Default zero (0)";
+            type string;
+         }
+         list vlan-data {
+            key "vlan-uuid";
+            leaf vlan-uuid {
+               description "Key to vlan-tag uuid object in A&AI Generated by vlan mS";
+               type string;
+            }
+            leaf vlan-tag-id {
+               type string;
+            }
+            leaf vlan-tag-description {
+               type string;
+            }
+            leaf vlan-role {
+               description "Inner/Outer roles";
+               type string;
+            }
+         }
+      }
+   }
+   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 {
@@ -1730,9 +1904,23 @@ module GENERIC-RESOURCE-API {
          leaf vnf-id {
             type string;
          }
+         leaf vf-module-id {
+            description "This is mandatory in case of rebuild";
+            type string;
+         }
          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 {
@@ -1740,6 +1928,10 @@ module GENERIC-RESOURCE-API {
          leaf vnf-id {
             type string;
          }
+         leaf vf-module-id {
+            description "This is mandatory in case of rebuild";
+            type string;
+         }
          leaf vnf-service-instance-id {
             type string;
          }
@@ -1867,7 +2059,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;
@@ -1882,6 +2074,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 {
@@ -2096,6 +2325,8 @@ module GENERIC-RESOURCE-API {
                enum "disable";
                enum "enable";
                enum "update";
+               enum "reoptimize";
+               enum "rebuild";
             }
          }
          leaf svc-notification-url {
@@ -2115,6 +2346,7 @@ module GENERIC-RESOURCE-API {
             type enumeration {
                enum "CreateNetworkInstance";
                enum "ActivateNetworkInstance";
+               enum "DeActivateNetworkInstance";
                enum "CreateServiceInstance";
                enum "DeleteServiceInstance";
                enum "DeleteNetworkInstance";
@@ -2150,6 +2382,7 @@ module GENERIC-RESOURCE-API {
                enum "DeletePortMirrorConfigurationInstance";
                enum "ChangePortMirrorConfigurationInstance";
                enum "CreateGenericConfigurationInstance";
+               enum "RebuildGenericConfigurationInstance";
                enum "DeleteGenericConfigurationInstance";
                enum "PreloadVfModuleRequest";
                enum "DeletePreloadVfModuleRequest";
@@ -2158,6 +2391,28 @@ module GENERIC-RESOURCE-API {
                enum "CreateForwardingPathInstance";
                enum "DeleteForwardingPathInstance";
                enum "UpdateForwardingPathInstance";
+               enum "CreateSDWANDeviceInstance";
+               enum "ActivateSDWANDeviceInstance";
+               enum "DeactivateSDWANDeviceInstance";
+               enum "DeleteSDWANDeviceInstance";
+               enum "CreateSDWANPortInstance";
+               enum "ActivateSDWANPortInstance";
+               enum "DeactivateSDWANPortInstance";
+               enum "DeleteSDWANPortInstance";
+               enum "ReoptimizeSOTNInstance";
+               enum "CreateSDWANLanPortInstance";
+               enum "ActivateSDWANLanPortInstance";
+               enum "DeactivateSDWANLanPortInstance";
+               enum "DeleteSDWANLanPortInstance";
+               enum "CreateSDWANVpnInstance";
+               enum "ActivateSDWANVpnInstance";
+               enum "DeactivateSDWANVpnInstance";
+               enum "DeleteSDWANVpnInstance";
+               enum "CreateSDWANSiteInstance";
+               enum "ActivateSDWANSiteInstance";
+               enum "DeactivateSDWANSiteInstance";
+               enum "DeleteSDWANSiteInstance";
+               enum "SdwanBandwidthChange";
             }
          }
          leaf source {
@@ -2228,6 +2483,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;
@@ -2312,6 +2571,7 @@ module GENERIC-RESOURCE-API {
             enum "deactivate";
             enum "create";
             enum "changeassign";
+            enum "reoptimize";
          }
       }
       leaf last-action {
@@ -2319,6 +2579,7 @@ module GENERIC-RESOURCE-API {
          type enumeration {
             enum "CreateNetworkInstance";
             enum "ActivateNetworkInstance";
+            enum "DeActivateNetworkInstance";
             enum "CreateServiceInstance";
             enum "DeleteServiceInstance";
             enum "DeleteNetworkInstance";
@@ -2362,6 +2623,28 @@ module GENERIC-RESOURCE-API {
             enum "CreateForwardingPathInstance";
             enum "DeleteForwardingPathInstance";
             enum "UpdateForwardingPathInstance";
+            enum "CreateSDWANDeviceInstance";
+            enum "ActivateSDWANDeviceInstance";
+            enum "DeactivateSDWANDeviceInstance";
+            enum "DeleteSDWANDeviceInstance";
+            enum "CreateSDWANPortInstance";
+            enum "ActivateSDWANPortInstance";
+            enum "DeactivateSDWANPortInstance";
+            enum "DeleteSDWANPortInstance";
+            enum "ReoptimizeSOTNInstance";
+            enum "CreateSDWANLanPortInstance";
+            enum "ActivateSDWANLanPortInstance";
+            enum "DeactivateSDWANLanPortInstance";
+            enum "DeleteSDWANLanPortInstance";
+            enum "CreateSDWANVpnInstance";
+            enum "ActivateSDWANVpnInstance";
+            enum "DeactivateSDWANVpnInstance";
+            enum "DeleteSDWANVpnInstance";
+            enum "CreateSDWANSiteInstance";
+            enum "ActivateSDWANSiteInstance";
+            enum "DeactivateSDWANSiteInstance";
+            enum "DeleteSDWANSiteInstance";
+            enum "SdwanBandwidthChange";
          }
       }
       leaf last-svc-request-id {
@@ -2676,6 +2959,7 @@ module GENERIC-RESOURCE-API {
             type string;
          }
          uses vnr-parameters;
+         uses vnf-vnr-rebuild-data;
       }
    }
    container services {