diff options
Diffstat (limited to 'aai-schema')
5 files changed, 232 insertions, 5 deletions
diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml index 786b580f..02582704 100644 --- a/aai-schema/pom.xml +++ b/aai-schema/pom.xml @@ -24,10 +24,6 @@ <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>license-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> <artifactId>jaxb2-maven-plugin</artifactId> <version>2.2</version> <executions> diff --git a/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd b/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd index 45d89fdd..70cfa328 100644 --- a/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd +++ b/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd @@ -4657,6 +4657,60 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="host-route"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="host-route-id",dependentOn="subnet",container="host-routes")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element name="host-route-id" type="xs:string"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="host-route id")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="route-prefix" type="xs:string"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="subnet prefix")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="next-hop" type="xs:string"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Could be ip-address, hostname, or service-instance")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="next-hop-type" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Should be ip-address, hostname, or service-instance to match next-hop")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="resource-version" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element ref="tns:relationship-list" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="host-routes"> + <xs:complexType> + <xs:sequence> + <xs:element ref="tns:host-route" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> <xs:element name="subnet"> <xs:complexType> <xs:annotation> @@ -4749,6 +4803,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> + <xs:element name="ip-assignment-direction" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ip address assignment direction of the subnet")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> <xs:element name="resource-version" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> @@ -4756,6 +4817,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> + <xs:element ref="tns:host-routes" minOccurs="0"/> <xs:element ref="tns:relationship-list" minOccurs="0"/> </xs:sequence> </xs:complexType> @@ -6001,6 +6063,34 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> + <xs:element name="service-provider-bandwidth-up-value" type="xs:int" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Upstream Bandwidth value agreed with the service provider")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="service-provider-bandwidth-up-units" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Units for the upstream BW value")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="service-provider-bandwidth-down-value" type="xs:int" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Downstream Bandwidth value agreed with the service provider")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="service-provider-bandwidth-down-units" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Units for downstream BW value")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> <xs:element name="resource-version" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> diff --git a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v11.html b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v11.html index e2885809..bd2e18aa 100644 --- a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v11.html +++ b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v11.html @@ -147735,6 +147735,54 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen </div> </dd> + <dt data-property-name="service-provider-bandwidth-up-value"> + <span class="json-property-name">service-provider-bandwidth-up-value:</span> + <span class="json-property-type">integer</span> + <span class="json-property-range" title="Value limits"></span> + + </dt> + <dd> + <p>Upstream Bandwidth value agreed with the service provider</p> + <div class="json-inner-schema"> + + </div> + </dd> + <dt data-property-name="service-provider-bandwidth-up-units"> + <span class="json-property-name">service-provider-bandwidth-up-units:</span> + <span class="json-property-type">string</span> + <span class="json-property-range" title="Value limits"></span> + + </dt> + <dd> + <p>Units for the upstream BW value</p> + <div class="json-inner-schema"> + + </div> + </dd> + <dt data-property-name="service-provider-bandwidth-down-value"> + <span class="json-property-name">service-provider-bandwidth-down-value:</span> + <span class="json-property-type">integer</span> + <span class="json-property-range" title="Value limits"></span> + + </dt> + <dd> + <p>Downstream Bandwidth value agreed with the service provider</p> + <div class="json-inner-schema"> + + </div> + </dd> + <dt data-property-name="service-provider-bandwidth-down-units"> + <span class="json-property-name">service-provider-bandwidth-down-units:</span> + <span class="json-property-type">string</span> + <span class="json-property-range" title="Value limits"></span> + + </dt> + <dd> + <p>Units for downstream BW value</p> + <div class="json-inner-schema"> + + </div> + </dd> <dt data-property-name="resource-version"> <span class="json-property-name">resource-version:</span> <span class="json-property-type">string</span> diff --git a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v11.yaml b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v11.yaml index 46a08b54..ea3badd3 100644 --- a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v11.yaml +++ b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v11.yaml @@ -42922,6 +42922,20 @@ definitions: service-provider-name: type: string description: Name of the service Provider on this link. + service-provider-bandwidth-up-value: + type: integer + format: int32 + description: Upstream Bandwidth value agreed with the service provider + service-provider-bandwidth-up-units: + type: string + description: Units for the upstream BW value + service-provider-bandwidth-down-value: + type: integer + format: int32 + description: Downstream Bandwidth value agreed with the service provider + service-provider-bandwidth-down-units: + type: string + description: Units for downstream BW value resource-version: type: string description: Used for optimistic concurrency. Must be empty on create, valid on update and delete. diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml index 2fcb9226..00769800 100644 --- a/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml +++ b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml @@ -298,6 +298,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." /> @@ -3598,13 +3608,19 @@ <xml-properties> <xml-property name="description" value="role of the subnet, referenced when assigning IPs" /> </xml-properties> + </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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + <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> <xml-property name="indexedProps" value="subnet-id,subnet-name" /> @@ -4346,6 +4362,26 @@ <xml-properties> <xml-property name="description" value="Name of the service Provider on this link." /> </xml-properties> + </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> @@ -5661,5 +5697,48 @@ <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-types> </xml-bindings> |