aboutsummaryrefslogtreecommitdiffstats
path: root/aai-schema/src/main
diff options
context:
space:
mode:
authorKeong Lim <keong.lim@huawei.com>2018-09-19 13:55:40 +1000
committerKeong Lim <keong.lim@huawei.com>2018-09-19 13:55:40 +1000
commit378cf91e1653a7f9be693f8bf0fc10998b6b1eeb (patch)
treef8690561420609453fa14a6a6adec2703385ad61 /aai-schema/src/main
parentd33a1cd017103e4f69cedd53d160e2b69200da95 (diff)
AAI-1635 Add privateEdge to model-version-id
Issue-ID: AAI-1635 Add privateEdge to model-version-id in sp-partner, prepare for TOSCA template from SDC. Spurious line-ending changes in the generated XSD file. Change-Id: I8de021b5d59ce88581ccdc01c9dabfc0afb5d1e1 Signed-off-by: Keong Lim <keong.lim@huawei.com>
Diffstat (limited to 'aai-schema/src/main')
-rw-r--r--aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd46
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml1
2 files changed, 41 insertions, 6 deletions
diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd
index a0115514..ca53e881 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd
@@ -2212,11 +2212,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
</xs:annotation>
</xs:element>
<xs:element name="openstack-region-id" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:appinfo>
- <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="OpenStack region ID used by MultiCloud plugin to interact with an OpenStack instance.")</annox:annotate>
- </xs:appinfo>
- </xs:annotation>
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="OpenStack region ID used by MultiCloud plugin to interact with an OpenStack instance.")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
</xs:element>
<xs:element name="resource-version" type="xs:string" minOccurs="0">
<xs:annotation>
@@ -2670,6 +2670,39 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
</xs:sequence>
</xs:complexType>
</xs:element>
+ <xs:element name="hpa-capacity">
+ <xs:complexType>
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="HPA Capacity information for compute node",indexedProps="hpa-capacity-key",dependentOn="hpa-capacity")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="hpa-capacity-key" type="xs:string">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Composite key formed with hpaFeature and append list of hpaFeatureAttributes needed for capacity check")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="hpa-capacity-value" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="JSON string specifying the capacity (total,free), unit and metadata of the specific HPA attribute")</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.onap.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="pserver">
<xs:complexType>
<xs:annotation>
@@ -2870,6 +2903,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
<xs:element ref="tns:relationship-list" minOccurs="0"/>
<xs:element ref="tns:p-interfaces" minOccurs="0"/>
<xs:element ref="tns:lag-interfaces" minOccurs="0"/>
+ <xs:element ref="tns:hpa-capacity" minOccurs="0" maxOccurs="5000"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -3972,7 +4006,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
<xs:element name="model-version-id" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:appinfo>
- <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this sp-partner model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this sp-partner model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
</xs:appinfo>
</xs:annotation>
</xs:element>
diff --git a/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml b/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml
index cfd0672b..73b6c008 100644
--- a/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml
@@ -7419,6 +7419,7 @@
<xml-property name="visibility" value="deployment" />
<xml-property name="requires" value="model-invariant-id" />
<xml-property name="dbAlias" value="model-version-id-local" />
+ <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
</xml-properties>
</xml-element>