Adding product entry id property in schema
Issue-ID: AAI-2226
Change-Id: I5da79ac0bf541b051704916c403e84631df10612
Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>
diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml
index 7443091..13443be 100644
--- a/aai-annotations/pom.xml
+++ b/aai-annotations/pom.xml
@@ -27,12 +27,12 @@
<parent>
<groupId>org.onap.aai.schema-service</groupId>
<artifactId>schema-service</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<artifactId>aai-annotations</artifactId>
<name>aai-annotations</name>
<packaging>jar</packaging>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<properties>
<onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
</properties>
diff --git a/aai-queries/pom.xml b/aai-queries/pom.xml
index 69bbcff..a807229 100644
--- a/aai-queries/pom.xml
+++ b/aai-queries/pom.xml
@@ -27,11 +27,11 @@
<parent>
<groupId>org.onap.aai.schema-service</groupId>
<artifactId>schema-service</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<artifactId>aai-queries</artifactId>
<name>aai-queries</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<properties>
<onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
<!-- Start of Default ONAP Schema Properties -->
diff --git a/aai-schema-gen/pom.xml b/aai-schema-gen/pom.xml
index e235922..2b5175e 100644
--- a/aai-schema-gen/pom.xml
+++ b/aai-schema-gen/pom.xml
@@ -27,11 +27,11 @@
<parent>
<groupId>org.onap.aai.schema-service</groupId>
<artifactId>schema-service</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<artifactId>aai-schema-gen</artifactId>
<name>aai-schema-gen</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<properties>
<onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
<!-- Start of Default ONAP Schema Properties -->
diff --git a/aai-schema-service/pom.xml b/aai-schema-service/pom.xml
index aff6445..b35f751 100644
--- a/aai-schema-service/pom.xml
+++ b/aai-schema-service/pom.xml
@@ -25,11 +25,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.aai.schema-service</groupId>
<artifactId>aai-schema-service</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<parent>
<groupId>org.onap.aai.schema-service</groupId>
<artifactId>schema-service</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<properties>
<java.version>1.8</java.version>
diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml
index 3042c59..34f4a26 100644
--- a/aai-schema/pom.xml
+++ b/aai-schema/pom.xml
@@ -27,11 +27,11 @@
<parent>
<groupId>org.onap.aai.schema-service</groupId>
<artifactId>schema-service</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<artifactId>aai-schema</artifactId>
<name>aai-schema</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<properties>
<onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
<!-- Start of Default ONAP Schema Properties -->
diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd
index 2cbd179..37350f0 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd
@@ -608,7 +608,7 @@
<xs:element name="vnf-type" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:appinfo>
- <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="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.")</annox:annotate>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the SDC resource. This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ONAP matures.")</annox:annotate>
</xs:appinfo>
</xs:annotation>
</xs:element>
@@ -2081,7 +2081,7 @@
<xs:complexType>
<xs:annotation>
<xs:appinfo>
- <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist common address information of external systems.",indexedProps="esr-system-info-id,system-name,system-type",searchable="esr-system-info-id,system-name,system-type",container="esr-system-info-list",dependentOn="cloud-region,esr-ems,esr-vnfm,esr-thirdparty-sdnc,ext-aai-network",requiredProps="esr-system-info-id,user-name,password,system-type",uriTemplate="/esr-system-info-list/esr-system-info/{esr-system-info-id}")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist common address information of external systems.",indexedProps="esr-system-info-id,system-name,system-type",searchable="esr-system-info-id,system-name,system-type",container="esr-system-info-list",dependentOn="cloud-region,esr-ems,esr-vnfm,esr-thirdparty-sdnc,ext-aai-network,esr-nfvo",requiredProps="esr-system-info-id,user-name,password,system-type",uriTemplate="/esr-system-info-list/esr-system-info/{esr-system-info-id}")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -2663,7 +2663,7 @@
<xs:element name="interface-role" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:appinfo>
- <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Role assigned to this Interface, should use values as defined in ECOMP Yang models.")</annox:annotate>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Role assigned to this Interface, should use values as defined in ONAP Yang models.")</annox:annotate>
</xs:appinfo>
</xs:annotation>
</xs:element>
@@ -3774,7 +3774,7 @@
<xs:element name="service-type" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:appinfo>
- <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Value defined by orchestration to identify this service across ECOMP.")</annox:annotate>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Value defined by orchestration to identify this service across ONAP.")</annox:annotate>
</xs:appinfo>
</xs:annotation>
</xs:element>
@@ -3820,7 +3820,7 @@
<xs:element name="global-customer-id" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:appinfo>
- <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Global customer id used across ECOMP to uniquely identify customer.")</annox:annotate>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Global customer id used across ONAP to uniquely identify customer.")</annox:annotate>
</xs:appinfo>
</xs:annotation>
</xs:element>
@@ -4262,7 +4262,7 @@
<xs:element name="vnf-type" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:appinfo>
- <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="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.")</annox:annotate>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="String capturing type of vnf, that was intended to identify the SDC resource. This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ONAP matures.")</annox:annotate>
</xs:appinfo>
</xs:annotation>
</xs:element>
@@ -5646,7 +5646,7 @@
<xs:element name="vnf-type" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:appinfo>
- <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="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.")</annox:annotate>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the SDC resource. This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ONAP matures.")</annox:annotate>
</xs:appinfo>
</xs:annotation>
</xs:element>
@@ -6779,7 +6779,7 @@
<xs:element name="management-option" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:appinfo>
- <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="identifier of managed by ATT or customer")</annox:annotate>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="identifier of managed customer")</annox:annotate>
</xs:appinfo>
</xs:annotation>
</xs:element>
@@ -7411,7 +7411,7 @@
<xs:element name="management-option" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:appinfo>
- <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="identifier of managed by ATT or customer")</annox:annotate>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="identifier of managed customer")</annox:annotate>
</xs:appinfo>
</xs:annotation>
</xs:element>
@@ -7776,7 +7776,7 @@
<xs:element name="requested-dmz-type" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:appinfo>
- <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ATT can offer a shared DMZ or a DMZ specific to a customer")</annox:annotate>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Shared DMZ or a DMZ specific to a customer")</annox:annotate>
</xs:appinfo>
</xs:annotation>
</xs:element>
@@ -8344,6 +8344,13 @@
</xs:appinfo>
</xs:annotation>
</xs:element>
+ <xs:element name="product-entry-id" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Product ID")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
<xs:element ref="tns:relationship-list" minOccurs="0"/>
<xs:element name="resource-version" type="xs:string" minOccurs="0">
<xs:annotation>
diff --git a/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml b/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml
index 736a5f6..f36226e 100644
--- a/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml
@@ -786,7 +786,7 @@
</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-property name="description" value="String capturing type of vnf, that was intended to identify the SDC resource. This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ONAP matures."/>
</xml-properties>
</xml-element>
<xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
@@ -2404,7 +2404,7 @@
</xml-element>
<xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
<xml-properties>
- <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models."/>
+ <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ONAP Yang models."/>
</xml-properties>
</xml-element>
<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
@@ -2768,7 +2768,7 @@
<java-attributes>
<xml-element java-attribute="globalCustomerId" name="global-customer-id" required="true" type="java.lang.String" xml-key="true">
<xml-properties>
- <xml-property name="description" value="Global customer id used across ECOMP to uniquely identify customer."/>
+ <xml-property name="description" value="Global customer id used across ONAP to uniquely identify customer."/>
</xml-properties>
</xml-element>
<xml-element java-attribute="subscriberName" name="subscriber-name" required="true" type="java.lang.String">
@@ -2932,7 +2932,7 @@
<java-attributes>
<xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
<xml-properties>
- <xml-property name="description" value="Value defined by orchestration to identify this service across ECOMP."/>
+ <xml-property name="description" value="Value defined by orchestration to identify this service across ONAP."/>
</xml-properties>
</xml-element>
<xml-element java-attribute="tempUbSubAccountId" name="temp-ub-sub-account-id" type="java.lang.String">
@@ -3245,7 +3245,7 @@
</xml-element>
<xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String" xml-key="true">
<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-property name="description" value="String capturing type of vnf, that was intended to identify the SDC resource. This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ONAP matures."/>
</xml-properties>
</xml-element>
<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
@@ -3982,7 +3982,7 @@
</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-property name="description" value="String capturing type of vnf, that was intended to identify the SDC resource. This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ONAP matures."/>
</xml-properties>
</xml-element>
<xml-element java-attribute="serviceId" name="service-id" type="java.lang.String">
@@ -4746,7 +4746,7 @@
</xml-element>
<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
<xml-properties>
- <xml-property name="description" value="identifier of managed by ATT or customer"/>
+ <xml-property name="description" value="identifier of managed customer"/>
</xml-properties>
</xml-element>
<xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
@@ -5290,7 +5290,7 @@
</xml-element>
<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
<xml-properties>
- <xml-property name="description" value="identifier of managed by ATT or customer"/>
+ <xml-property name="description" value="identifier of managed customer"/>
</xml-properties>
</xml-element>
<xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
@@ -5622,7 +5622,7 @@
</xml-element>
<xml-element java-attribute="requestedDmzType" name="requested-dmz-type" type="java.lang.String">
<xml-properties>
- <xml-property name="description" value="ATT can offer a shared DMZ or a DMZ specific to a customer"/>
+ <xml-property name="description" value="Shared DMZ or a DMZ specific to a customer"/>
</xml-properties>
</xml-element>
<xml-element java-attribute="sharedDmzNetworkAddress" name="shared-dmz-network-address" type="java.lang.String">
@@ -7418,6 +7418,11 @@
<xml-property name="description" value="tagMode for network side of EVC"/>
</xml-properties>
</xml-element>
+ <xml-element java-attribute="productEntryId" name="product-entry-id" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="Product ID"/>
+ </xml-properties>
+ </xml-element>
<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v16.RelationshipList"/>
<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
<xml-properties>
diff --git a/pom.xml b/pom.xml
index 77e9026..baaeddf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
</parent>
<groupId>org.onap.aai.schema-service</groupId>
<artifactId>schema-service</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<name>aai-schema-service</name>
<packaging>pom</packaging>
<modules>
diff --git a/version.properties b/version.properties
index fedd873..7c09f12 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
# because they are used in Jenkins, whose plug-in doesn't support
major_version=1
minor_version=0
-patch_version=1
+patch_version=2
base_version=${major_version}.${minor_version}.${patch_version}
# Release must be completed with GIT information # in Jenkins
release_version=${base_version}