diff options
| -rw-r--r-- | sparky/appconfig/aai.properties | 2 | ||||
| -rw-r--r-- | sparky/appconfig/elasticsearch.properties | 2 | ||||
| -rw-r--r-- | sparky/appconfig/model/aai_oxm_v11.xml | 1007 |
3 files changed, 790 insertions, 221 deletions
diff --git a/sparky/appconfig/aai.properties b/sparky/appconfig/aai.properties index 2e361d1..36a6b90 100644 --- a/sparky/appconfig/aai.properties +++ b/sparky/appconfig/aai.properties @@ -11,7 +11,7 @@ aai.rest.port=8443 ############################## REST ##############################
# OXM version
-aai.rest.resourceBasePath=/aai/v9
+aai.rest.resourceBasePath=/aai/v11
aai.rest.connectTimeoutInMs=30000
aai.rest.readTimeoutInMs=60000
aai.rest.numRequestRetries=5
diff --git a/sparky/appconfig/elasticsearch.properties b/sparky/appconfig/elasticsearch.properties index e4bd0fc..126b407 100644 --- a/sparky/appconfig/elasticsearch.properties +++ b/sparky/appconfig/elasticsearch.properties @@ -16,8 +16,6 @@ elasticsearch.javaApiPort=8443 # Index names for various searches.
#
elasticsearch.indexName=entity-search-index
-elasticsearch.topographicalIndexName=topography-search-index
-elasticsearch.entityCountHistoryIndexName=entitycounthistoryindex
elasticsearch.autosuggestIndexname=entity-autosuggest-index
# Default document type
diff --git a/sparky/appconfig/model/aai_oxm_v11.xml b/sparky/appconfig/model/aai_oxm_v11.xml index 257c4e4..c296dce 100644 --- a/sparky/appconfig/model/aai_oxm_v11.xml +++ b/sparky/appconfig/model/aai_oxm_v11.xml @@ -1,27 +1,30 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- - ============LICENSE_START======================================================= - org.openecomp.aai - ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - ================================================================================ - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - + + ============LICENSE_START======================================================= + org.onap.aai + ================================================================================ + Copyright © 2017 AT&T Intellectual Property. All rights reserved. + ================================================================================ + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ============LICENSE_END========================================================= - --> + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + ============LICENSE_END========================================================= + + ECOMP is a trademark and service mark of AT&T Intellectual Property. + +--> <xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v11" xml-mapping-metadata-complete="true"> <xml-schema element-form-default="QUALIFIED"> - <xml-ns namespace-uri="http://org.onap.aai.inventory/v11" /> + <xml-ns namespace-uri="http://org.openecomp.aai.inventory/v11" /> </xml-schema> <java-types> <java-type name="Inventory"> @@ -30,7 +33,7 @@ <xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v11.Search" /> <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v11.Actions" /> <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v11.CloudInfrastructure" /> - <xml-element java-attribute="licenseManagement" name="license-management" type="inventory.aai.onap.org.v11.LicenseManagement" /> + <xml-element java-attribute="externalSystem" name="external-system" type="inventory.aai.onap.org.v11.ExternalSystem" /> <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v11.Business" /> <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v11.ServiceDesignAndCreation" /> <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v11.Network" /> @@ -226,6 +229,270 @@ </java-attributes> </java-type> + <java-type name="ExternalSystem"> + <xml-properties> + <xml-property name="description" value="Namespace for external system." /> + </xml-properties> + <xml-root-element name="external-system" /> + <java-attributes> + <xml-element java-attribute="esrEmsList" name="esr-ems-list" type="inventory.aai.onap.org.v11.EsrEmsList" /> + <xml-element java-attribute="esrVnfmList" name="esr-vnfm-list" type="inventory.aai.onap.org.v11.EsrVnfmList" /> + <xml-element java-attribute="esrThirdpartySdncList" name="esr-thirdparty-sdnc-list" type="inventory.aai.onap.org.v11.EsrThirdpartySdncList" /> + </java-attributes> + </java-type> + + <java-type name="EsrEmsList"> + <xml-root-element name="esr-ems-list" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="esrEms" name="esr-ems" type="inventory.aai.onap.org.v11.EsrEms" /> + </java-attributes> + <xml-properties> + <xml-property name="maximumDepth" value="0" /> + </xml-properties> + </java-type> + + <java-type name="EsrEms"> + <xml-root-element name="esr-ems" /> + <java-attributes> + <xml-element java-attribute="emsId" name="ems-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Unique ID of EMS." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v11.EsrSystemInfoList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="Persist EMS address information used by EMS driver." /> + <xml-property name="indexedProps" value="ems-id" /> + <xml-property name="searchable" value="ems-id" /> + <xml-property name="container" value="esr-ems-list" /> + <xml-property name="namespace" value="external-system" /> + </xml-properties> + </java-type> + + <java-type name="EsrVnfmList"> + <xml-root-element name="esr-vnfm-list" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="esrVnfm" name="esr-vnfm" type="inventory.aai.onap.org.v11.EsrVnfm" /> + </java-attributes> + <xml-properties> + <xml-property name="maximumDepth" value="0" /> + </xml-properties> + </java-type> + + <java-type name="EsrVnfm"> + <xml-root-element name="esr-vnfm" /> + <java-attributes> + <xml-element java-attribute="vnfmId" name="vnfm-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Unique ID of VNFM." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vimId" name="vim-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="indecate the VIM to deploy VNF." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="certificateUrl" name="certificate-url" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="certificate url of VNFM." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v11.EsrSystemInfoList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="Persist VNFM address information used by VF-C." /> + <xml-property name="indexedProps" value="vnfm-id" /> + <xml-property name="searchable" value="vnfm-id" /> + <xml-property name="container" value="esr-vnfm-list" /> + <xml-property name="namespace" value="external-system" /> + </xml-properties> + </java-type> + + <java-type name="EsrThirdpartySdncList"> + <xml-root-element name="esr-thirdparty-sdnc-list" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="esrThirdpartySdnc" name="esr-thirdparty-sdnc" type="inventory.aai.onap.org.v11.EsrThirdpartySdnc" /> + </java-attributes> + <xml-properties> + <xml-property name="maximumDepth" value="0" /> + </xml-properties> + </java-type> + + <java-type name="EsrThirdpartySdnc"> + <xml-root-element name="esr-thirdparty-sdnc" /> + <java-attributes> + <xml-element java-attribute="thirdpartySdncId" name="thirdparty-sdnc-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Unique ID of SDNC." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="location" name="location" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="used for DC type to indicate the location of SDNC, such as Core or Edge." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="productName" name="product-name" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="password used to access SDNC server." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v11.EsrSystemInfoList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="Persist SDNC address information used by ONAP SDNC." /> + <xml-property name="indexedProps" value="sdnc-id" /> + <xml-property name="searchable" value="sdnc-id" /> + <xml-property name="container" value="esr-thirdparty-sdnc-list" /> + <xml-property name="namespace" value="external-system" /> + </xml-properties> + </java-type> + + <java-type name="EsrSystemInfoList"> + <xml-root-element name="esr-system-info-list" /> + <xml-properties> + <xml-property name="description" value="Collection of persistent block-level external system auth info." /> + </xml-properties> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v11.EsrSystemInfo" /> + </java-attributes> + <xml-properties> + <xml-property name="maximumDepth" value="0" /> + </xml-properties> + </java-type> + + <java-type name="EsrSystemInfo"> + <xml-root-element name="esr-system-info" /> + <java-attributes> + <xml-element java-attribute="esrSystemInfoId" name="esr-system-info-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Unique ID of esr system info." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="systemName" name="system-name" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="name of external system." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="type" name="type" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="type of external systems." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vendor" name="vendor" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="vendor of external systems." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="version" name="version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="version of external systems." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="serviceUrl" name="service-url" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="url used to access external systems." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="userName" name="user-name" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="username used to access external systems." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="password" name="password" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="password used to access external systems." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="systemType" name="system-type" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="it could be vim/vnfm/thirdparty-sdnc/ems-resource/ems-performance/ems-alarm." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="protocol" name="protocol" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="protocol of third party SDNC, for example netconf/snmp." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="sslCacert" name="ssl-cacert" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="ca file content if enabled ssl on auth-url." /> + </xml-properties> + </xml-element> + <xml-element default-value="false" java-attribute="sslInsecure" name="ssl-insecure" type="java.lang.Boolean"> + <xml-properties> + <xml-property name="description" value="Whether to verify VIM's certificate." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="ipAddress" name="ip-address" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="service IP of ftp server." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="port" name="port" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="service port of ftp server." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="cloudDomain" name="cloud-domain" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="domain info for authentication." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="defaultTenant" name="default-tenant" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="default tenant of VIM." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="passive" name="passive" type="java.lang.Boolean"> + <xml-properties> + <xml-property name="description" value="ftp passive mode or not." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="remotepath" name="remote-path" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="resource or performance data file path." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="systemStatus" name="system-status" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="the status of external system." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="Persist common address information of external systems." /> + <xml-property name="indexedProps" value="esr-system-info-id,system-name,system-type" /> + <xml-property name="searchable" value="esr-system-info-id,system-name,system-type" /> + <xml-property name="container" value="esr-system-info-list" /> + <xml-property name="dependentOn" value="cloud-region,esr-ems,esr-vnfm,esr-thirdparty-sdnc" /> + </xml-properties> + </java-type> + <java-type name="CloudInfrastructure"> <xml-properties> <xml-property name="description" value="Namespace for cloud infrastructure." /> @@ -255,7 +522,7 @@ <java-attributes> <xml-element java-attribute="cloudOwner" name="cloud-owner" required="true" type="java.lang.String" xml-key="true"> <xml-properties> - <xml-property name="description" value="Identifies the vendor and cloud name, e.g., att-aic. First part of composite key should be formatted as vendor-cloudname" /> + <xml-property name="description" value="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname" /> </xml-properties> </xml-element> <xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true"> @@ -299,6 +566,16 @@ <xml-property name="description" value="Whether the cloud region supports (true) or does not support (false) SR-IOV automation." /> </xml-properties> </xml-element> + <xml-element java-attribute="cloudExtraInfo" name="cloud-extra-info" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="ESR inputs extra information about the VIM or Cloud which will be decoded by MultiVIM." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="cloudEpaCaps" name="cloud-epa-caps" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="MultiVIM will discover and expose EPA capabilities." /> + </xml-properties> + </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> @@ -314,9 +591,12 @@ <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v11.OamNetworks" /> <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v11.AvailabilityZones" /> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v11.EsrSystemInfoList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv4AddressList" name="vip-ipv4-address-list" type="inventory.aai.onap.org.v11.VipIpv4AddressList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v11.VipIpv6AddressList" /> </java-attributes> <xml-properties> - <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&T's AIC." /> + <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation." /> <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type" /> <xml-property name="nameProps" value="owner-defined-type" /> <xml-property name="container" value="cloud-regions" /> @@ -762,7 +1042,12 @@ <xml-property name="defaultValue" value="false"/> <xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration." /> </xml-properties> - </xml-element> + </xml-element> + <xml-element java-attribute="allowedAddressPairs" name="allowed-address-pairs" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Freeform field for storing an ip address, list of ip addresses or a subnet block." /> + </xml-properties> + </xml-element> <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v11.Vlans" /> <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v11.SriovVfs" /> <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> @@ -773,7 +1058,7 @@ <xml-properties> <xml-property name="description" value="Logical interfaces, e.g., a vnic." /> <xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name" /> - <xml-property name="dependentOn" value="generic-vnf,newvce,vpe,p-interface,vserver,lag-interface" /> + <xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver,lag-interface" /> <xml-property name="container" value="l-interfaces" /> </xml-properties> </java-type> @@ -918,7 +1203,7 @@ <xml-properties> <xml-property name="description" value="IPv4 Address Range" /> <xml-property name="indexedProps" value="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" /> - <xml-property name="dependentOn" value="vlan,l-interface" /> + <xml-property name="dependentOn" value="vlan,l-interface,vnfc" /> </xml-properties> </java-type> @@ -1059,7 +1344,7 @@ <xml-properties> <xml-property name="description" value="IPv6 Address Range" /> <xml-property name="indexedProps" value="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" /> - <xml-property name="dependentOn" value="vlan,l-interface" /> + <xml-property name="dependentOn" value="vlan,l-interface,vnfc" /> </xml-properties> </java-type> @@ -1416,7 +1701,7 @@ <java-type name="DvsSwitches"> <xml-properties> - <xml-property name="description" value="Collection of digital virtual switch metadata used for vmWare VCEs and VPEs." /> + <xml-property name="description" value="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs." /> </xml-properties> <xml-root-element name="dvs-switches" /> <java-attributes> @@ -1709,6 +1994,11 @@ <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." /> </xml-properties> </xml-element> + <xml-element java-attribute="macAddress" name="mac-addresss" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="MAC Address of the p-interface." /> + </xml-properties> + </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> @@ -1803,7 +2093,7 @@ <xml-properties> <xml-property name="description" value="Link aggregate interface" /> <xml-property name="indexedProps" value="interface-name,interface-id,interface-role" /> - <xml-property name="dependentOn" value="generic-vnf,pserver,vpe,vpls-pe,pnf" /> + <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe,pnf" /> <xml-property name="container" value="lag-interfaces" /> </xml-properties> </java-type> @@ -1944,34 +2234,39 @@ </xml-properties> </java-type> - <java-type name="LicenseManagement"> - <xml-root-element name="license-management" /> + <java-type name="Business"> + <xml-properties> + <xml-property name="description" value="Namespace for business related constructs" /> + </xml-properties> + <xml-root-element name="business" /> <java-attributes> - <xml-element java-attribute="licenseKeyResources" name="license-key-resources" type="inventory.aai.onap.org.v11.LicenseKeyResources" /> + <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v11.Connectors" /> + <xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v11.Customers" /> + <xml-element java-attribute="linesOfBusiness" name="lines-of-business" type="inventory.aai.onap.org.v11.LinesOfBusiness" /> + <xml-element java-attribute="owningEntities" name="owning-entities" type="inventory.aai.onap.org.v11.OwningEntities" /> + <xml-element java-attribute="platforms" name="platforms" type="inventory.aai.onap.org.v11.Platforms" /> + <xml-element java-attribute="projects" name="projects" type="inventory.aai.onap.org.v11.Projects" /> </java-attributes> </java-type> - <java-type name="LicenseKeyResources"> - <xml-root-element name="license-key-resources" /> + <java-type name="Projects"> + <xml-properties> + <xml-property name="description" value="Collection of projects" /> + </xml-properties> + <xml-root-element name="projects" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="licenseKeyResource" name="license-key-resource" type="inventory.aai.onap.org.v11.LicenseKeyResource" /> + <xml-element container-type="java.util.ArrayList" java-attribute="project" name="project" type="inventory.aai.onap.org.v11.Project" /> </java-attributes> </java-type> - <java-type name="LicenseKeyResource"> - <xml-root-element name="license-key-resource" /> + <java-type name="Project"> + <xml-root-element name="project" /> <java-attributes> - <xml-element java-attribute="attUuid" name="att-uuid" required="true" type="java.lang.String" xml-key="true" /> - <xml-element java-attribute="assignmentType" name="assignment-type" type="java.lang.String" /> - <xml-element java-attribute="assignmentStatus" name="assignment-status" type="java.lang.String" /> - <xml-element java-attribute="assignmentGroupUuid" name="assignment-group-uuid" required="true" type="java.lang.String" /> - <xml-element java-attribute="assignmentDate" name="assignment-date" type="java.lang.String" /> - <xml-element java-attribute="name" name="name" type="java.lang.String" /> - <xml-element java-attribute="modelUuid" name="model-uuid" type="java.lang.String" /> - <xml-element java-attribute="modelVersion" name="model-version" type="java.lang.String" /> - <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String" /> - <xml-element java-attribute="licenseKeyFileUrl" name="license-key-file-url" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="supplierReleaseList" name="supplier-release-list" type="java.lang.String" /> + <xml-element java-attribute="projectName" name="project-name" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Name of the project deploying a service" /> + </xml-properties> + </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> @@ -1980,24 +2275,12 @@ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> - <xml-property name="description" value="OBSOLETE OBJECT: do not use" /> - <xml-property name="nameProps" value="name" /> - <xml-property name="indexedProps" value="assignment-group-uuid,att-uuid,name" /> - <xml-property name="uniqueProps" value="att-uuid" /> - <xml-property name="container" value="license-key-resources" /> - <xml-property name="namespace" value="license-management" /> - </xml-properties> - </java-type> - - <java-type name="Business"> - <xml-properties> - <xml-property name="description" value="Namespace for business related constructs" /> + <xml-property name="description" value="describes the project" /> + <xml-property name="indexedProps" value="project-name" /> + <xml-property name="uniqueProps" value="project-name" /> + <xml-property name="container" value="projects" /> + <xml-property name="namespace" value="business" /> </xml-properties> - <xml-root-element name="business" /> - <java-attributes> - <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v11.Connectors" /> - <xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v11.Customers" /> - </java-attributes> </java-type> <java-type name="Connectors"> @@ -2118,6 +2401,114 @@ </xml-properties> </java-type> + <java-type name="LinesOfBusiness"> + <xml-properties> + <xml-property name="description" value="Collection of lines-of-business" /> + </xml-properties> + <xml-root-element name="lines-of-business" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="lineOfBusiness" name="line-of-business" type="inventory.aai.onap.org.v11.LineOfBusiness" /> + </java-attributes> + </java-type> + + <java-type name="LineOfBusiness"> + <xml-root-element name="line-of-business" /> + <java-attributes> + <xml-element java-attribute="lineOfBusinessName" name="line-of-business-name" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Name of the line-of-business (product)" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="describes a line-of-business" /> + <xml-property name="indexedProps" value="line-of-business-name" /> + <xml-property name="uniqueProps" value="line-of-business-name" /> + <xml-property name="container" value="lines-of-business" /> + <xml-property name="namespace" value="business" /> + </xml-properties> + </java-type> + + <java-type name="OwningEntities"> + <xml-properties> + <xml-property name="description" value="Collection of owning-entities" /> + </xml-properties> + <xml-root-element name="owning-entities" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="owningEntity" name="owning-entity" type="inventory.aai.onap.org.v11.OwningEntity" /> + </java-attributes> + </java-type> + + <java-type name="OwningEntity"> + <xml-root-element name="owning-entity" /> + <java-attributes> + <xml-element java-attribute="owningEntityId" name="owning-entity-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="UUID of an owning entity" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="owningEntityName" name="owning-entity-name" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Owning entity name" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="describes an owning-entity" /> + <xml-property name="indexedProps" value="owning-entity-id, owning-entity-name" /> + <xml-property name="searchable" value="owning-entity-id" /> + <xml-property name="uniqueProps" value="owning-entity-id, owning-entity-name" /> + <xml-property name="container" value="owning-entities" /> + <xml-property name="namespace" value="business" /> + </xml-properties> + </java-type> + + <java-type name="Platforms"> + <xml-properties> + <xml-property name="description" value="Collection of platforms" /> + </xml-properties> + <xml-root-element name="platforms" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="platform" name="platform" type="inventory.aai.onap.org.v11.Platform" /> + </java-attributes> + </java-type> + + <java-type name="Platform"> + <xml-root-element name="platform" /> + <java-attributes> + <xml-element java-attribute="platformName" name="platform-name" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Name of the platform" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="describes a platform" /> + <xml-property name="indexedProps" value="platform-name" /> + <xml-property name="uniqueProps" value="platform-name" /> + <xml-property name="container" value="platforms" /> + <xml-property name="namespace" value="business" /> + </xml-properties> + </java-type> + <java-type name="ServiceSubscriptions"> <xml-properties> <xml-property name="description" value="Collection of objects that group service instances." /> @@ -2202,6 +2593,22 @@ <xml-property name="description" value="This field will store the workload context assigned to the service-instance." /> </xml-properties> </xml-element> + <xml-element java-attribute="createdAt" name="created-at" required="false" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="create time of Network Service." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="updatedAt" name="updated-at" required="false" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="last update of Network Service." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="description" name="description" required="false" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="short description for service-instance." /> + </xml-properties> + </xml-element> + <!-- for storing the nsd_id create edge between services --> <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the ASDC model id for this resource or service model." /> @@ -2466,7 +2873,6 @@ <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v11.VplsPes" /> <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v11.MulticastConfigurations" /> <xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v11.Vces" /> - <xml-element java-attribute="vpes" name="vpes" type="inventory.aai.onap.org.v11.Vpes" /> <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v11.Vnfcs" /> <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v11.L3Networks" /> <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v11.NetworkPolicies" /> @@ -2479,7 +2885,98 @@ <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v11.RouteTableReferences" /> <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v11.InstanceGroups" /> <xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v11.Zones" /> + <xml-element java-attribute="configurations" name="configurations" type="inventory.aai.onap.org.v11.Configurations" /> + </java-attributes> + </java-type> + <java-type name="Configurations"> + <xml-properties> + <xml-property name="description" value="Collection of configurations" /> + </xml-properties> + <xml-root-element name="configurations" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="configuration" name="configurations" type="inventory.aai.onap.org.v11.Configuration" /> + </java-attributes> + </java-type> + + <java-type name="Configuration"> + <xml-root-element name="configuration" /> + <java-attributes> + <xml-element java-attribute="configurationId" name="configuration-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="UUID assigned to configuration." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="configurationName" name="configuration-name" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Name of the configuration." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="configurationType" name="configuration-type" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="port-mirroring-configuration." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="configurationSubType" name="configuration-sub-type" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="vprobe, pprobe." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="the ASDC model id for this resource or service model." /> + <xml-property name="visibility" value="deployment" /> + <xml-property name="requires" value="model-version-id" /> + <xml-property name="dbAlias" value="model-invariant-id-local" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="the ASDC model version for this resource or service model." /> + <xml-property name="visibility" value="deployment" /> + <xml-property name="requires" value="model-invariant-id" /> + <xml-property name="dbAlias" value="model-version-id-local" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Orchestration status of the configuration." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="operationalStatus" name="operational-status" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Indicator for whether the resource is considered operational." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="configurationSelflink" name="configuration-selflink" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="URL to endpoint where AAI can get more details from SDN-GC." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="modelCustomizationId" name="model-customization-id" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="id of the configuration used to customize the resource" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata" /> </java-attributes> + <xml-properties> + <xml-property name="description" value="Port Mirror Configuration." /> + <xml-property name="indexedProps" value="configuration-id,model-invariant-id,model-version-id" /> + <xml-property name="uniqueProps" value="configuration-id" /> + <xml-property name="container" value="configurations" /> + <xml-property name="namespace" value="network" /> + </xml-properties> </java-type> <java-type name="LogicalLinks"> @@ -2523,7 +3020,7 @@ </xml-element> <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="v4, v6, or ds for dual stack (should be att-ip-version)" /> + <xml-property name="description" value="v4, v6, or ds for dual stack" /> </xml-properties> </xml-element> <xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String"> @@ -2684,7 +3181,6 @@ </java-attributes> <xml-properties> <xml-property name="indexedProps" value="routing-instance-id" /> - <xml-property name="uniqueProps" value="routing-instance-id" /> <xml-property name="dependentOn" value="site-pair-set" /> <xml-property name="container" value="routing-instances" /> </xml-properties> @@ -2880,7 +3376,7 @@ </xml-element> <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address)." /> + <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." /> </xml-properties> </xml-element> <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> @@ -3184,146 +3680,7 @@ </xml-properties> </java-type> - <java-type name="Vpes"> - <xml-properties> - <xml-property name="description" value="Virtual provider edge router. In 1504, A&AI will populate this object through an M&P and tool provided to operations." /> - </xml-properties> - <xml-root-element name="vpes" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vpe" name="vpe" type="inventory.aai.onap.org.v11.Vpe" /> - </java-attributes> - </java-type> - <java-type name="Vpe"> - <xml-root-element name="vpe" /> - <java-attributes> - <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique id of VNF. This is unique across the graph." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of VNF." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Alternate name of VNF." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource. This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Unique identifier of service. Does not map strictly to ASDC services. SOON TO BE DEPRECATED" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Indicator for whether the resource is considered operational" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="OBSOLETE - do not use. See child relationships." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Client should send valid enumerated value" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address)." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer"> - <xml-properties> - <xml-property name="description" value="Prefix length for oam-address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Gateway address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="v4Loopback0IpAddress" name="v4-loopback0-ip-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Loopback0 address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="Temporary location for stag to get to VCE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="asNumber" name="as-number" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="as-number of the VPE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="summaryStatus" name="summary-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="details regarding the vpe operation, PLEASE DISCONTINUE USE OF THIS FIELD." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="encryptedAccessFlag" name="encrypted-access-flag" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="description" value="indicates whether vpe access uses SSH" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" /> - <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v11.Licenses" /> - <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v11.Entitlements" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Relationship-list must include related to info for complex." /> - <xml-property name="nameProps" value="vnf-name" /> - <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,prov-status,service-id" /> - <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" /> - <xml-property name="uniqueProps" value="vnf-id" /> - <xml-property name="container" value="vpes" /> - <xml-property name="namespace" value="network" /> - <xml-property name="extends" value="vnf" /> - </xml-properties> - </java-type> <java-type name="Vnfcs"> <xml-properties> @@ -3405,6 +3762,8 @@ </xml-properties> </xml-element> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv4AddressList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv6AddressList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id" /> @@ -3724,12 +4083,23 @@ <xml-properties> <xml-property name="description" value="role of the subnet, referenced when assigning IPs" /> </xml-properties> - </xml-element> + </xml-element> + <xml-element java-attribute="ipAssignmentDirection" name="ip-assignment-direction" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="ip address assignment direction of the subnet" /> + </xml-properties> + </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> + <xml-element java-attribute="subnetSequence" name="subnet-sequence" type="java.lang.Integer"> + <xml-properties> + <xml-property name="description" value="sequence of the subnet" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="hostRoutes" name="host-routes" type="inventory.aai.onap.org.v11.HostRoutes" /> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> @@ -3762,6 +4132,11 @@ <xml-property name="description" value="Unique id of VNF. This is unique across the graph." /> </xml-properties> </xml-element> + <xml-element java-attribute="vnfInstanceId" name="vnf-instance-id" required="false" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="vnf instance id." /> + </xml-properties> + </xml-element> <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Name of VNF." /> @@ -3814,6 +4189,21 @@ <xml-property name="suggestibleOnSearch" value="true"/> </xml-properties> </xml-element> + <xml-element java-attribute="vnfPackageName" name="vnf-package-name" required="false" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value=""/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vnfDiscriptorName" name="vnf-discriptor-name" required="false" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="vnf discriptor name"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="jobId" name="job-id" required="false" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="job id corresponding to vnf"/> + </xml-properties> + </xml-element> <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" /> @@ -3879,6 +4269,21 @@ <xml-property name="description" value="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only by uCPE" /> </xml-properties> </xml-element> + <xml-element java-attribute="nshd" name="nshd" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="number of associated SHD in vnf." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="nvm" name="nvm" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="number of vms in vnf." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="nnet" name="nnet" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="number of network in vnf." /> + </xml-properties> + </xml-element> <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean"> <xml-properties> <xml-property name="defaultValue" value="false"/> @@ -4234,12 +4639,12 @@ </xml-element> <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address)." /> + <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." /> </xml-properties> </xml-element> <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Client should send valid enumerated value, e.g., VPE." /> + <xml-property name="description" value="Client should send valid enumerated value." /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> @@ -4472,7 +4877,27 @@ <xml-properties> <xml-property name="description" value="Name of the service Provider on this link." /> </xml-properties> - </xml-element> + </xml-element> + <xml-element java-attribute="serviceProviderBandwidthUpValue" name="service-provider-bandwidth-up-value" type="java.lang.Integer"> + <xml-properties> + <xml-property name="description" value="Upstream Bandwidth value agreed with the service provider" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="serviceProviderBandwidthUpUnits" name="service-provider-bandwidth-up-units" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Units for the upstream BW value" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="serviceProviderBandwidthDownValue" name="service-provider-bandwidth-down-value" type="java.lang.Integer"> + <xml-properties> + <xml-property name="description" value="Downstream Bandwidth value agreed with the service provider" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="serviceProviderBandwidthDownUnits" name="service-provider-bandwidth-down-units" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Units for downstream BW value" /> + </xml-properties> + </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> @@ -4582,7 +5007,7 @@ </xml-element> <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" /> + <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" /> </xml-properties> </xml-element> <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String"> @@ -4612,7 +5037,7 @@ </xml-element> <xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" /> + <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" /> </xml-properties> </xml-element> <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String"> @@ -4726,7 +5151,7 @@ <xml-element java-attribute="multiplicityRule" name="multiplicityRule" type="java.lang.String" /> <xml-element java-attribute="containsOtherV" name="contains-other-v" type="java.lang.String" /> <xml-element java-attribute="deleteOtherV" name="delete-other-v" type="java.lang.String" /> - <xml-element java-attribute="SVCINFRA" name="SVC-INFRA" type="java.lang.String" /> + <xml-element java-attribute="svcinfra" name="SVC-INFRA" type="java.lang.String" /> <xml-element java-attribute="preventDelete" name="prevent-delete" type="java.lang.String" /> </java-attributes> </java-type> @@ -5603,7 +6028,7 @@ <xml-properties> <xml-property name="description" value="Metadata for entitlement group." /> <xml-property name="indexedProps" value="group-uuid,resource-uuid" /> - <xml-property name="dependentOn" value="generic-vnf,vce,vpe" /> + <xml-property name="dependentOn" value="generic-vnf,vce" /> <xml-property name="container" value="entitlements" /> </xml-properties> </java-type> @@ -5642,7 +6067,7 @@ <xml-properties> <xml-property name="description" value="Metadata for license group." /> <xml-property name="indexedProps" value="group-uuid,resource-uuid" /> - <xml-property name="dependentOn" value="generic-vnf,vce,vpe" /> + <xml-property name="dependentOn" value="generic-vnf,vce" /> <xml-property name="container" value="licenses" /> </xml-properties> </java-type> @@ -5660,7 +6085,7 @@ <xml-property name="description" value="Abstract vnf class" /> <xml-property name="indexedProps" value="vnf-id" /> <xml-property name="uniqueProps" value="vnf-id" /> - <xml-property name="inheritors" value="vce,vpe,generic-vnf" /> + <xml-property name="inheritors" value="vce,generic-vnf" /> <xml-property name="abstract" value="true" /> </xml-properties> </java-type> @@ -5690,7 +6115,7 @@ </xml-element> <xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Design of zone [Medium/Large…]" /> + <xml-property name="description" value="Design of zone [Medium/Large?]" /> </xml-properties> </xml-element> <xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String"> @@ -5787,5 +6212,151 @@ <xml-property name="container" value="sriov-pfs" /> </xml-properties> </java-type> + + <java-type name="HostRoutes"> + <xml-root-element name="host-routes" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="hostRoute" name="host-route" type="inventory.aai.onap.org.v11.HostRoute" /> + </java-attributes> + </java-type> + <java-type name="HostRoute"> + <xml-root-element name="host-route" /> + <java-attributes> + <xml-element java-attribute="hostRouteId" name="host-route-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="host-route id" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="routePrefix" name="route-prefix" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="subnet prefix" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="nextHop" name="next-hop" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Could be ip-address, hostname, or service-instance" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="nextHopType" name="next-hop-type" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Should be ip-address, hostname, or service-instance to match next-hop" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="indexedProps" value="host-route-id" /> + <xml-property name="dependentOn" value="subnet" /> + <xml-property name="container" value="host-routes" /> + </xml-properties> + </java-type> + <java-type name="VipIpv4AddressList"> + <xml-root-element name="vip-ipv4-address-list" /> + <java-attributes> + <xml-element java-attribute="vipIpv4Address" name="vip-ipv4-address" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="IP address" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vipIpv4PrefixLength" name="vip-ipv4-prefix-length" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="Prefix length, 32 for single address" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="Inner VLAN tag" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="Outer VLAN tag" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean"> + <xml-properties> + <xml-property name="description" value="Indicator of fixed or floating address" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Neutron network id of the interface that address belongs to" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Neutron id of subnet that address belongs to" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="IPv4 Address Range" /> + <xml-property name="indexedProps" value="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" /> + <xml-property name="dependentOn" value="cloud-region" /> + </xml-properties> + </java-type> + + <java-type name="VipIpv6AddressList"> + <xml-root-element name="vip-ipv6-address-list" /> + <java-attributes> + <xml-element java-attribute="vipIpv6Address" name="vip-ipv6-address" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="IP address" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vipIpv6PrefixLength" name="vip-ipv6-prefix-length" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="Prefix length, 128 for single address" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="Inner VLAN tag" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="Outer VLAN tag" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean"> + <xml-properties> + <xml-property name="description" value="Indicator of fixed or floating address" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Neutron network id of the interface that address belongs to" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Neutron id of subnet that address belongs to" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="IPv6 Address Range" /> + <xml-property name="indexedProps" value="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" /> + <xml-property name="dependentOn" value="cloud-region" /> + </xml-properties> + </java-type> </java-types> -</xml-bindings> +</xml-bindings>
\ No newline at end of file |