summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Forsyth <jf2512@att.com>2017-12-12 00:42:08 +0000
committerGerrit Code Review <gerrit@onap.org>2017-12-12 00:42:08 +0000
commit4985d1cea407ac86607df0be5eda5e3680abd887 (patch)
treede2f1b08caee4d5e69b101375fc38269ce27d12b
parentb81506cb18a3c5164afb4d468d28b1b478218d18 (diff)
parent7a995eec49662d1965a9dc017c63c306cb21ae07 (diff)
Merge "Add back the pserver self link and configuration"
-rw-r--r--aai-schema/src/main/resources/aai_schema/aai_schema_v12.xsd42
-rw-r--r--aai-schema/src/main/resources/oxm/aai_oxm_v12.xml13
2 files changed, 30 insertions, 25 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 5748c329..54e3bd7b 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,6 +2065,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="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>
@@ -2100,13 +2107,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="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>
@@ -2263,17 +2263,17 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
</xs:appinfo>
</xs:annotation>
</xs:element>
- <xs:element name="ptnii-equip-name" 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="PTNII name")</annox:annotate>
+ <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="selflink" type="xs:string" minOccurs="0">
+ <xs:element name="ptnii-equip-name" 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>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="PTNII name")</annox:annotate>
</xs:appinfo>
</xs:annotation>
</xs:element>
@@ -6586,24 +6586,24 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
</xs:appinfo>
</xs:annotation>
</xs:element>
- <xs:element name="pnf-name2-source" 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="source of name2")</annox:annotate>
+ <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="pnf-id" 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="id of pnf")</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="selflink" 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="Node URL in CANOPI/MINT.")</annox:annotate>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="id of pnf")</annox:annotate>
</xs:appinfo>
</xs:annotation>
</xs:element>
@@ -7279,17 +7279,17 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
</xs:appinfo>
</xs:annotation>
<xs:sequence>
- <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>
- <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>
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 13363c50..fdd6cd67 100644
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml
@@ -1956,6 +1956,11 @@
<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" />
@@ -2894,14 +2899,14 @@
<java-type name="Configuration">
<xml-root-element name="configuration" />
<java-attributes>
- <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="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="configurationName" name="configuration-name" type="java.lang.String">