Merge "Upversion to 1.3.1"

diff --git a/aai-core/pom.xml b/aai-core/pom.xml
index 70a0318..74d2f91 100644 (file)
--- a/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@ -987,6 +987,12 @@
             <groupId>org.apache.tinkerpop</groupId>
             <artifactId>gremlin-groovy</artifactId>
             <version>${gremlin.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.codehaus.groovy</groupId>
+                    <artifactId>groovy</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v10.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v10.xsd
index b9c7096..c303461 100644 (file)
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v10.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v10.xsd
@@ -3963,7 +3963,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags",uriTemplate="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags",uriTemplate="/cvlan-tags/cvlan-tag/{cvlan-tag}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>

diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v11.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v11.xsd
index edef5ed..4b97632 100644 (file)
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v11.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v11.xsd
@@ -4788,7 +4788,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags",uriTemplate="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags",uriTemplate="/cvlan-tags/cvlan-tag/{cvlan-tag}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>

diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v12.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v12.xsd
index 8dc219e..5e9dcf7 100644 (file)
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v12.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v12.xsd
@@ -4990,7 +4990,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags",uriTemplate="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags",uriTemplate="/cvlan-tags/cvlan-tag/{cvlan-tag}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>

diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v13.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v13.xsd
index 812672f..b6ccc0f 100644 (file)
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v13.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v13.xsd
@@ -4969,7 +4969,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags",uriTemplate="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags",uriTemplate="/cvlan-tags/cvlan-tag/{cvlan-tag}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>

diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd
index 78d24f8..363e988 100644 (file)
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd
@@ -5323,7 +5323,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags",uriTemplate="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags",uriTemplate="/cvlan-tags/cvlan-tag/{cvlan-tag}")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>

diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json
index 1b6d940..62b6c52 100644 (file)
--- a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json
@@ -197,7 +197,7 @@
                "to": "service-instance",
                "label": "org.onap.relationships.inventory.PartOf",
                "direction": "OUT",
-               "multiplicity": "ONE2MANY",
+               "multiplicity": "MANY2MANY",
                "contains-other-v": "NONE",
                "delete-other-v": "NONE",
                "prevent-delete": "NONE",

diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json
index e6904a7..fe25845 100644 (file)
--- a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json
@@ -1987,8 +1987,8 @@
                        "direction": "OUT",
                        "multiplicity": "ONE2MANY",
                        "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "prevent-delete": "${direction}",
+                       "delete-other-v": "${direction}",
+                       "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
                },

diff --git a/aai-schema/src/main/resources/onap/oxm/v10/aai_oxm_v10.xml b/aai-schema/src/main/resources/onap/oxm/v10/aai_oxm_v10.xml
index e22bd09..cc143c8 100644 (file)
--- a/aai-schema/src/main/resources/onap/oxm/v10/aai_oxm_v10.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v10/aai_oxm_v10.xml
@@ -3098,7 +3098,7 @@
                 <xml-property name="dependentOn" value="port-group"/>
                 <xml-property name="indexedProps" value="cvlan-tag"/>
                 <xml-property name="container" value="cvlan-tags"/>
-                <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}"/>
+                <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag}"/>
             </xml-properties>
         </java-type>
 

diff --git a/aai-schema/src/main/resources/onap/oxm/v11/aai_oxm_v11.xml b/aai-schema/src/main/resources/onap/oxm/v11/aai_oxm_v11.xml
index 92a0987..ce6f17a 100644 (file)
--- a/aai-schema/src/main/resources/onap/oxm/v11/aai_oxm_v11.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v11/aai_oxm_v11.xml
@@ -3735,7 +3735,7 @@
                 <xml-property name="dependentOn" value="port-group"/>
                 <xml-property name="indexedProps" value="cvlan-tag"/>
                 <xml-property name="container" value="cvlan-tags"/>
-                <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}"/>
+                <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag}"/>
             </xml-properties>
         </java-type>
 

diff --git a/aai-schema/src/main/resources/onap/oxm/v12/aai_oxm_v12.xml b/aai-schema/src/main/resources/onap/oxm/v12/aai_oxm_v12.xml
index e04c471..5d43d43 100644 (file)
--- a/aai-schema/src/main/resources/onap/oxm/v12/aai_oxm_v12.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v12/aai_oxm_v12.xml
@@ -3841,7 +3841,7 @@
                 <xml-property name="dependentOn" value="port-group"/>
                 <xml-property name="indexedProps" value="cvlan-tag"/>
                 <xml-property name="container" value="cvlan-tags"/>
-                <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}"/>
+                <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag}"/>
             </xml-properties>
         </java-type>
 

diff --git a/aai-schema/src/main/resources/onap/oxm/v13/aai_oxm_v13.xml b/aai-schema/src/main/resources/onap/oxm/v13/aai_oxm_v13.xml
index 08fdb7a..fb072fc 100644 (file)
--- a/aai-schema/src/main/resources/onap/oxm/v13/aai_oxm_v13.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v13/aai_oxm_v13.xml
@@ -3822,7 +3822,7 @@
                 <xml-property name="dependentOn" value="port-group"/>
                 <xml-property name="indexedProps" value="cvlan-tag"/>
                 <xml-property name="container" value="cvlan-tags"/>
-                <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}"/>
+                <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag}"/>
             </xml-properties>
         </java-type>
 

diff --git a/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml b/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml
index e61ad59..8b044f7 100644 (file)
--- a/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml
@@ -4002,7 +4002,7 @@
                 <xml-property name="dependentOn" value="port-group"/>
                 <xml-property name="indexedProps" value="cvlan-tag"/>
                 <xml-property name="container" value="cvlan-tags"/>
-                <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}"/>
+                <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag}"/>
             </xml-properties>
         </java-type>