summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Forsyth <jf2512@att.com>2018-08-22 19:57:00 +0000
committerGerrit Code Review <gerrit@onap.org>2018-08-22 19:57:00 +0000
commit014b26f4a2c0e37d04a31c9c47faae0525848f94 (patch)
tree2c8183d81982f362502d0f7c3099bfa084c4ecd0
parent52cf5ef2ea34a12728000de454f9de038d4242b7 (diff)
parentb34e7307cfb6207584618fb83f58151bf35db45c (diff)
Merge "AAI-1459 Update service-instance schema for CCVPN"
-rw-r--r--aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd7
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml6
2 files changed, 13 insertions, 0 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 8ce75a01..623f8a07 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
@@ -3502,6 +3502,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
</xs:appinfo>
</xs:annotation>
</xs:element>
+ <xs:element name="input-parameters" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="String capturing request parameters from SO to pass to Closed Loop.")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
<xs:element ref="tns:relationship-list" minOccurs="0"/>
<xs:element ref="tns:metadata" minOccurs="0"/>
<xs:element ref="tns:allotted-resources" minOccurs="0"/>
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 2236ad28..d80e99b0 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
@@ -4,6 +4,7 @@
org.onap.aai
================================================================================
Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2018 Huawei Technologies (Australia) Pty Ltd. All rights reserved.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -2798,6 +2799,11 @@
<xml-property name="description" value="Orchestration status of this service." />
</xml-properties>
</xml-element>
+ <xml-element java-attribute="inputParameters" name="input-parameters" required="false" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="String capturing request parameters from SO to pass to Closed Loop." />
+ </xml-properties>
+ </xml-element>
<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v14.Metadata" />
<xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v14.AllottedResources" />