aboutsummaryrefslogtreecommitdiffstats
path: root/aai-schema/src/main
diff options
context:
space:
mode:
authorlizi00164331 <li.zi30@zte.com.cn>2017-09-12 11:46:05 +0800
committerlizi00164331 <li.zi30@zte.com.cn>2017-09-12 15:28:37 +0800
commit60d2659b77f7d96f59e464138599f9dee0f2f0ad (patch)
treed96ef4a6356fc3b758c1976f473559aaf1526a40 /aai-schema/src/main
parent6042ff29f5f1f00b537f4b92e7aeeded13810545 (diff)
Fix the schema about external system.
move passive/remote-path from esr-ems to esr-system-info. Change parameters in esr-system-info to be optional. Fix error about the container definition in esr-system-info. Remove the label between cloud-region and auth-info-item. Change-Id: I21ab7d96b3a0b00c738f423b040420fb3c7e0072 Issue-ID: AAI-289 Signed-off-by: lizi00164331 <li.zi30@zte.com.cn>
Diffstat (limited to 'aai-schema/src/main')
-rw-r--r--aai-schema/src/main/resources/oxm/aai_oxm_v11.xml44
1 files changed, 26 insertions, 18 deletions
diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
index 2e309ae2..052f4c8d 100644
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
@@ -256,16 +256,6 @@
<xml-property name="description" value="Unique ID of EMS." />
</xml-properties>
</xml-element>
- <xml-element java-attribute="passive" name="passive" type="java.lang.Boolean">
- <xml-properties>
- <xml-property name="description" value="ftp passive mode or not." />
- </xml-properties>
- </xml-element>
- <xml-element java-attribute="remotepath" name="remote-path" type="java.lang.String">
- <xml-properties>
- <xml-property name="description" value="resource or performance data file path." />
- </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." />
@@ -375,10 +365,13 @@
<java-type name="EsrSystemInfoList">
<xml-root-element name="esr-system-info-list" />
+ <xml-properties>
+ <xml-property name="description" value="Collection of persistent block-level external system auth info." />
+ </xml-properties>
<java-attributes>
<xml-element container-type="java.util.ArrayList" java-attribute="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v11.EsrSystemInfo" />
</java-attributes>
- <xml-properties>
+ <xml-properties>
<xml-property name="maximumDepth" value="0" />
</xml-properties>
</java-type>
@@ -391,22 +384,22 @@
<xml-property name="description" value="Unique ID of esr system info." />
</xml-properties>
</xml-element>
- <xml-element java-attribute="systemName" name="system-name" required="true" type="java.lang.String">
+ <xml-element java-attribute="systemName" name="system-name" type="java.lang.String">
<xml-properties>
<xml-property name="description" value="name of external system." />
</xml-properties>
</xml-element>
- <xml-element java-attribute="type" name="type" required="true" type="java.lang.String">
+ <xml-element java-attribute="type" name="type" type="java.lang.String">
<xml-properties>
<xml-property name="description" value="type of external systems." />
</xml-properties>
</xml-element>
- <xml-element java-attribute="vendor" name="vendor" required="true" type="java.lang.String">
+ <xml-element java-attribute="vendor" name="vendor" type="java.lang.String">
<xml-properties>
<xml-property name="description" value="vendor of external systems." />
</xml-properties>
</xml-element>
- <xml-element java-attribute="version" name="version" required="true" type="java.lang.String">
+ <xml-element java-attribute="version" name="version" type="java.lang.String">
<xml-properties>
<xml-property name="description" value="version of external systems." />
</xml-properties>
@@ -431,9 +424,9 @@
<xml-property name="description" value="it could be vim/vnfm/thirdparty-sdnc/ems-resource/ems-performance/ems-alarm." />
</xml-properties>
</xml-element>
- <xml-element java-attribute="protocal" name="protocal" type="java.lang.String">
+ <xml-element java-attribute="protocol" name="protocol" type="java.lang.String">
<xml-properties>
- <xml-property name="description" value="protocal of third party SDNC, for example netconf/snmp." />
+ <xml-property name="description" value="protocol of third party SDNC, for example netconf/snmp." />
</xml-properties>
</xml-element>
<xml-element java-attribute="sslCacert" name="ssl-cacert" type="java.lang.String">
@@ -466,6 +459,21 @@
<xml-property name="description" value="default tenant of VIM." />
</xml-properties>
</xml-element>
+ <xml-element java-attribute="passive" name="passive" type="java.lang.Boolean">
+ <xml-properties>
+ <xml-property name="description" value="ftp passive mode or not." />
+ </xml-properties>
+ </xml-element>
+ <xml-element java-attribute="remotepath" name="remote-path" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="resource or performance data file path." />
+ </xml-properties>
+ </xml-element>
+ <xml-element java-attribute="systemStatus" name="system-status" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="the status of external system." />
+ </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." />
@@ -477,7 +485,7 @@
<xml-property name="description" value="Persist common address information of external systems." />
<xml-property name="indexedProps" value="esr-system-info-id,system-name,system-type" />
<xml-property name="searchable" value="esr-system-info-id,system-name,system-type" />
- <xml-property name="container" value="esr-system-infos" />
+ <xml-property name="container" value="esr-system-info-list" />
<xml-property name="namespace" value="external-system" />
</xml-properties>
</java-type>