diff options
author | Dileep Ranganathan <dileep.ranganathan@intel.com> | 2018-07-30 16:34:07 -0700 |
---|---|---|
committer | Dileep Ranganathan <dileep.ranganathan@intel.com> | 2018-09-11 08:44:49 -0700 |
commit | 6d285fbc7565709fdef1aedb1f534aae961acc61 (patch) | |
tree | a0418253f9dfb85c21be53cfbbba1c3b5f6c5586 | |
parent | cedf38e1f1f7e1415fea9e4e321212ea45f4643c (diff) |
AAI schema change for openstack-region-id
Decouples OpenStack Region ID and AAI cloud-region-id and reduces
constraint to onboard Openstack VIM. Added odd one more property
to "esr-system-info: object" to store the OpenStack Region ID which is
used by MultiCloud plugin to interact with an OpenStack instance.
Change-Id: I40d8eec74cf3d5c319c659fd3879f8dc371e2855
Issue-ID: MULTICLOUD-287
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
-rw-r--r-- | aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd | 7 | ||||
-rw-r--r-- | aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml | 5 |
2 files changed, 12 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 c31850d8..9725b6fc 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 @@ -2211,6 +2211,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> + <xs:element name="openstack-region-id" type="xs:string" minOccurs="0"> + <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="OpenStack region ID used by MultiCloud plugin to interact with an OpenStack instance.")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element> <xs:element name="resource-version" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> 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 15ef2770..69bea338 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 @@ -475,6 +475,11 @@ <xml-property name="description" value="the status of external system." /> </xml-properties> </xml-element> + <xml-element java-attribute="openstackRegionId" name="openstack-region-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="OpenStack region ID used by MultiCloud plugin to interact with an OpenStack instance." /> + </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." /> |