[AAI-148 Amsterdam] schema change.

Change-Id: Ic4f2d1bb493ca5bb986de2837f5950294abbedd2
Signed-off-by: Lin, Jerry (jl319x) <jl319x@att.com>

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 3f11492..1e6a149 100644 (file)
--- a/aai-core/src/main/java/org/openecomp/aai/dbmodel/DbEdgeRules.java
+++ b/aai-core/src/main/java/org/openecomp/aai/dbmodel/DbEdgeRules.java
@@ -428,5 +428,6 @@ public class DbEdgeRules {
                        .putAll("entitlement","THIS_NODE_ONLY")
                        .putAll("license","THIS_NODE_ONLY")
                        .putAll("zone", "THIS_NODE_ONLY")
-                       .putAll("route-target", "CASCADE_TO_CHILDREN").build();
+                       .putAll("route-target", "CASCADE_TO_CHILDREN")
+                       .putAll("sriov-pf", "THIS_NODE_ONLY").build();
 }

diff --git a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
index f7c8a16..01e1e67 100644 (file)
--- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
+++ b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
@@ -2001,6 +2001,28 @@
        "usesResource" : "false",
        "hasDelTarget" : "false",
        "SVC-INFRA" : "false"
+},
+{
+       "from" : "p-interface",
+       "to" : "sriov-pf",
+       "label" : "has",
+       "direction" : "OUT",
+       "multiplicity" : "One2One",
+       "isParent" : "true",
+       "usesResource" : "false",
+       "hasDelTarget" : "false",
+       "SVC-INFRA" : "false"
+},
+{
+       "from" : "sriov-vf",
+       "to" : "sriov-pf",
+       "label" : "uses",
+       "direction" : "OUT",
+       "multiplicity" : "Many2One",
+       "isParent" : "false",
+       "usesResource" : "true",
+       "hasDelTarget" : "false",
+       "SVC-INFRA" : "false"
 }
 ]
 }
\ No newline at end of file

diff --git a/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd b/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd
index fde33e9..cebde48 100644 (file)
--- a/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd
+++ b/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd
@@ -1755,6 +1755,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
+        <xs:element name="sriov-automation" type="xs:boolean">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Whether the cloud region supports (true) or does not support (false) SR-IOV automation.")</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/oxm/aai_oxm_v11.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
index 00843ee..a9d567b 100644 (file)
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
@@ -293,6 +293,12 @@
                                                <xml-property name="description" value="complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED." />
                                        </xml-properties>
                                </xml-element>
+                               <xml-element default-value="false" required="true" java-attribute="sriovAutomation" name="sriov-automation" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="Whether the cloud region supports (true) or does not support (false) SR-IOV automation." />
+                                       </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." />
@@ -3349,7 +3355,7 @@
                                                <xml-property name="visibility" value="deployment" />
                                                <xml-property name="requires" value="model-invariant-id" />
                                        </xml-properties>
-                               </xml-element>                          
+                               </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." />
@@ -3969,7 +3975,7 @@
                                        <xml-properties>
                                                <xml-property name="description" value="Network Management profile of this VNF" />
                                        </xml-properties>
-                               </xml-element>                  
+                               </xml-element>
                                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
                                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" />
                                <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" />
@@ -5705,7 +5711,7 @@
                                <xml-property name="canBeLinked" value="true" />
                        </xml-properties>
                </java-type>
-                                               
+
                <java-type name="SriovPfs">
                        <xml-properties>
                                <xml-property name="description" value="Collection of SR-IOV Physical Functions." />