summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKajur, Harish (vk250x) <vk250x@att.com>2018-11-01 14:52:05 -0400
committerKajur, Harish (vk250x) <vk250x@att.com>2018-11-01 14:52:10 -0400
commitd82a30bd3cb3c0d7fd7c1696abbb4e142631c595 (patch)
treebfd5972ea13e00c5cd1261bf6fb2a96c466d3b98
parentf63960c075b06aa540aa8acccf4beff4497aab77 (diff)
Support generic-vnf vendor information
Issue-ID: AAI-1823 Change-Id: Ifa4ab02584bf99565286dcbaab38339030c70228 Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>
-rw-r--r--aai-schema/src/main/resources/onap/aai_schema/aai_schema_v15.xsd71
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json13
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v15/aai_oxm_v15.xml58
3 files changed, 142 insertions, 0 deletions
diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v15.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v15.xsd
index f37ae93a..b224c7c1 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v15.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v15.xsd
@@ -9736,6 +9736,76 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
</xs:sequence>
</xs:complexType>
</xs:element>
+ <xs:element name="contact">
+ <xs:complexType>
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Contacts store the vendor information and have a relationship to the generic-vnf. In 1902, this will be populated by SDN-GC",uniqueProps="contact-name",container="contacts",namespace="common",nameProps="contact-name,vendor-type",uriTemplate="/common/contacts/contact/{contact-name}")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="contact-name" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the contact")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="contact-telephone" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Tel no. of contact")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="contact-email" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="e-mail of contact")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="vendor-type" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="NI (Network Integrator)SI (System Integrator) 3rd Party LCM")</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:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="contacts">
+ <xs:complexType>
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of contacts")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element ref="tns:contact" minOccurs="0" maxOccurs="5000"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="common">
+ <xs:complexType>
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Namespace for common inventory resources.")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element ref="tns:contacts" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
<xs:element name="notification-event-header">
<xs:complexType>
<xs:sequence>
@@ -9995,6 +10065,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
<xs:element ref="tns:service-design-and-creation" minOccurs="0"/>
<xs:element ref="tns:network" minOccurs="0"/>
<xs:element ref="tns:aai-internal" minOccurs="0"/>
+ <xs:element ref="tns:common" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:element>
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json b/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json
index 141990d2..815b241c 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json
@@ -3091,6 +3091,19 @@
"prevent-delete": "NONE",
"default": "true",
"description":""
+ },
+ {
+ "from": "contact",
+ "to": "generic-vnf",
+ "label": "org.onap.relationships.inventory.supports",
+ "direction": "OUT",
+ "multiplicity": "MANY2MANY",
+ "contains-other-v": "NONE",
+ "delete-other-v": "NONE",
+ "SVC-INFRA": "NONE",
+ "prevent-delete": "NONE",
+ "default": "true",
+ "description":""
}
]
diff --git a/aai-schema/src/main/resources/onap/oxm/v15/aai_oxm_v15.xml b/aai-schema/src/main/resources/onap/oxm/v15/aai_oxm_v15.xml
index b1ca0dfc..c9e3f1e2 100644
--- a/aai-schema/src/main/resources/onap/oxm/v15/aai_oxm_v15.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v15/aai_oxm_v15.xml
@@ -37,6 +37,7 @@
<xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v15.Network" />
<xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v15.AaiInternal" />
<xml-element java-attribute="nodes" name="nodes" type="inventory.aai.onap.org.v15.Nodes"/>
+ <xml-element java-attribute="common" name="common" type="inventory.aai.onap.org.v15.Common"/>
</java-attributes>
</java-type>
@@ -8430,5 +8431,62 @@
</xml-properties>
</java-type>
+ <java-type name="Common">
+ <xml-properties>
+ <xml-property name="description" value="Namespace for common inventory resources."/>
+ </xml-properties>
+ <xml-root-element name="common"/>
+ <java-attributes>
+ <xml-element java-attribute="contacts" name="contacts" type="inventory.aai.onap.org.v15.Contacts"/>
+ </java-attributes>
+ </java-type>
+
+ <java-type name="Contacts">
+ <xml-properties>
+ <xml-property name="description" value="Collection of contacts"/>
+ </xml-properties>
+ <xml-root-element name="contacts"/>
+ <java-attributes>
+ <xml-element container-type="java.util.ArrayList" java-attribute="contact" name="contact" type="inventory.aai.onap.org.v15.Contact"/>
+ </java-attributes>
+ </java-type>
+ <java-type name="Contact">
+ <xml-root-element name="contact"/>
+ <java-attributes>
+ <xml-element java-attribute="contactName" name="contact-name" required="true" type="java.lang.String" xml-key="true">
+ <xml-properties>
+ <xml-property name="description" value="Name of the contact"/>
+ </xml-properties>
+ </xml-element>
+ <xml-element java-attribute="contactTelephone" name="contact-telephone" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="Tel no. of contact"/>
+ </xml-properties>
+ </xml-element>
+ <xml-element java-attribute="contactEmail" name="contact-email" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="e-mail of contact"/>
+ </xml-properties>
+ </xml-element>
+ <xml-element java-attribute="vendorType" name="vendor-type" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="NI (Network Integrator)SI (System Integrator) 3rd Party LCM"/>
+ </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>
+ </java-attributes>
+ <xml-properties>
+ <xml-property name="description" value="Contacts store the vendor information and have a relationship to the generic-vnf. In 1902, this will be populated by SDN-GC"/>
+ <xml-property name="uniqueProps" value="contact-name"/>
+ <xml-property name="container" value="contacts"/>
+ <xml-property name="namespace" value="common"/>
+ <xml-property name="nameProps" value="contact-name,vendor-type"/>
+ <xml-property name="uriTemplate" value="/common/contacts/contact/{contact-name}"/>
+ </xml-properties>
+ </java-type>
</java-types>
</xml-bindings>