summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Reehil <william.reehil@att.com>2020-08-07 16:36:57 +0000
committerGerrit Code Review <gerrit@onap.org>2020-08-07 16:36:57 +0000
commitb928bf45a15809de50fcc09bd95312895d51dfaf (patch)
tree961b9872cb9170a7bc126f4231a4addc1cbfddfe
parentd798580326608ff753fddbca35f4ad1b910a8fba (diff)
parenta56d34f413e36b9f49e55a93d181680be077750a (diff)
Merge "aai-schema introduce profiles with relationship to pnf, pserver and vserver objects Issue-ID: AAI-3104"
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_v20.json45
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml56
2 files changed, 98 insertions, 3 deletions
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_v20.json b/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_v20.json
index 9121ca5..5067fd3 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_v20.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_v20.json
@@ -1607,6 +1607,45 @@
"default": "true",
"description":""
},
+ {
+ "from": "profile",
+ "to": "pnf",
+ "label": "org.onap.relationships.inventory.supports",
+ "direction": "OUT",
+ "multiplicity": "MANY2MANY",
+ "contains-other-v": "NONE",
+ "delete-other-v": "NONE",
+ "SVC-INFRA": "NONE",
+ "prevent-delete": "NONE",
+ "default": "true",
+ "description":""
+ },
+ {
+ "from": "profile",
+ "to": "pserver",
+ "label": "org.onap.relationships.inventory.supports",
+ "direction": "OUT",
+ "multiplicity": "MANY2MANY",
+ "contains-other-v": "NONE",
+ "delete-other-v": "NONE",
+ "SVC-INFRA": "NONE",
+ "prevent-delete": "NONE",
+ "default": "true",
+ "description":""
+ },
+ {
+ "from": "profile",
+ "to": "vserver",
+ "label": "org.onap.relationships.inventory.supports",
+ "direction": "OUT",
+ "multiplicity": "MANY2MANY",
+ "contains-other-v": "NONE",
+ "delete-other-v": "NONE",
+ "SVC-INFRA": "NONE",
+ "prevent-delete": "NONE",
+ "default": "true",
+ "description":""
+ },
{
"from": "cvlan-tag",
"to": "port-group",
@@ -3184,7 +3223,7 @@
"delete-other-v": "NONE",
"prevent-delete": "NONE",
"default": "true",
- "description":"A Configuration uses VRFs"
+ "description":"A Configuration uses VRFs"
},
{
"from": "vrf",
@@ -3236,7 +3275,7 @@
"SVC-INFRA": "NONE",
"prevent-delete": "NONE",
"default": "true",
- "description":""
+ "description":""
},
{
"from": "communication-service-profile",
@@ -3321,7 +3360,7 @@
"default": "true",
"description":""
}
-
+
]
}
diff --git a/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml b/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml
index bb18fd4..5669464 100644
--- a/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml
@@ -9414,6 +9414,7 @@
<xml-root-element name="common"/>
<java-attributes>
<xml-element java-attribute="contacts" name="contacts" type="inventory.aai.onap.org.v20.Contacts"/>
+ <xml-element java-attribute="profiles" name="profiles" type="inventory.aai.onap.org.v20.Profiles"/>
</java-attributes>
</java-type>
@@ -9467,6 +9468,61 @@
</xml-properties>
</java-type>
+ <java-type name="Profiles">
+ <xml-properties>
+ <xml-property name="description" value="Collection of profiles"/>
+ </xml-properties>
+ <xml-root-element name="profiles"/>
+ <java-attributes>
+ <xml-element container-type="java.util.ArrayList" java-attribute="profile" name="profile" type="inventory.aai.onap.org.v20.Profile"/>
+ </java-attributes>
+ </java-type>
+
+ <java-type name="Profile">
+ <xml-root-element name="profile"/>
+ <java-attributes>
+ <xml-element java-attribute="profileName" name="profile-name" required="true" type="java.lang.String" xml-key="true">
+ <xml-properties>
+ <xml-property name="description" value="Name of the profile"/>
+ </xml-properties>
+ </xml-element>
+ <xml-element java-attribute="profileType" name="profile-type" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="Type of profile (ex,network-power-profile)"/>
+ </xml-properties>
+ </xml-element>
+ <xml-element java-attribute="profileCharacteristics" name="profile-characteristics" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="Set of characteristics of the profile."/>
+ </xml-properties>
+ </xml-element>
+ <xml-element java-attribute="profileSubtype" name="profile-subtype" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="Descriptive subtype."/>
+ </xml-properties>
+ </xml-element>
+ <xml-element java-attribute="profileSelflink" name="profile-selflink" required="true" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="URL to endpoint where AAI can get more details"/>
+ </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."/>
+ </xml-properties>
+ </xml-element>
+ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v20.RelationshipList"/>
+ </java-attributes>
+ <xml-properties>
+ <xml-property name="description" value="Profiles store the information (ex, credential-profile) and have a relationship to (ex, pnf)"/>
+ <xml-property name="uniqueProps" value="profile-name"/>
+ <xml-property name="container" value="profiles"/>
+ <xml-property name="namespace" value="common"/>
+ <xml-property name="nameProps" value="profile-name,profile-type"/>
+ <xml-property name="uriTemplate" value="/common/profiles/profile/{profile-name}"/>
+ <xml-property name="requiredProps" value="profile-name"/>
+ </xml-properties>
+ </java-type>
<java-type name="AggregateRoutes">
<xml-properties>
<xml-property name="description" value="Collection of aggregate routes."/>