Add auth-info node to cloud-region.

Reupload "Add the auth-info node according to the schema from Multi-VIM".
Modify the auth-info definition and defaultTenant according to Jimmy.
Modify the ssl-cacert and ssl-insecure definition according to Ethan.
Modify the description messages of some properties.
Add an edge rule between the cloud-region and the auth-info-item

Change-Id: Ic319f6875d6562d54d6434cbe316bd6e4c35eb21
Issue-ID: AAI-166
Signed-off-by: lizi00164331 <li.zi30@zte.com.cn>

diff --git a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
index 9bcf4b7..802929b 100644 (file)
--- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
+++ b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
@@ -11,6 +11,17 @@
                        "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}"
                },
+               {
+                       "from" : "auth-info-item",
+                       "to" : "tenant",
+                       "label" : "defaultTenant",
+                       "direction" : "OUT",
+                       "multiplicity" : "One2One",
+                       "isParent" : "false",
+                       "usesResource" : "false",
+                       "hasDelTarget" : "false",
+                       "SVC-INFRA" : "false"
+               },
                {
                        "from": "generic-vnf",
                        "to": "license-key-resource",
@@ -66,6 +77,17 @@
                        "SVC-INFRA": "!${direction}",
                        "prevent-delete": "${direction}"
                },
+               {
+                       "from": "cloud-region",
+                       "to": "auth-info-item",
+                       "label": "has",
+                       "direction": "OUT",
+                       "multiplicity": "One2Many",
+                       "contains-other-v": "${direction}",
+                       "delete-other-v": "NONE",
+                       "SVC-INFRA": "!${direction}",
+                       "prevent-delete": "${direction}"
+               },
                {
                        "from": "cloud-region",
                        "to": "image",

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 3a2654f..d65445c 100644 (file)
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
@@ -303,7 +303,7 @@
                                        <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>
+                               </xml-element>          
                                <xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v11.VolumeGroups" />
                                <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v11.Tenants" />
                                <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v11.Flavors" />
@@ -314,6 +314,7 @@
                                <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v11.OamNetworks" />
                                <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v11.AvailabilityZones" />
                                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                               <xml-element java-attribute="authInfoItems" name="auth-info-items" type="inventory.aai.onap.org.v11.AuthInfoItems" />
                        </java-attributes>
                        <xml-properties>
                                <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&amp;Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&amp;T's AIC." />
@@ -386,6 +387,66 @@
                                <xml-property name="container" value="volume-groups" />
                        </xml-properties>
                </java-type>
+               
+               <java-type name="AuthInfoItems">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of persistent auth information to access to VIM." />
+                       </xml-properties>
+                       <xml-root-element name="auth-info-items" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="authInfoItem" name="auth-info-item" type="inventory.aai.onap.org.v11.AuthInfoItem" />
+                       </java-attributes>
+               </java-type>
+               
+               <java-type name="AuthInfoItem">
+                       <xml-root-element name="auth-info-item" />
+                       <java-attributes>
+                       <xml-element java-attribute="authInfoItemId" name="auth-info-item-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID of auth-info-item." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="cloudDomain" name="cloud-domain" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="domain info for authentication." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="userName" name="username" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="user name of auth infomation to access VIM." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="password" name="password" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="password of auth infomation to access VIM." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="authUrl" name="auth-url" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="authentication url of the cloud." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="sslCacert" name="ssl-cacert" required="false" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="ca file content if enabled ssl on auth-url." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element default-value="false" java-attribute="sslInsecure" name="ssl-insecure" required="false" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Whether to verify VIM's certificate." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Persistent auth info." />
+                               <xml-property name="indexedProps" value="auth-info-item-id,username,auth-url" />
+                               <xml-property name="searchable" value="auth-info-item-id,username,auth-url" />
+                               <xml-property name="dependentOn" value="cloud-region" />
+                               <xml-property name="container" value="auth-info-items" />
+                       </xml-properties>
+               </java-type>
+               
 
                <java-type name="RelationshipList">
                        <xml-root-element name="relationship-list" />