diff options
Diffstat (limited to 'aai-schema/src')
| -rw-r--r-- | aai-schema/src/main/resources/aai_schema/aai_schema_v12.xsd | 197 | ||||
| -rw-r--r-- | aai-schema/src/main/resources/oxm/aai_oxm_v12.xml | 27 |
2 files changed, 123 insertions, 101 deletions
diff --git a/aai-schema/src/main/resources/aai_schema/aai_schema_v12.xsd b/aai-schema/src/main/resources/aai_schema/aai_schema_v12.xsd index 7ea13201..5748c329 100644 --- a/aai-schema/src/main/resources/aai_schema/aai_schema_v12.xsd +++ b/aai-schema/src/main/resources/aai_schema/aai_schema_v12.xsd @@ -2065,13 +2065,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="selflink" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> <xs:element name="speed-value" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> @@ -2107,6 +2100,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> + <xs:element name="selflink" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Node URL in CANOPI/MINT.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> <xs:element name="interface-type" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> @@ -2270,6 +2270,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> + <xs:element name="selflink" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Node URL in CANOPI/MINT.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> <xs:element name="number-of-cpus" type="xs:int" minOccurs="0"> <xs:annotation> <xs:appinfo> @@ -2508,6 +2515,79 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="operational-environment"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="It is a logical partition of the cloud which allows to have multiple environments in the production AIC.",indexedProps="operational-environment-id",nameProps="operational-environment-name",uniqueProps="operational-environment-id",container="operational-environments",namespace="cloud-infrastructure")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element name="operational-environment-id" type="xs:string"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of an operational environment")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="operational-environment-name" type="xs:string"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Operational Environment name")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="operational-environment-type" type="xs:string"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Operational Environment Type.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="operational-environment-status" type="xs:string"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Status")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="tenant-context" type="xs:string"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Tenant Context.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="workload-context" type="xs:string"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Workload Context.")</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="operational-environments"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a logical partition of the cloud which allows to have multiple environments in the production AIC.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element ref="tns:operational-environment" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> <xs:element name="cloud-infrastructure"> <xs:complexType> <xs:annotation> @@ -2521,6 +2601,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:element ref="tns:network-profiles" minOccurs="0"/> <xs:element ref="tns:pservers" minOccurs="0"/> <xs:element ref="tns:virtual-data-centers" minOccurs="0"/> + <xs:element ref="tns:operational-environments" minOccurs="0"/> </xs:sequence> </xs:complexType> </xs:element> @@ -3888,7 +3969,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version",uniqueProps="model-version-id",container="model-vers")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version,distribution-status",uniqueProps="model-version-id",container="model-vers")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3913,6 +3994,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> + <xs:element name="distribution-status" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Distribution Status")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> <xs:element name="model-description" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> @@ -6498,24 +6586,24 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="selflink" type="xs:string" minOccurs="0"> + <xs:element name="pnf-name2-source" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details.")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="source of name2")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="pnf-name2-source" type="xs:string" minOccurs="0"> + <xs:element name="pnf-id" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="source of name2")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="id of pnf")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="pnf-id" type="xs:string" minOccurs="0"> + <xs:element name="selflink" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="id of pnf")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Node URL in CANOPI/MINT.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> @@ -7191,17 +7279,17 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> <xs:sequence> - <xs:element name="configuration-id" type="xs:string"> + <xs:element name="management-option" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID assigned to configuration.")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="management-option" type="xs:string" minOccurs="0"> + <xs:element name="configuration-id" type="xs:string"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well.")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID assigned to configuration.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> @@ -7724,77 +7812,4 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="operational-environment"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="It is a logical partition of the cloud which allows to have multiple environments in the production AIC.",indexedProps="operational-environment-id",uniqueProps="operational-environment-id",container="operational-environments",namespace="cloud-infrastructure")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element name="operational-environment-id" type="xs:string"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID of an operational environment")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="operational-environment-name" type="xs:string"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Operational Environment name")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="operational-environment-type" type="xs:string"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Operational Environment Type.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="operational-environment-status" type="xs:string"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Status")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="tenant-context" type="xs:string"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Tenant Context.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="workload-context" type="xs:string"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Workload Context.")</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="operational-environments"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="a logical partition of the cloud which allows to have multiple environments in the production AIC.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element ref="tns:operational-environment" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> </xs:schema> diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml index 07cec834..13363c50 100644 --- a/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml +++ b/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml @@ -501,6 +501,7 @@ <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v12.NetworkProfiles" /> <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v12.Pservers" /> <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v12.VirtualDataCenters" /> + <xml-element java-attribute="operationalEnvironments" name="operational-environments" type="inventory.aai.onap.org.v12.OperationalEnvironments" /> </java-attributes> </java-type> @@ -1787,6 +1788,11 @@ <xml-property name="description" value="Value from executing hostname on the compute node." /> </xml-properties> </xml-element> + <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="URL to endpoint where AAI can get more details." /> + </xml-properties> + </xml-element> <xml-element java-attribute="ptniiEquipName" name="ptnii-equip-name" type="java.lang.String"> <xml-properties> <xml-property name="description" value="PTNII name" /> @@ -1950,11 +1956,6 @@ <xml-property name="description" value="Name that identifies the physical interface" /> </xml-properties> </xml-element> - <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="URL to endpoint where AAI can get more details." /> - </xml-properties> - </xml-element> <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Captures the numeric part of the speed" /> @@ -2893,14 +2894,14 @@ <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-element java-attribute="managementOption" name="management-option" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="UUID assigned to configuration." /> + <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="managementOption" name="management-option" type="java.lang.String"> + <xml-element java-attribute="configurationId" name="configuration-id" required="true" type="java.lang.String" xml-key="true"> <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-property name="description" value="UUID assigned to configuration." /> </xml-properties> </xml-element> <xml-element java-attribute="configurationName" name="configuration-name" type="java.lang.String"> @@ -5218,7 +5219,7 @@ <xml-properties> <xml-property name="description" value="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models" /> <xml-property name="nameProps" value="model-name" /> - <xml-property name="indexedProps" value="model-version-id,model-name,model-version" /> + <xml-property name="indexedProps" value="model-version-id,model-name,model-version,distribution-status" /> <xml-property name="uniqueProps" value="model-version-id" /> <xml-property name="container" value="model-vers" /> </xml-properties> @@ -5238,6 +5239,11 @@ <xml-property name="description" value="Version" /> </xml-properties> </xml-element> + <xml-element java-attribute="distributionStatus" name="distribution-status" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Distribution Status" /> + </xml-properties> + </xml-element> <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Description" /> @@ -6424,6 +6430,7 @@ <xml-properties> <xml-property name="description" value="It is a logical partition of the cloud which allows to have multiple environments in the production AIC." /> <xml-property name="indexedProps" value="operational-environment-id" /> + <xml-property name="nameProps" value="operational-environment-name" /> <xml-property name="uniqueProps" value="operational-environment-id" /> <xml-property name="container" value="operational-environments" /> <xml-property name="namespace" value="cloud-infrastructure" /> |