diff options
| -rw-r--r-- | aai-core/src/main/java/org/openecomp/aai/dbmodel/DbEdgeRules.java | 7 | ||||
| -rw-r--r-- | aai-schema/src/main/resources/oxm/aai_oxm_v11.xml | 27 |
2 files changed, 33 insertions, 1 deletions
diff --git a/aai-core/src/main/java/org/openecomp/aai/dbmodel/DbEdgeRules.java b/aai-core/src/main/java/org/openecomp/aai/dbmodel/DbEdgeRules.java index 2ab378e2..e5aa36a1 100644 --- a/aai-core/src/main/java/org/openecomp/aai/dbmodel/DbEdgeRules.java +++ b/aai-core/src/main/java/org/openecomp/aai/dbmodel/DbEdgeRules.java @@ -151,6 +151,8 @@ public class DbEdgeRules { "isMemberOf,OUT,Many2Many,false,false,false,true") .putAll("l3-network|vpn-binding", "usesVpnBinding,OUT,Many2Many,false,false,false,false") + .putAll("l3-network|instance-group", + "memberOf,OUT,Many2Many,false,false,false,false") .putAll("l3-network|subnet", "hasSubnet,OUT,Many2Many,true,false,false,reverse") .putAll("l3-network|service-instance", @@ -328,6 +330,7 @@ public class DbEdgeRules { .putAll("allotted-resource|instance-group", "isMemberOf,OUT,Many2Many,false,false,false,false") .putAll("allotted-resource|network-policy", "uses,OUT,One2One,false,false,false,false") .putAll("allotted-resource|vlan", "isPartOf,OUT,Many2Many,false,false,false,false") + .putAll("allotted-resource|l-interface", "uses,OUT,One2Many,false,false,false,false") .putAll("generic-vnf|instance-group", "isMemberOf,OUT,Many2Many,false,false,false,false") .putAll("service-instance|instance-group", "isMemberOf,OUT,Many2Many,false,false,false,false") .putAll("allotted-resource|tunnel-xconnect", "has,OUT,One2One,true,false,false,false") @@ -342,8 +345,10 @@ public class DbEdgeRules { .putAll("zone|complex", "existsIn,OUT,Many2One,false,false,false,false") .putAll("service-instance|allotted-resource", "has,OUT,Many2Many,true,false,false,false") .putAll("service-instance|allotted-resource", "uses,OUT,Many2Many,false,false,false,false") + .putAll("allotted-resource|vpn-binding", "belongsTo,OUT,Many2Many,false,false,false,false") + .putAll("allotted-resource|allotted-resource", "bindsTo,OUT,One2One,false,false,false,false") .build(); - + public static final Multimap<String, String> DefaultDeleteScope = new ImmutableSetMultimap.Builder<String, String>() .putAll("customer", "CASCADE_TO_CHILDREN") .putAll("cloud-region", "THIS_NODE_ONLY") 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 ff06a77c..8f0cccd3 100644 --- a/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml +++ b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml @@ -2777,6 +2777,16 @@ <xml-property name="description" value="Type of the vpn, should be taken from enumerated/valid values" /> </xml-properties> </xml-element> + <xml-element java-attribute="vpnRegion" name="vpn-region" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="region of customer vpn" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="customerVpnId" name="customer-vpn-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="id for this customer vpn" /> + </xml-properties> + </xml-element> <xml-element java-attribute="routeDistinguisher" name="route-distinguisher" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network." /> @@ -5259,6 +5269,23 @@ <java-type name="InstanceGroup"> <xml-root-element name="instance-group" /> <java-attributes> + <xml-element java-attribute="instanceGroupRole" name="instance-group-role" required="false" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="role of the instance group." /> + </xml-properties> + </xml-element> + + <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="false" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="ASDC model id for this resource or service model." /> + </xml-properties> + </xml-element> + + <xml-element java-attribute="modelVersionId" name="model-version-id" required="false" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="ASDC model version uid for this resource model." /> + </xml-properties> + </xml-element> <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Instance Group ID, UUID assigned to this instance." /> |