summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Forsyth <jf2512@att.com>2017-08-21 16:31:10 +0000
committerGerrit Code Review <gerrit@onap.org>2017-08-21 16:31:10 +0000
commit61b392aa55b6560459367d927a24dc6126ae727e (patch)
treee8c25e11ee300ae7d1adb5f91f70ef5f0a4e2e94
parentf79d0971dd24b3b4febe2f946a911b837a83624b (diff)
parentabfb85b06ce42209b79ed2f9559c827ba1f8e0ae (diff)
Merge "Add auth-info node to cloud-region."
-rw-r--r--aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json22
-rw-r--r--aai-schema/src/main/resources/oxm/aai_oxm_v11.xml63
2 files changed, 84 insertions, 1 deletions
diff --git a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
index 641afceb..d24acd79 100644
--- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
+++ b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
@@ -12,6 +12,17 @@
"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",
"label": "uses",
@@ -68,6 +79,17 @@
},
{
"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",
"label": "has",
"direction": "OUT",
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 3a2654ff..d65445c8 100644
--- 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" />