aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaMont, William(wl2432) <wl2432@att.com>2020-06-12 13:35:23 -0400
committerLaMont, William(wl2432) <wl2432@att.com>2020-06-18 16:09:01 -0400
commita8ce62a3bae5976982f6d1432723251a414e2878 (patch)
tree1f03bc2c46e35e45a954a3396a492dba79a8d6d2
parentdecb7c92edf67ba67facb7d20d0c8f66d08a46d0 (diff)
v20 support in schema-service without javafx
Issue-ID: AAI-2930 Change-Id: I68ba45069f465988e21602521e8e665cb27318d1 Signed-off-by: LaMont, William(wl2432) <wl2432@att.com>
-rw-r--r--aai-queries/src/main/resources/schema/onap/query/stored-queries.json12
-rw-r--r--aai-queries/src/test/java/org/onap/aai/queries/OnapQueryTest.java3
-rw-r--r--aai-queries/src/test/resources/application-onap-test.properties4
-rw-r--r--aai-queries/src/test/resources/application-test.properties4
-rw-r--r--aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/HTMLfromOXM.java9
-rw-r--r--aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/NodesYAMLfromOXM.java2
-rw-r--r--aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/PatchOperation.java7
-rw-r--r--aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/PutOperation.java7
-rw-r--r--aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/YAMLfromOXM.java6
-rw-r--r--aai-schema-gen/src/test/java/org/onap/aai/schemagen/genxsd/NodesYAMLfromOXMTest.java2
-rw-r--r--aai-schema-gen/src/test/java/org/onap/aai/schemagen/genxsd/PatchOperationTest.java4
-rw-r--r--aai-schema-gen/src/test/java/org/onap/aai/schemagen/genxsd/PutOperationTest.java4
-rw-r--r--aai-schema-gen/src/test/java/org/onap/aai/schemagen/genxsd/YAMLfromOXMTest.java10
-rw-r--r--aai-schema-service/pom.xml4
-rw-r--r--aai-schema-service/src/main/assembly/descriptor.xml3
-rw-r--r--aai-schema-service/src/main/resources/application.properties4
-rw-r--r--aai-schema-service/src/main/scripts/common_functions.sh1
-rw-r--r--aai-schema-service/src/main/scripts/getTool.sh2
-rw-r--r--aai-schema-service/src/test/java/org/onap/aai/schemaservice/SchemaServiceTest.java4
-rw-r--r--aai-schema-service/src/test/resources/application-test.properties4
-rw-r--r--aai-schema/src/main/resources/onap/aai_schema/aai_schema_v10.xsd8
-rw-r--r--aai-schema/src/main/resources/onap/aai_schema/aai_schema_v11.xsd10
-rw-r--r--aai-schema/src/main/resources/onap/aai_schema/aai_schema_v12.xsd10
-rw-r--r--aai-schema/src/main/resources/onap/aai_schema/aai_schema_v13.xsd14
-rw-r--r--aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd16
-rw-r--r--aai-schema/src/main/resources/onap/aai_schema/aai_schema_v15.xsd16
-rw-r--r--aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd16
-rw-r--r--aai-schema/src/main/resources/onap/aai_schema/aai_schema_v17.xsd16
-rw-r--r--aai-schema/src/main/resources/onap/aai_schema/aai_schema_v18.xsd16
-rw-r--r--aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd18
-rw-r--r--aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd40
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_v20.json47
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v10/aai_oxm_v10.xml8
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v11/aai_oxm_v11.xml10
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v12/aai_oxm_v12.xml10
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v13/aai_oxm_v13.xml14
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml16
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v15/aai_oxm_v15.xml18
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml18
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v17/aai_oxm_v17.xml18
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v18/aai_oxm_v18.xml18
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml20
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml20
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v8/aai_oxm_v8.xml6
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v9/aai_oxm_v9.xml8
-rw-r--r--aai-schema/src/test/java/org/onap/aai/schema/ValidateOXMTest.java264
46 files changed, 527 insertions, 244 deletions
diff --git a/aai-queries/src/main/resources/schema/onap/query/stored-queries.json b/aai-queries/src/main/resources/schema/onap/query/stored-queries.json
index eb59b14..c60f264 100644
--- a/aai-queries/src/main/resources/schema/onap/query/stored-queries.json
+++ b/aai-queries/src/main/resources/schema/onap/query/stored-queries.json
@@ -421,17 +421,9 @@
{
"pserver-fromHostnameFirstToken": {
"query":{
- "required-properties":["hostnameFirstToken","sourcesOfTruth"]
+ "required-properties":["hostnameFirstToken"]
},
- "stored-query": "builder.getVerticesStartsWithProperty('hostname', hostnameFirstToken).getVerticesByProperty('source-of-truth', new ArrayList<>(Arrays.asList(sourcesOfTruth)))"
- }
- },
- {
- "pserver-fromFqdnFirstToken": {
- "query":{
- "required-properties":["fqdnFirstToken","sourcesOfTruth"]
- },
- "stored-query": "builder.getVerticesStartsWithProperty('fqdn', fqdnFirstToken).getVerticesByProperty('source-of-truth', new ArrayList<>(Arrays.asList(sourcesOfTruth)))"
+ "stored-query": "builder.getVerticesStartsWithProperty('hostname', hostnameFirstToken)"
}
},
{
diff --git a/aai-queries/src/test/java/org/onap/aai/queries/OnapQueryTest.java b/aai-queries/src/test/java/org/onap/aai/queries/OnapQueryTest.java
index d25aff6..8e890a1 100644
--- a/aai-queries/src/test/java/org/onap/aai/queries/OnapQueryTest.java
+++ b/aai-queries/src/test/java/org/onap/aai/queries/OnapQueryTest.java
@@ -141,7 +141,8 @@ public abstract class OnapQueryTest {
{new SchemaVersion("v16")},
{new SchemaVersion("v17")},
{new SchemaVersion("v18")},
- {new SchemaVersion("v19")}
+ {new SchemaVersion("v19")},
+ {new SchemaVersion("v20")}
});
}
diff --git a/aai-queries/src/test/resources/application-onap-test.properties b/aai-queries/src/test/resources/application-onap-test.properties
index 697c4a8..8d429a0 100644
--- a/aai-queries/src/test/resources/application-onap-test.properties
+++ b/aai-queries/src/test/resources/application-onap-test.properties
@@ -16,7 +16,7 @@ schema.ingest.file=${server.local.startpath}/application-test.properties
# Schema Version Related Attributes
schema.uri.base.path=/aai
# Lists all of the versions in the schema
-schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17
+schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20
# Specifies from which version should the depth parameter to default to zero
schema.version.depth.start=v10
# Specifies from which version should the related link be displayed in response payload
@@ -29,5 +29,5 @@ schema.version.namespace.change.start=v12
# Specifies from which version should the client start seeing the edge label in payload
schema.version.edge.label.start=v12
# Specifies the version that the application should default to
-schema.version.api.default=v17
+schema.version.api.default=v20
schema.translator.list=config \ No newline at end of file
diff --git a/aai-queries/src/test/resources/application-test.properties b/aai-queries/src/test/resources/application-test.properties
index b6aafc7..04d6f79 100644
--- a/aai-queries/src/test/resources/application-test.properties
+++ b/aai-queries/src/test/resources/application-test.properties
@@ -16,7 +16,7 @@ schema.ingest.file=${server.local.startpath}/application-test.properties
# Schema Version Related Attributes
schema.uri.base.path=/aai
# Lists all of the versions in the schema
-schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19
+schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20
# Specifies from which version should the depth parameter to default to zero
schema.version.depth.start=v10
# Specifies from which version should the related link be displayed in response payload
@@ -29,6 +29,6 @@ schema.version.namespace.change.start=v12
# Specifies from which version should the client start seeing the edge label in payload
schema.version.edge.label.start=v12
# Specifies the version that the application should default to
-schema.version.api.default=v19
+schema.version.api.default=v20
schema.translator.list=config
diff --git a/aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/HTMLfromOXM.java b/aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/HTMLfromOXM.java
index 2af0662..35f0665 100644
--- a/aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/HTMLfromOXM.java
+++ b/aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/HTMLfromOXM.java
@@ -271,13 +271,6 @@ public class HTMLfromOXM extends OxmFileProcessor {
}
private boolean versionUsesAnnotations( String version) {
- int ver = new Integer(version.substring(1)).intValue();
- if ( ver >= HTMLfromOXM.annotationsStartVersion ) {
- return true;
- }
- if ( ver <= HTMLfromOXM.annotationsMinVersion ) {
- return true;
- }
- return false;
+ return true;
}
}
diff --git a/aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/NodesYAMLfromOXM.java b/aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/NodesYAMLfromOXM.java
index e75be8f..1de4466 100644
--- a/aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/NodesYAMLfromOXM.java
+++ b/aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/NodesYAMLfromOXM.java
@@ -84,7 +84,7 @@ public class NodesYAMLfromOXM extends OxmFileProcessor {
sb.append("description: |");
if (versionSupportsSwaggerDiff(v.toString())) {
sb.append("\n\n [Differences versus the previous schema version]("
- + "apidocs/aai_swagger_" + v.toString() + ".diff)");
+ +"apidocs" + basePath + "/aai_swagger_" + v.toString() + ".diff)");
}
sb.append(
DOUBLE_LINE_SEPARATOR + " Copyright &copy; 2017-18 AT&amp;T Intellectual Property. All rights reserved." + OxmFileProcessor.DOUBLE_LINE_SEPARATOR + " Licensed under the Creative Commons License, Attribution 4.0 Intl. (the &quot;License&quot;); you may not use this documentation except in compliance with the License." + DOUBLE_LINE_SEPARATOR + " You may obtain a copy of the License at\n\n (https://creativecommons.org/licenses/by/4.0/)" + DOUBLE_LINE_SEPARATOR + " Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License." + OxmFileProcessor.DOUBLE_LINE_SEPARATOR + " This document is best viewed with Firefox or Chrome. ");
diff --git a/aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/PatchOperation.java b/aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/PatchOperation.java
index 496f3df..dc762ee 100644
--- a/aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/PatchOperation.java
+++ b/aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/PatchOperation.java
@@ -33,8 +33,10 @@ public class PatchOperation {
private String pathParams;
private String prefixForPatch;
private SchemaVersion version;
+ private String basePath;
- public PatchOperation(String useOpId, String xmlRootElementName, String tag, String path, String pathParams, SchemaVersion v) {
+ public PatchOperation(String useOpId, String xmlRootElementName, String tag, String path,
+ String pathParams, SchemaVersion v, String basePath) {
super();
this.useOpId = useOpId;
this.xmlRootElementName = xmlRootElementName;
@@ -43,6 +45,7 @@ public class PatchOperation {
this.pathParams = pathParams;
this.prefixForPatch = "";
this.version = v;
+ this.basePath = basePath;
}
public void setPrefixForPatchRef(String prefixForPatchRef) {
this.prefixForPatch = prefixForPatchRef;
@@ -85,7 +88,7 @@ public class PatchOperation {
if ( path.endsWith("/relationship") ) {
pathSb.append(" summary: see node definition for valid relationships\n");
} else {
- relationshipExamplesSb.append("[See Examples](apidocs/relations/"+version.toString()+"/"+useOpId+".json)");
+ relationshipExamplesSb.append("[See Examples](apidocs" + basePath + "/relations/"+version.toString()+"/"+useOpId+".json)");
pathSb.append(" summary: update an existing " + xmlRootElementName + "\n");
pathSb.append(" description: |\n");
pathSb.append(" Update an existing " + xmlRootElementName + "\n");
diff --git a/aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/PutOperation.java b/aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/PutOperation.java
index 3e69565..5895306 100644
--- a/aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/PutOperation.java
+++ b/aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/PutOperation.java
@@ -33,8 +33,10 @@ public class PutOperation {
private String path;
private String pathParams;
private SchemaVersion version;
+ private String basePath;
- public PutOperation(String useOpId, String xmlRootElementName, String tag, String path, String pathParams, SchemaVersion v) {
+ public PutOperation(String useOpId, String xmlRootElementName, String tag, String path,
+ String pathParams, SchemaVersion v, String basePath) {
super();
this.useOpId = useOpId;
this.xmlRootElementName = xmlRootElementName;
@@ -42,6 +44,7 @@ public class PutOperation {
this.path = path;
this.pathParams = pathParams;
this.version = v;
+ this.basePath = basePath;
}
@Override
@@ -80,7 +83,7 @@ public class PutOperation {
pathSb.append(" summary: create or update an existing " + xmlRootElementName + "\n");
pathSb.append(" description: |\n Create or update an existing " + xmlRootElementName + ".\n #\n Note! This PUT method has a corresponding PATCH method that can be used to update just a few of the fields of an existing object, rather than a full object replacement. An example can be found in the [PATCH section] below\n");
}
- relationshipExamplesSb.append("[Valid relationship examples shown here](apidocs/relations/"+version.toString()+"/"+useOpId.replace("RelationshipListRelationship", "")+".json)");
+ relationshipExamplesSb.append("[Valid relationship examples shown here](apidocs" + basePath + "/relations/"+version.toString()+"/"+useOpId.replace("RelationshipListRelationship", "")+".json)");
pathSb.append(" operationId: createOrUpdate" + useOpId + "\n");
pathSb.append(" consumes:\n");
pathSb.append(" - application/json\n");
diff --git a/aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/YAMLfromOXM.java b/aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/YAMLfromOXM.java
index 40d5c0e..0ec95e9 100644
--- a/aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/YAMLfromOXM.java
+++ b/aai-schema-gen/src/main/java/org/onap/aai/schemagen/genxsd/YAMLfromOXM.java
@@ -85,7 +85,7 @@ public class YAMLfromOXM extends OxmFileProcessor {
sb.append("description: |");
if (versionSupportsSwaggerDiff(v.toString())) {
sb.append("\n\n [Differences versus the previous schema version]("
- + "apidocs/aai_swagger_" + v.toString() + ".diff)");
+ + "apidocs" + basePath + "/aai_swagger_" + v.toString() + ".diff)");
}
sb.append(
DOUBLE_LINE_SEPARATOR + " Copyright &copy; 2017-18 AT&amp;T Intellectual Property. All rights reserved." + OxmFileProcessor.DOUBLE_LINE_SEPARATOR + " Licensed under the Creative Commons License, Attribution 4.0 Intl. (the &quot;License&quot;); you may not use this documentation except in compliance with the License." + DOUBLE_LINE_SEPARATOR + " You may obtain a copy of the License at\n\n (https://creativecommons.org/licenses/by/4.0/)" + DOUBLE_LINE_SEPARATOR + " Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License." + OxmFileProcessor.DOUBLE_LINE_SEPARATOR + " This document is best viewed with Firefox or Chrome. ");
@@ -466,11 +466,11 @@ public class YAMLfromOXM extends OxmFileProcessor {
logger.debug("opId vs useOpId:" + opId + " vs " + useOpId + " PathParams=" + pathParams);
// add PUT
PutOperation put = new PutOperation(useOpId, xmlRootElementName, tag, path,
- pathParams == null ? "" : pathParams.toString(), this.v);
+ pathParams == null ? "" : pathParams.toString(), this.v, this.basePath);
pathSb.append(put.toString());
// add PATCH
PatchOperation patch = new PatchOperation(useOpId, xmlRootElementName, tag, path,
- pathParams == null ? "" : pathParams.toString(), this.v);
+ pathParams == null ? "" : pathParams.toString(), this.v, this.basePath);
patch.setPrefixForPatchRef(patchDefinePrefix);
pathSb.append(patch.toString());
// add DELETE
diff --git a/aai-schema-gen/src/test/java/org/onap/aai/schemagen/genxsd/NodesYAMLfromOXMTest.java b/aai-schema-gen/src/test/java/org/onap/aai/schemagen/genxsd/NodesYAMLfromOXMTest.java
index 9ad16d6..2207a90 100644
--- a/aai-schema-gen/src/test/java/org/onap/aai/schemagen/genxsd/NodesYAMLfromOXMTest.java
+++ b/aai-schema-gen/src/test/java/org/onap/aai/schemagen/genxsd/NodesYAMLfromOXMTest.java
@@ -252,7 +252,7 @@ public class NodesYAMLfromOXMTest {
sb.append("info:" + OxmFileProcessor.LINE_SEPARATOR);
sb.append(" description: |\n");
sb.append("\n");
- sb.append(" [Differences versus the previous schema version](apidocs/aai_swagger_v11.diff)" + OxmFileProcessor.DOUBLE_LINE_SEPARATOR);
+ sb.append(" [Differences versus the previous schema version](apidocs/aai/aai_swagger_v11.diff)" + OxmFileProcessor.DOUBLE_LINE_SEPARATOR);
sb.append(" Copyright &copy; 2017-18 AT&amp;T Intellectual Property. All rights reserved." + OxmFileProcessor.DOUBLE_LINE_SEPARATOR);
sb.append(" Licensed under the Creative Commons License, Attribution 4.0 Intl. (the &quot;License&quot;); you may not use this documentation except in compliance with the License." + OxmFileProcessor.DOUBLE_LINE_SEPARATOR);
sb.append(" You may obtain a copy of the License at\n");
diff --git a/aai-schema-gen/src/test/java/org/onap/aai/schemagen/genxsd/PatchOperationTest.java b/aai-schema-gen/src/test/java/org/onap/aai/schemagen/genxsd/PatchOperationTest.java
index e36d520..4fc1c84 100644
--- a/aai-schema-gen/src/test/java/org/onap/aai/schemagen/genxsd/PatchOperationTest.java
+++ b/aai-schema-gen/src/test/java/org/onap/aai/schemagen/genxsd/PatchOperationTest.java
@@ -45,7 +45,7 @@ public class PatchOperationTest {
@Parameters
public static Collection<String []> testConditions() {
String inputs [][] = {
- {"NetworkGenericVnfsGenericVnf","generic-vnf","Network","/network/generic-vnfs/generic-vnf/{vnf-id}"," - name: vnf-id\n in: path\n description: Unique id of VNF. This is unique across the graph.\n required: true\n type: string\n example: __VNF-ID__"," patch:\n tags:\n - Network\n summary: update an existing generic-vnf\n description: |\n Update an existing generic-vnf\n #\n Note: Endpoints that are not devoted to object relationships support both PUT and PATCH operations.\n The PUT operation will entirely replace an existing object.\n The PATCH operation sends a \"description of changes\" for an existing object. The entire set of changes must be applied. An error result means no change occurs.\n #\n Other differences between PUT and PATCH are:\n #\n - For PATCH, you can send any of the values shown in sample REQUEST body. There are no required values.\n - For PATCH, resource-id which is a required REQUEST body element for PUT, must not be sent.\n - PATCH cannot be used to update relationship elements; there are dedicated PUT operations for this.\n operationId: UpdateNetworkGenericVnfsGenericVnf\n consumes:\n - application/json\n produces:\n - application/json\n responses:\n \"default\":\n null parameters:\n - name: vnf-id\n in: path\n description: Unique id of VNF. This is unique across the graph.\n required: true\n type: string\n example: __VNF-ID__ - name: body\n in: body\n description: generic-vnf object that needs to be updated.[See Examples](apidocs/relations/v16/NetworkGenericVnfsGenericVnf.json)\n required: true\n schema:\n $ref: \"#/definitions/generic-vnf\"\n"},
+ {"NetworkGenericVnfsGenericVnf","generic-vnf","Network","/network/generic-vnfs/generic-vnf/{vnf-id}"," - name: vnf-id\n in: path\n description: Unique id of VNF. This is unique across the graph.\n required: true\n type: string\n example: __VNF-ID__"," patch:\n tags:\n - Network\n summary: update an existing generic-vnf\n description: |\n Update an existing generic-vnf\n #\n Note: Endpoints that are not devoted to object relationships support both PUT and PATCH operations.\n The PUT operation will entirely replace an existing object.\n The PATCH operation sends a \"description of changes\" for an existing object. The entire set of changes must be applied. An error result means no change occurs.\n #\n Other differences between PUT and PATCH are:\n #\n - For PATCH, you can send any of the values shown in sample REQUEST body. There are no required values.\n - For PATCH, resource-id which is a required REQUEST body element for PUT, must not be sent.\n - PATCH cannot be used to update relationship elements; there are dedicated PUT operations for this.\n operationId: UpdateNetworkGenericVnfsGenericVnf\n consumes:\n - application/json\n produces:\n - application/json\n responses:\n \"default\":\n null parameters:\n - name: vnf-id\n in: path\n description: Unique id of VNF. This is unique across the graph.\n required: true\n type: string\n example: __VNF-ID__ - name: body\n in: body\n description: generic-vnf object that needs to be updated.[See Examples](apidocs/aai/relations/v16/NetworkGenericVnfsGenericVnf.json)\n required: true\n schema:\n $ref: \"#/definitions/generic-vnf\"\n"},
// if ( StringUtils.isEmpty(tag) )
{"GenericVnf","generic-vnf","","/generic-vnf/{vnf-id}"," - name: vnf-id\n in: path\n description: Unique id of VNF. This is unique across the graph.\n required: true\n type: string\n example: __VNF-ID__",""},
// Test: if ( !path.endsWith("/relationship") && !path.endsWith("}") )
@@ -75,7 +75,7 @@ public class PatchOperationTest {
@Test
public void testToString() {
- PatchOperation patch = new PatchOperation(useOpId, xmlRootElementName, tag, path, pathParams, v);
+ PatchOperation patch = new PatchOperation(useOpId, xmlRootElementName, tag, path, pathParams, v, "/aai" );
String modResult = patch.toString();
assertThat(modResult, is(this.result));
}
diff --git a/aai-schema-gen/src/test/java/org/onap/aai/schemagen/genxsd/PutOperationTest.java b/aai-schema-gen/src/test/java/org/onap/aai/schemagen/genxsd/PutOperationTest.java
index 1b073d9..0a60b7f 100644
--- a/aai-schema-gen/src/test/java/org/onap/aai/schemagen/genxsd/PutOperationTest.java
+++ b/aai-schema-gen/src/test/java/org/onap/aai/schemagen/genxsd/PutOperationTest.java
@@ -45,7 +45,7 @@ public class PutOperationTest {
@Parameters
public static Collection<String []> testConditions() {
String inputs [][] = {
- {"NetworkGenericVnfsGenericVnf","generic-vnf","Network","/network/generic-vnfs/generic-vnf/{vnf-id}"," - name: vnf-id\n in: path\n description: Unique id of VNF. This is unique across the graph.\n required: true\n type: string\n example: __VNF-ID__"," put:\n tags:\n - Network\n summary: create or update an existing generic-vnf\n description: |\n Create or update an existing generic-vnf.\n #\n Note! This PUT method has a corresponding PATCH method that can be used to update just a few of the fields of an existing object, rather than a full object replacement. An example can be found in the [PATCH section] below\n operationId: createOrUpdateNetworkGenericVnfsGenericVnf\n consumes:\n - application/json\n - application/xml\n produces:\n - application/json\n - application/xml\n responses:\n \"default\":\n null parameters:\n - name: vnf-id\n in: path\n description: Unique id of VNF. This is unique across the graph.\n required: true\n type: string\n example: __VNF-ID__ - name: body\n in: body\n description: generic-vnf object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/"+v.toString()+"/NetworkGenericVnfsGenericVnf.json)\n required: true\n schema:\n $ref: \"#/definitions/generic-vnf\"\n"},
+ {"NetworkGenericVnfsGenericVnf","generic-vnf","Network","/network/generic-vnfs/generic-vnf/{vnf-id}"," - name: vnf-id\n in: path\n description: Unique id of VNF. This is unique across the graph.\n required: true\n type: string\n example: __VNF-ID__"," put:\n tags:\n - Network\n summary: create or update an existing generic-vnf\n description: |\n Create or update an existing generic-vnf.\n #\n Note! This PUT method has a corresponding PATCH method that can be used to update just a few of the fields of an existing object, rather than a full object replacement. An example can be found in the [PATCH section] below\n operationId: createOrUpdateNetworkGenericVnfsGenericVnf\n consumes:\n - application/json\n - application/xml\n produces:\n - application/json\n - application/xml\n responses:\n \"default\":\n null parameters:\n - name: vnf-id\n in: path\n description: Unique id of VNF. This is unique across the graph.\n required: true\n type: string\n example: __VNF-ID__ - name: body\n in: body\n description: generic-vnf object that needs to be created or updated. [Valid relationship examples shown here](apidocs/aai/relations/"+v.toString()+"/NetworkGenericVnfsGenericVnf.json)\n required: true\n schema:\n $ref: \"#/definitions/generic-vnf\"\n"},
// if ( StringUtils.isEmpty(tag) )
{"GenericVnf","generic-vnf","","/generic-vnf/{vnf-id}"," - name: vnf-id\n in: path\n description: Unique id of VNF. This is unique across the graph.\n required: true\n type: string\n example: __VNF-ID__",""},
// Test: if ( !path.endsWith("/relationship") && !path.endsWith("}") )
@@ -75,7 +75,7 @@ public class PutOperationTest {
@Test
public void testToString() {
- PutOperation put = new PutOperation(useOpId, xmlRootElementName, tag, path, pathParams, v);
+ PutOperation put = new PutOperation(useOpId, xmlRootElementName, tag, path, pathParams, v, "/aai");
String modResult = put.toString();
assertThat(modResult, is(this.result));
}
diff --git a/aai-schema-gen/src/test/java/org/onap/aai/schemagen/genxsd/YAMLfromOXMTest.java b/aai-schema-gen/src/test/java/org/onap/aai/schemagen/genxsd/YAMLfromOXMTest.java
index 2ccf051..ad4f055 100644
--- a/aai-schema-gen/src/test/java/org/onap/aai/schemagen/genxsd/YAMLfromOXMTest.java
+++ b/aai-schema-gen/src/test/java/org/onap/aai/schemagen/genxsd/YAMLfromOXMTest.java
@@ -313,7 +313,7 @@ public class YAMLfromOXMTest {
sb.append("info:" + OxmFileProcessor.LINE_SEPARATOR);
sb.append(" description: |\n");
sb.append("\n");
- sb.append(" [Differences versus the previous schema version](apidocs/aai_swagger_v11.diff)" + OxmFileProcessor.DOUBLE_LINE_SEPARATOR);
+ sb.append(" [Differences versus the previous schema version](apidocs/aai/aai_swagger_v11.diff)" + OxmFileProcessor.DOUBLE_LINE_SEPARATOR);
sb.append(" Copyright &copy; 2017-18 AT&amp;T Intellectual Property. All rights reserved." + OxmFileProcessor.DOUBLE_LINE_SEPARATOR);
sb.append(" Licensed under the Creative Commons License, Attribution 4.0 Intl. (the &quot;License&quot;); you may not use this documentation except in compliance with the License." + OxmFileProcessor.DOUBLE_LINE_SEPARATOR);
sb.append(" You may obtain a copy of the License at\n");
@@ -401,7 +401,7 @@ public class YAMLfromOXMTest {
sb.append(" example: __SERVICE-TYPE__\n");
sb.append(" - name: body\n");
sb.append(" in: body\n");
- sb.append(" description: service-subscription object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v11/BusinessCustomersCustomerServiceSubscriptionsServiceSubscription.json)\n");
+ sb.append(" description: service-subscription object that needs to be created or updated. [Valid relationship examples shown here](apidocs/aai/relations/v11/BusinessCustomersCustomerServiceSubscriptionsServiceSubscription.json)\n");
sb.append(" required: true\n");
sb.append(" schema:\n");
sb.append(" $ref: \"#/definitions/service-subscription\"\n");
@@ -444,7 +444,7 @@ public class YAMLfromOXMTest {
sb.append(" - name: body\n");
sb.append(" in: body\n");
sb.append(" description: service-subscription object that needs to be updated.");
- sb.append("[See Examples](apidocs/relations/v11/BusinessCustomersCustomerServiceSubscriptionsServiceSubscription.json)\n");
+ sb.append("[See Examples](apidocs/aai/relations/v11/BusinessCustomersCustomerServiceSubscriptionsServiceSubscription.json)\n");
sb.append(" required: true\n");
sb.append(" schema:\n");
sb.append(" $ref: \"#/definitions/zzzz-patch-service-subscription\"\n");
@@ -557,7 +557,7 @@ public class YAMLfromOXMTest {
sb.append(" example: __GLOBAL-CUSTOMER-ID__\n");
sb.append(" - name: body\n");
sb.append(" in: body\n");
- sb.append(" description: customer object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v11/BusinessCustomersCustomer.json)\n");
+ sb.append(" description: customer object that needs to be created or updated. [Valid relationship examples shown here](apidocs/aai/relations/v11/BusinessCustomersCustomer.json)\n");
sb.append(" required: true\n");
sb.append(" schema:\n");
sb.append(" $ref: \"#/definitions/customer\"\n");
@@ -594,7 +594,7 @@ public class YAMLfromOXMTest {
sb.append(" - name: body\n");
sb.append(" in: body\n");
sb.append(" description: customer object that needs to be updated.");
- sb.append("[See Examples](apidocs/relations/v11/BusinessCustomersCustomer.json)\n");
+ sb.append("[See Examples](apidocs/aai/relations/v11/BusinessCustomersCustomer.json)\n");
sb.append(" required: true\n");
sb.append(" schema:\n");
sb.append(" $ref: \"#/definitions/zzzz-patch-customer\"\n");
diff --git a/aai-schema-service/pom.xml b/aai-schema-service/pom.xml
index 6b048d4..07cbfff 100644
--- a/aai-schema-service/pom.xml
+++ b/aai-schema-service/pom.xml
@@ -72,7 +72,7 @@
<schema.version.app.root.start>v11</schema.version.app.root.start>
<schema.version.namespace.change.start>v12</schema.version.namespace.change.start>
<schema.version.edge.label.start>v12</schema.version.edge.label.start>
- <schema.version.api.default>v19</schema.version.api.default>
+ <schema.version.api.default>v20</schema.version.api.default>
<schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20</schema.version.list>
<schema.uri.base.path>/aai/schema-service</schema.uri.base.path>
<!-- End of Default ONAP Schema Properties -->
@@ -184,7 +184,7 @@
<properties>
<schema.source.name>onap</schema.source.name>
<schema.version.namespace.change.start>v12</schema.version.namespace.change.start>
- <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,18,v19</schema.version.list>
+ <schema.version.list>v10,v11,v12,v13,v14,v15,v16,v17,18,v19,v20</schema.version.list>
</properties>
</profile>
<!-- End of ONAP Profile -->
diff --git a/aai-schema-service/src/main/assembly/descriptor.xml b/aai-schema-service/src/main/assembly/descriptor.xml
index 2c33dd0..a4399da 100644
--- a/aai-schema-service/src/main/assembly/descriptor.xml
+++ b/aai-schema-service/src/main/assembly/descriptor.xml
@@ -13,6 +13,7 @@
<includes>
<include>**/*</include>
</includes>
+ <fileMode>755</fileMode>
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/scripts</directory>
@@ -20,6 +21,7 @@
<includes>
<include>**/*</include>
</includes>
+ <fileMode>777</fileMode>
</fileSet>
<fileSet>
<directory>${project.build.directory}</directory>
@@ -27,6 +29,7 @@
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
+ <fileMode>755</fileMode>
</fileSet>
</fileSets>
</assembly>
diff --git a/aai-schema-service/src/main/resources/application.properties b/aai-schema-service/src/main/resources/application.properties
index ea8934f..c586bfd 100644
--- a/aai-schema-service/src/main/resources/application.properties
+++ b/aai-schema-service/src/main/resources/application.properties
@@ -49,7 +49,7 @@ schema.ingest.file=${server.local.startpath}/application.properties
schema.uri.base.path=/aai/schema-service
# Lists all of the versions in the schema
-schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19
+schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20
# Specifies from which version should the depth parameter to default to zero
schema.version.depth.start=v10
# Specifies from which version should the related link be displayed in response payload
@@ -62,4 +62,4 @@ schema.version.namespace.change.start=v12
# Specifies from which version should the client start seeing the edge label in payload
schema.version.edge.label.start=v12
# Specifies the version that the application should default to
-schema.version.api.default=v19
+schema.version.api.default=v20
diff --git a/aai-schema-service/src/main/scripts/common_functions.sh b/aai-schema-service/src/main/scripts/common_functions.sh
index 7dfda25..dd235c2 100644
--- a/aai-schema-service/src/main/scripts/common_functions.sh
+++ b/aai-schema-service/src/main/scripts/common_functions.sh
@@ -36,7 +36,6 @@ check_user(){
# Sources the profile and sets the project home
source_profile(){
- . /etc/profile.d/aai.sh
PROJECT_HOME=/opt/app/aai-schema-service
}
diff --git a/aai-schema-service/src/main/scripts/getTool.sh b/aai-schema-service/src/main/scripts/getTool.sh
index 9b8b26e..1241145 100644
--- a/aai-schema-service/src/main/scripts/getTool.sh
+++ b/aai-schema-service/src/main/scripts/getTool.sh
@@ -58,7 +58,7 @@ if [ "${userid}" != "aaiadmin" ]; then
exit 1
fi
-. /etc/profile.d/aai.sh
+
PROJECT_HOME=/opt/app/aai-schema-service
prop_file=$PROJECT_HOME/resources/etc/appprops/aaiconfig.properties
log_dir=$PROJECT_HOME/logs/misc
diff --git a/aai-schema-service/src/test/java/org/onap/aai/schemaservice/SchemaServiceTest.java b/aai-schema-service/src/test/java/org/onap/aai/schemaservice/SchemaServiceTest.java
index 308f43b..5b24be2 100644
--- a/aai-schema-service/src/test/java/org/onap/aai/schemaservice/SchemaServiceTest.java
+++ b/aai-schema-service/src/test/java/org/onap/aai/schemaservice/SchemaServiceTest.java
@@ -105,7 +105,7 @@ public class SchemaServiceTest {
ResponseEntity responseEntity;
responseEntity = restTemplate.exchange(
- baseUrl + "/aai/schema-service/v1/nodes?version=v19",
+ baseUrl + "/aai/schema-service/v1/nodes?version=v20",
HttpMethod.GET,
httpEntity,
String.class
@@ -117,7 +117,7 @@ public class SchemaServiceTest {
httpEntity = new HttpEntity(headers);
responseEntity = restTemplate.exchange(
- baseUrl + "/aai/schema-service/v1/edgerules?version=v19",
+ baseUrl + "/aai/schema-service/v1/edgerules?version=v20",
HttpMethod.GET,
httpEntity,
String.class
diff --git a/aai-schema-service/src/test/resources/application-test.properties b/aai-schema-service/src/test/resources/application-test.properties
index e80397f..bad8309 100644
--- a/aai-schema-service/src/test/resources/application-test.properties
+++ b/aai-schema-service/src/test/resources/application-test.properties
@@ -40,7 +40,7 @@ schema.ingest.file=${server.local.startpath}/application.properties
# Schema Version Related Attributes
schema.uri.base.path=/aai/schema-service
# Lists all of the versions in the schema
-schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19
+schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20
# Specifies from which version should the depth parameter to default to zero
schema.version.depth.start=v10
# Specifies from which version should the related link be displayed in response payload
@@ -53,4 +53,4 @@ schema.version.namespace.change.start=v12
# Specifies from which version should the client start seeing the edge label in payload
schema.version.edge.label.start=v12
# Specifies the version that the application should default to
-schema.version.api.default=v19
+schema.version.api.default=v20
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 d304f90..1eb1a59 100644
--- 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
@@ -3996,7 +3996,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(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -4183,7 +4183,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(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -4611,7 +4611,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(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -5509,7 +5509,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(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}",requiredProps="pnf-name,in-maint")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}",requiredProps="pnf-name,in-maint")</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 69df34d..8b0dca8 100644
--- 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
@@ -2812,7 +2812,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(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -4821,7 +4821,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(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -5008,7 +5008,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(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -5535,7 +5535,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(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -6510,7 +6510,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(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}",requiredProps="pnf-name,in-maint")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}",requiredProps="pnf-name,in-maint")</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 1174be8..06bc2ae 100644
--- 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
@@ -3007,7 +3007,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(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -5023,7 +5023,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(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -5210,7 +5210,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(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -5737,7 +5737,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(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -6712,7 +6712,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(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}",requiredProps="pnf-name,in-maint")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}",requiredProps="pnf-name,in-maint")</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 95ee174..21b90e3 100644
--- 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
@@ -3007,7 +3007,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(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -5002,7 +5002,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(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -5189,7 +5189,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(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -5709,7 +5709,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(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -6691,7 +6691,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(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status,model-invariant-id,model-version-id",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}",requiredProps="pnf-name,in-maint")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,inv-status,model-invariant-id,model-version-id",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}",requiredProps="pnf-name,in-maint")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -7266,7 +7266,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(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,description,instance-group-type")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,description,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,description,instance-group-type")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -7938,7 +7938,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(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri,aai-uuid",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid")</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 c133411..8c6abd7 100644
--- 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
@@ -2448,7 +2448,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(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,networkRef,operational-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",requiredProps="interface-name,in-maint")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,network-ref,operational-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",requiredProps="interface-name,in-maint")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -3196,7 +3196,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(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -5356,7 +5356,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(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -5543,7 +5543,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(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -6118,7 +6118,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(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -7107,7 +7107,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(description="Software Version",indexedProps="softwareVersionId,isActiveSwVer",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Software Version",indexedProps="software-version-id,is-active-sw-ver",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -7144,7 +7144,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(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status,model-invariant-id,model-version-id,operational-status,admin-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}",requiredProps="pnf-name,in-maint")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,inv-status,model-invariant-id,model-version-id,operational-status,admin-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network",uriTemplate="/network/pnfs/pnf/{pnf-name}",requiredProps="pnf-name,in-maint")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -7755,7 +7755,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(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v15.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v15.xsd
index 66593d5..a501935 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v15.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v15.xsd
@@ -2462,7 +2462,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(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,networkRef,operational-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",requiredProps="interface-name,in-maint")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,network-ref,operational-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",requiredProps="interface-name,in-maint")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -3210,7 +3210,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(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -5370,7 +5370,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(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -5557,7 +5557,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(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -6191,7 +6191,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(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -7181,7 +7181,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(description="Software Version",indexedProps="softwareVersionId,isActiveSwVer",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Software Version",indexedProps="software-version-id,is-active-sw-ver",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -7906,7 +7906,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(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -9762,7 +9762,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(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri,aai-uuid",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd
index 76b94da..2e9e2bd 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd
@@ -2476,7 +2476,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(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,networkRef,operational-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",requiredProps="interface-name,in-maint")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,network-ref,operational-status",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",requiredProps="interface-name,in-maint")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -3270,7 +3270,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(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -5431,7 +5431,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(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,switch-name",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -5618,7 +5618,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(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -6252,7 +6252,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(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -7242,7 +7242,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(description="Software Version",indexedProps="softwareVersionId,isActiveSwVer",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Software Version",indexedProps="software-version-id,is-active-sw-ver",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -7967,7 +7967,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(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -9837,7 +9837,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(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri,aai-uuid",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v17.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v17.xsd
index 78a323a..023579d 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v17.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v17.xsd
@@ -2476,7 +2476,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(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,networkRef,operational-status,interface-role",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",requiredProps="interface-name,in-maint",dslStartNodeProps="interface-name")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,network-ref,operational-status,interface-role",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",requiredProps="interface-name,in-maint",dslStartNodeProps="interface-name")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -3270,7 +3270,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(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}",dslStartNodeProps="sdnc-id")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}",dslStartNodeProps="sdnc-id")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -5438,7 +5438,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(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-nameinterface-role,orchestration-status",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status",dslStartNodeProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,switch-name,interface-role,orchestration-status",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status",dslStartNodeProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -5625,7 +5625,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(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type",dslStartNodeProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,service-id")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type",dslStartNodeProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,service-id")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -6259,7 +6259,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(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,orchestration-status",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network",dslStartNodeProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,orchestration-status",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network",dslStartNodeProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -7249,7 +7249,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(description="Software Version",indexedProps="softwareVersionId,isActiveSwVer",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}",dslStartNodeProps="softwareVersionId,isActiveSwVer")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Software Version",indexedProps="software-version-id,is-active-sw-ver",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}",dslStartNodeProps="softwareVersionId,isActiveSwVer")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -7974,7 +7974,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(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -9844,7 +9844,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(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri,aai-uuid",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v18.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v18.xsd
index 2a9e671..9410a91 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v18.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v18.xsd
@@ -2476,7 +2476,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(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,networkRef,operational-status,interface-role,interface-name2",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",searchable="interface-name",requiredProps="interface-name,in-maint",dslStartNodeProps="interface-name,interface-type,interface-role,interface-function")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,network-ref,operational-status,interface-role,interface-name2",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",searchable="interface-name",requiredProps="interface-name,in-maint",dslStartNodeProps="interface-name,interface-type,interface-role,interface-function")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -3277,7 +3277,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(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}",dslStartNodeProps="sdnc-id")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}",dslStartNodeProps="sdnc-id")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -5445,7 +5445,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(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name,interface-role,orchestration-status",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status",dslStartNodeProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,switch-name,interface-role,orchestration-status",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status",dslStartNodeProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -5632,7 +5632,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(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type",dslStartNodeProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,service-id")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type",dslStartNodeProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,service-id")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -6266,7 +6266,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(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,orchestration-status",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network",dslStartNodeProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,orchestration-status",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network",dslStartNodeProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -7263,7 +7263,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(description="Software Version",indexedProps="softwareVersionId,isActiveSwVer",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}",dslStartNodeProps="softwareVersionId,isActiveSwVer")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Software Version",indexedProps="software-version-id,is-active-sw-ver",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}",dslStartNodeProps="softwareVersionId,isActiveSwVer")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -7995,7 +7995,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(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -9893,7 +9893,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(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri,aai-uuid",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd
index c7f0a29..6320725 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd
@@ -2648,7 +2648,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(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,networkRef,operational-status,interface-role,interface-name2",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",searchable="interface-name",requiredProps="interface-name,in-maint",dslStartNodeProps="interface-name,interface-type,interface-role,interface-function")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,network-ref,operational-status,interface-role,interface-name2",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",searchable="interface-name",requiredProps="interface-name,in-maint",dslStartNodeProps="interface-name,interface-type,interface-role,interface-function")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -3477,7 +3477,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(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}",dslStartNodeProps="sdnc-id")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}",dslStartNodeProps="sdnc-id")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -6133,7 +6133,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(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name,interface-role,orchestration-status",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status",dslStartNodeProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,switch-name,interface-role,orchestration-status",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status",dslStartNodeProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -6230,7 +6230,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(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid,projectNumber,orderNumber,receiptDate",dependentOn="generic-vnf,vce",container="licenses",uriTemplate="/licenses/license/{group-uuid}/{resource-uuid}",requiredProps="group-uuid,resource-uuid")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid,project-number,order-number,receipt-date",dependentOn="generic-vnf,vce",container="licenses",uriTemplate="/licenses/license/{group-uuid}/{resource-uuid}",requiredProps="group-uuid,resource-uuid")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -6341,7 +6341,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(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type",dslStartNodeProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,service-id")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type",dslStartNodeProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,service-id")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -6975,7 +6975,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(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,orchestration-status",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network",dslStartNodeProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,orchestration-status",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network",dslStartNodeProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -7979,7 +7979,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(description="Software Version",indexedProps="softwareVersionId,isActiveSwVer",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}",dslStartNodeProps="softwareVersionId,isActiveSwVer")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Software Version",indexedProps="software-version-id,is-active-sw-ver",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}",dslStartNodeProps="softwareVersionId,isActiveSwVer")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -8718,7 +8718,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(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -11161,7 +11161,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(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri,aai-uuid",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd
index ea1273b..9e17c47 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd
@@ -1297,6 +1297,9 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
</xs:appinfo>
</xs:annotation>
</xs:element>
+ <xs:element ref="tns:volumes" minOccurs="0"/>
+ <xs:element ref="tns:relationship-list" minOccurs="0"/>
+ <xs:element ref="tns:l-interfaces" minOccurs="0"/>
<xs:element name="operational-status" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:appinfo>
@@ -1304,9 +1307,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
</xs:appinfo>
</xs:annotation>
</xs:element>
- <xs:element ref="tns:volumes" minOccurs="0"/>
- <xs:element ref="tns:relationship-list" minOccurs="0"/>
- <xs:element ref="tns:l-interfaces" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -2662,7 +2662,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(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,networkRef,operational-status,interface-role,interface-name2",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",searchable="interface-name",requiredProps="interface-name,in-maint")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name,prov-status,network-ref,operational-status,interface-role,interface-name2",nameProps="prov-status",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces",uriTemplate="/p-interfaces/p-interface/{interface-name}",searchable="interface-name",requiredProps="interface-name,in-maint")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -3498,7 +3498,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(description="Persist SDNC address information used by ONAP SDNC.",indexedProps="sdnc-id",searchable="sdnc-id",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Persist SDNC address information used by ONAP SDNC.",container="esr-thirdparty-sdnc-list",namespace="external-system",requiredProps="thirdparty-sdnc-id",uriTemplate="/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -4437,13 +4437,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
</xs:appinfo>
</xs:annotation>
</xs:element>
- <xs:element name="operational-status" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:appinfo>
- <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational. Valid values are in-service-path and out-of-service-path.",suggestibleOnSearch="true")</annox:annotate>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
<xs:element ref="tns:relationship-list" minOccurs="0"/>
<xs:element ref="tns:metadata" minOccurs="0"/>
<xs:element ref="tns:allotted-resources" minOccurs="0"/>
@@ -4457,6 +4450,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
</xs:appinfo>
</xs:annotation>
</xs:element>
+ <xs:element name="operational-status" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational. Valid values are in-service-path and out-of-service-path.",suggestibleOnSearch="true")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -6154,7 +6154,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(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name,interface-role,orchestration-status",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,switch-name,interface-role,orchestration-status",dependentOn="vce",container="port-groups",uriTemplate="/port-groups/port-group/{interface-id}",requiredProps="interface-id,orchestration-status")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -6251,7 +6251,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(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid,projectNumber,orderNumber,receiptDate",dependentOn="generic-vnf,vce",container="licenses",uriTemplate="/licenses/license/{group-uuid}/{resource-uuid}",requiredProps="group-uuid,resource-uuid")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Metadata for license group.",indexedProps="group-uuid,resource-uuid,project-number,order-number,receipt-date",dependentOn="generic-vnf,vce",container="licenses",uriTemplate="/licenses/license/{group-uuid}/{resource-uuid}",requiredProps="group-uuid,resource-uuid")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -6362,7 +6362,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(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf",uriTemplate="/network/vces/vce/{vnf-id}",requiredProps="vnf-id,vnf-name,vnf-type")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -6996,7 +6996,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(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,orchestration-status",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,orchestration-status",searchable="network-id,network-name",uniqueProps="network-id",container="l3-networks",namespace="network",uriTemplate="/network/l3-networks/l3-network/{network-id}",requiredProps="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -7377,6 +7377,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
</xs:appinfo>
</xs:annotation>
</xs:element>
+ <xs:element ref="tns:relationship-list" minOccurs="0"/>
<xs:element name="operational-status" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:appinfo>
@@ -7384,7 +7385,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
</xs:appinfo>
</xs:annotation>
</xs:element>
- <xs:element ref="tns:relationship-list" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -8007,7 +8007,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(description="Software Version",indexedProps="softwareVersionId,isActiveSwVer",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Software Version",indexedProps="software-version-id,is-active-sw-ver",dependentOn="pnf",container="pnf",requiredProps="software-version-id,is-active-sw-ver",uriTemplate="/pnf/software-version/{software-version-id}")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -8739,7 +8739,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(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -10637,7 +10637,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(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri,aai-uuid",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
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 16ae415..9121ca5 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
@@ -1559,6 +1559,29 @@
"prevent-delete": "NONE",
"default": "true",
"description":""
+ },{
+ "from": "pnf",
+ "to": "instance-group",
+ "label": "org.onap.relationships.inventory.Primary",
+ "direction": "OUT",
+ "multiplicity": "MANY2MANY",
+ "contains-other-v": "NONE",
+ "delete-other-v": "NONE",
+ "prevent-delete": "NONE",
+ "default": "false",
+ "description":""
+ },
+ {
+ "from": "pnf",
+ "to": "instance-group",
+ "label": "org.onap.relationships.inventory.Secondary",
+ "direction": "OUT",
+ "multiplicity": "MANY2MANY",
+ "contains-other-v": "NONE",
+ "delete-other-v": "NONE",
+ "prevent-delete": "NONE",
+ "default": "false",
+ "description":""
},
{
"from": "pnf",
@@ -3065,6 +3088,30 @@
"description":""
},
{
+ "from": "generic-vnf",
+ "to": "instance-group",
+ "label": "org.onap.relationships.inventory.Primary",
+ "direction": "OUT",
+ "multiplicity": "ONE2MANY",
+ "contains-other-v": "NONE",
+ "delete-other-v": "NONE",
+ "prevent-delete": "NONE",
+ "default": "false",
+ "description":""
+ },
+ {
+ "from": "generic-vnf",
+ "to": "instance-group",
+ "label": "org.onap.relationships.inventory.Secondary",
+ "direction": "OUT",
+ "multiplicity": "ONE2MANY",
+ "contains-other-v": "NONE",
+ "delete-other-v": "NONE",
+ "prevent-delete": "NONE",
+ "default": "false",
+ "description":""
+ },
+ {
"from": "instance-group",
"to": "generic-vnf",
"label": "org.onap.relationships.inventory.BelongsTo",
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 88bfd31..c2c53dd 100644
--- 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
@@ -3013,7 +3013,7 @@
<xml-properties>
<xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated."/>
<xml-property name="nameProps" value="vnf-name"/>
- <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/>
+ <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id"/>
<xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/>
<xml-property name="uniqueProps" value="vnf-id"/>
<xml-property name="container" value="vces"/>
@@ -3095,7 +3095,7 @@
<xml-properties>
<xml-property name="description" value="Used to capture the network interfaces of this VCE"/>
<xml-property name="nameProps" value="port-group-name"/>
- <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name"/>
+ <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name"/>
<xml-property name="dependentOn" value="vce"/>
<xml-property name="container" value="port-groups"/>
<xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/>
@@ -3377,7 +3377,7 @@
<xml-properties>
<xml-property name="description" value="Generic network definition"/>
<xml-property name="nameProps" value="network-name"/>
- <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/>
+ <xml-property name="indexedProps" value="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/>
<xml-property name="searchable" value="network-id,network-name"/>
<xml-property name="uniqueProps" value="network-id"/>
<xml-property name="container" value="l3-networks"/>
@@ -4199,7 +4199,7 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE."/>
- <xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status"/>
+ <xml-property name="indexedProps" value="pnf-name,inv-status"/>
<xml-property name="searchable" value="pnf-name"/>
<xml-property name="uniqueProps" value="pnf-name"/>
<xml-property name="container" value="pnfs"/>
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 5df8b38..3f3a1bf 100644
--- 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
@@ -360,8 +360,6 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Persist SDNC address information used by ONAP SDNC."/>
- <xml-property name="indexedProps" value="sdnc-id"/>
- <xml-property name="searchable" value="sdnc-id"/>
<xml-property name="container" value="esr-thirdparty-sdnc-list"/>
<xml-property name="namespace" value="external-system"/>
<xml-property name="requiredProps" value="thirdparty-sdnc-id"/>
@@ -3662,7 +3660,7 @@
<xml-properties>
<xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated."/>
<xml-property name="nameProps" value="vnf-name"/>
- <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/>
+ <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id"/>
<xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/>
<xml-property name="uniqueProps" value="vnf-id"/>
<xml-property name="container" value="vces"/>
@@ -3744,7 +3742,7 @@
<xml-properties>
<xml-property name="description" value="Used to capture the network interfaces of this VCE"/>
<xml-property name="nameProps" value="port-group-name"/>
- <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name"/>
+ <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name"/>
<xml-property name="dependentOn" value="vce"/>
<xml-property name="container" value="port-groups"/>
<xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/>
@@ -4048,7 +4046,7 @@
<xml-properties>
<xml-property name="description" value="Generic network definition"/>
<xml-property name="nameProps" value="network-name"/>
- <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/>
+ <xml-property name="indexedProps" value="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/>
<xml-property name="searchable" value="network-id,network-name"/>
<xml-property name="uniqueProps" value="network-id"/>
<xml-property name="container" value="l3-networks"/>
@@ -4943,7 +4941,7 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE."/>
- <xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status"/>
+ <xml-property name="indexedProps" value="pnf-name,inv-status"/>
<xml-property name="searchable" value="pnf-name"/>
<xml-property name="uniqueProps" value="pnf-name"/>
<xml-property name="container" value="pnfs"/>
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 f260850..7320b47 100644
--- 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
@@ -340,8 +340,6 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Persist SDNC address information used by ONAP SDNC."/>
- <xml-property name="indexedProps" value="sdnc-id"/>
- <xml-property name="searchable" value="sdnc-id"/>
<xml-property name="container" value="esr-thirdparty-sdnc-list"/>
<xml-property name="namespace" value="external-system"/>
<xml-property name="requiredProps" value="thirdparty-sdnc-id"/>
@@ -3755,7 +3753,7 @@
<xml-properties>
<xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated."/>
<xml-property name="nameProps" value="vnf-name"/>
- <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/>
+ <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id"/>
<xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/>
<xml-property name="uniqueProps" value="vnf-id"/>
<xml-property name="container" value="vces"/>
@@ -3837,7 +3835,7 @@
<xml-properties>
<xml-property name="description" value="Used to capture the network interfaces of this VCE"/>
<xml-property name="nameProps" value="port-group-name"/>
- <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name"/>
+ <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name"/>
<xml-property name="dependentOn" value="vce"/>
<xml-property name="container" value="port-groups"/>
<xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/>
@@ -4141,7 +4139,7 @@
<xml-properties>
<xml-property name="description" value="Generic network definition"/>
<xml-property name="nameProps" value="network-name"/>
- <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/>
+ <xml-property name="indexedProps" value="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/>
<xml-property name="searchable" value="network-id,network-name"/>
<xml-property name="uniqueProps" value="network-id"/>
<xml-property name="container" value="l3-networks"/>
@@ -5041,7 +5039,7 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE."/>
- <xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status"/>
+ <xml-property name="indexedProps" value="pnf-name,inv-status"/>
<xml-property name="searchable" value="pnf-name"/>
<xml-property name="uniqueProps" value="pnf-name"/>
<xml-property name="container" value="pnfs"/>
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 9f74c54..e963d5e 100644
--- 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
@@ -360,8 +360,6 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Persist SDNC address information used by ONAP SDNC."/>
- <xml-property name="indexedProps" value="sdnc-id"/>
- <xml-property name="searchable" value="sdnc-id"/>
<xml-property name="container" value="esr-thirdparty-sdnc-list"/>
<xml-property name="namespace" value="external-system"/>
<xml-property name="requiredProps" value="thirdparty-sdnc-id"/>
@@ -3755,7 +3753,7 @@
<xml-properties>
<xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated."/>
<xml-property name="nameProps" value="vnf-name"/>
- <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/>
+ <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id"/>
<xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/>
<xml-property name="uniqueProps" value="vnf-id"/>
<xml-property name="container" value="vces"/>
@@ -3837,7 +3835,7 @@
<xml-properties>
<xml-property name="description" value="Used to capture the network interfaces of this VCE"/>
<xml-property name="nameProps" value="port-group-name"/>
- <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name"/>
+ <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name"/>
<xml-property name="dependentOn" value="vce"/>
<xml-property name="container" value="port-groups"/>
<xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/>
@@ -4135,7 +4133,7 @@
<xml-properties>
<xml-property name="description" value="Generic network definition"/>
<xml-property name="nameProps" value="network-name"/>
- <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/>
+ <xml-property name="indexedProps" value="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/>
<xml-property name="searchable" value="network-id,network-name"/>
<xml-property name="uniqueProps" value="network-id"/>
<xml-property name="container" value="l3-networks"/>
@@ -5059,7 +5057,7 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE."/>
- <xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status,model-invariant-id,model-version-id"/>
+ <xml-property name="indexedProps" value="pnf-name,inv-status,model-invariant-id,model-version-id"/>
<xml-property name="searchable" value="pnf-name"/>
<xml-property name="uniqueProps" value="pnf-name"/>
<xml-property name="container" value="pnfs"/>
@@ -5371,7 +5369,7 @@
<java-type name="ReservedPropNames">
<xml-properties>
<xml-property name="description" value="Internal map to define some reserved properties of a vertex"/>
- <xml-property name="uniqueProps" value="aai-unique-key,aai-uri,aai-uuid"/>
+ <xml-property name="uniqueProps" value="aai-unique-key,aai-uri"/>
<xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid"/>
</xml-properties>
<xml-root-element name="reserved-prop-names"/>
@@ -6104,7 +6102,7 @@
<xml-property name="nameProps" value="description,instance-group-name"/>
<xml-property name="uniqueProps" value="id"/>
<xml-property name="searchable" value="id,description"/>
- <xml-property name="indexedProps" value="id,description,type,sub-type,model-invariant-id,model-version-id"/>
+ <xml-property name="indexedProps" value="id,description,model-invariant-id,model-version-id"/>
<xml-property name="container" value="instance-groups"/>
<xml-property name="namespace" value="network"/>
<xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/>
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 a73f802..3fc2b16 100644
--- 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
@@ -360,8 +360,6 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Persist SDNC address information used by ONAP SDNC."/>
- <xml-property name="indexedProps" value="sdnc-id"/>
- <xml-property name="searchable" value="sdnc-id"/>
<xml-property name="container" value="esr-thirdparty-sdnc-list"/>
<xml-property name="namespace" value="external-system"/>
<xml-property name="requiredProps" value="thirdparty-sdnc-id"/>
@@ -2280,7 +2278,7 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Physical interface (e.g., nic)"/>
- <xml-property name="indexedProps" value="interface-name,prov-status,networkRef,operational-status"/>
+ <xml-property name="indexedProps" value="interface-name,prov-status,network-ref,operational-status"/>
<xml-property name="nameProps" value="prov-status"/>
<xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/>
<xml-property name="container" value="p-interfaces"/>
@@ -3936,7 +3934,7 @@
<xml-properties>
<xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated."/>
<xml-property name="nameProps" value="vnf-name"/>
- <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/>
+ <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id"/>
<xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/>
<xml-property name="uniqueProps" value="vnf-id"/>
<xml-property name="container" value="vces"/>
@@ -4018,7 +4016,7 @@
<xml-properties>
<xml-property name="description" value="Used to capture the network interfaces of this VCE"/>
<xml-property name="nameProps" value="port-group-name"/>
- <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name"/>
+ <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name"/>
<xml-property name="dependentOn" value="vce"/>
<xml-property name="container" value="port-groups"/>
<xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/>
@@ -4328,7 +4326,7 @@
<xml-properties>
<xml-property name="description" value="Generic network definition"/>
<xml-property name="nameProps" value="network-name"/>
- <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/>
+ <xml-property name="indexedProps" value="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/>
<xml-property name="searchable" value="network-id,network-name"/>
<xml-property name="uniqueProps" value="network-id"/>
<xml-property name="container" value="l3-networks"/>
@@ -5278,7 +5276,7 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE."/>
- <xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status,model-invariant-id,model-version-id,operational-status,admin-status"/>
+ <xml-property name="indexedProps" value="pnf-name,inv-status,model-invariant-id,model-version-id,operational-status,admin-status"/>
<xml-property name="searchable" value="pnf-name"/>
<xml-property name="uniqueProps" value="pnf-name"/>
<xml-property name="container" value="pnfs"/>
@@ -5314,7 +5312,7 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Software Version"/>
- <xml-property name="indexedProps" value="softwareVersionId,isActiveSwVer"/>
+ <xml-property name="indexedProps" value="software-version-id,is-active-sw-ver"/>
<xml-property name="dependentOn" value="pnf"/>
<xml-property name="container" value="pnf"/>
<xml-property name="requiredProps" value="software-version-id,is-active-sw-ver"/>
@@ -6355,7 +6353,7 @@
<xml-property name="nameProps" value="description,instance-group-name"/>
<xml-property name="uniqueProps" value="id"/>
<xml-property name="searchable" value="id,description"/>
- <xml-property name="indexedProps" value="id,type,sub-type,model-invariant-id,model-version-id"/>
+ <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id"/>
<xml-property name="container" value="instance-groups"/>
<xml-property name="namespace" value="network"/>
<xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/>
diff --git a/aai-schema/src/main/resources/onap/oxm/v15/aai_oxm_v15.xml b/aai-schema/src/main/resources/onap/oxm/v15/aai_oxm_v15.xml
index 64ea84d..1be48d1 100644
--- a/aai-schema/src/main/resources/onap/oxm/v15/aai_oxm_v15.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v15/aai_oxm_v15.xml
@@ -361,8 +361,6 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Persist SDNC address information used by ONAP SDNC."/>
- <xml-property name="indexedProps" value="sdnc-id"/>
- <xml-property name="searchable" value="sdnc-id"/>
<xml-property name="container" value="esr-thirdparty-sdnc-list"/>
<xml-property name="namespace" value="external-system"/>
<xml-property name="requiredProps" value="thirdparty-sdnc-id"/>
@@ -2291,7 +2289,7 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Physical interface (e.g., nic)"/>
- <xml-property name="indexedProps" value="interface-name,prov-status,networkRef,operational-status"/>
+ <xml-property name="indexedProps" value="interface-name,prov-status,network-ref,operational-status"/>
<xml-property name="nameProps" value="prov-status"/>
<xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/>
<xml-property name="container" value="p-interfaces"/>
@@ -4008,7 +4006,7 @@
<xml-properties>
<xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated."/>
<xml-property name="nameProps" value="vnf-name"/>
- <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/>
+ <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id"/>
<xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/>
<xml-property name="uniqueProps" value="vnf-id"/>
<xml-property name="container" value="vces"/>
@@ -4090,7 +4088,7 @@
<xml-properties>
<xml-property name="description" value="Used to capture the network interfaces of this VCE"/>
<xml-property name="nameProps" value="port-group-name"/>
- <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name"/>
+ <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name"/>
<xml-property name="dependentOn" value="vce"/>
<xml-property name="container" value="port-groups"/>
<xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/>
@@ -4401,7 +4399,7 @@
<xml-properties>
<xml-property name="description" value="Generic network definition"/>
<xml-property name="nameProps" value="network-name"/>
- <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/>
+ <xml-property name="indexedProps" value="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/>
<xml-property name="searchable" value="network-id,network-name"/>
<xml-property name="uniqueProps" value="network-id"/>
<xml-property name="container" value="l3-networks"/>
@@ -5393,7 +5391,7 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Software Version"/>
- <xml-property name="indexedProps" value="softwareVersionId,isActiveSwVer"/>
+ <xml-property name="indexedProps" value="software-version-id,is-active-sw-ver"/>
<xml-property name="dependentOn" value="pnf"/>
<xml-property name="container" value="pnf"/>
<xml-property name="requiredProps" value="software-version-id,is-active-sw-ver"/>
@@ -5703,8 +5701,8 @@
<java-type name="ReservedPropNames">
<xml-properties>
<xml-property name="description" value="Internal map to define some reserved properties of a vertex"/>
- <xml-property name="uniqueProps" value="aai-unique-key,aai-uri,aai-uuid"/>
- <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid"/>
+ <xml-property name="uniqueProps" value="aai-unique-key,aai-uri"/>
+ <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri"/>
</xml-properties>
<xml-root-element name="reserved-prop-names"/>
<java-attributes>
@@ -6434,7 +6432,7 @@
<xml-property name="nameProps" value="description,instance-group-name"/>
<xml-property name="uniqueProps" value="id"/>
<xml-property name="searchable" value="id,description"/>
- <xml-property name="indexedProps" value="id,type,sub-type,model-invariant-id,model-version-id"/>
+ <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id"/>
<xml-property name="container" value="instance-groups"/>
<xml-property name="namespace" value="network"/>
<xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/>
diff --git a/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml b/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml
index c77347d..795770b 100644
--- a/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml
@@ -405,8 +405,6 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Persist SDNC address information used by ONAP SDNC."/>
- <xml-property name="indexedProps" value="sdnc-id"/>
- <xml-property name="searchable" value="sdnc-id"/>
<xml-property name="container" value="esr-thirdparty-sdnc-list"/>
<xml-property name="namespace" value="external-system"/>
<xml-property name="requiredProps" value="thirdparty-sdnc-id"/>
@@ -2347,7 +2345,7 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Physical interface (e.g., nic)"/>
- <xml-property name="indexedProps" value="interface-name,prov-status,networkRef,operational-status"/>
+ <xml-property name="indexedProps" value="interface-name,prov-status,network-ref,operational-status"/>
<xml-property name="nameProps" value="prov-status"/>
<xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/>
<xml-property name="container" value="p-interfaces"/>
@@ -4064,7 +4062,7 @@
<xml-properties>
<xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated."/>
<xml-property name="nameProps" value="vnf-name"/>
- <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/>
+ <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id"/>
<xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/>
<xml-property name="uniqueProps" value="vnf-id"/>
<xml-property name="container" value="vces"/>
@@ -4146,7 +4144,7 @@
<xml-properties>
<xml-property name="description" value="Used to capture the network interfaces of this VCE"/>
<xml-property name="nameProps" value="port-group-name"/>
- <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name"/>
+ <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name"/>
<xml-property name="dependentOn" value="vce"/>
<xml-property name="container" value="port-groups"/>
<xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/>
@@ -4457,7 +4455,7 @@
<xml-properties>
<xml-property name="description" value="Generic network definition"/>
<xml-property name="nameProps" value="network-name"/>
- <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/>
+ <xml-property name="indexedProps" value="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/>
<xml-property name="searchable" value="network-id,network-name"/>
<xml-property name="uniqueProps" value="network-id"/>
<xml-property name="container" value="l3-networks"/>
@@ -5449,7 +5447,7 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Software Version"/>
- <xml-property name="indexedProps" value="softwareVersionId,isActiveSwVer"/>
+ <xml-property name="indexedProps" value="software-version-id,is-active-sw-ver"/>
<xml-property name="dependentOn" value="pnf"/>
<xml-property name="container" value="pnf"/>
<xml-property name="requiredProps" value="software-version-id,is-active-sw-ver"/>
@@ -5759,8 +5757,8 @@
<java-type name="ReservedPropNames">
<xml-properties>
<xml-property name="description" value="Internal map to define some reserved properties of a vertex"/>
- <xml-property name="uniqueProps" value="aai-unique-key,aai-uri,aai-uuid"/>
- <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid"/>
+ <xml-property name="uniqueProps" value="aai-unique-key,aai-uri"/>
+ <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri"/>
</xml-properties>
<xml-root-element name="reserved-prop-names"/>
<java-attributes>
@@ -6490,7 +6488,7 @@
<xml-property name="nameProps" value="description,instance-group-name"/>
<xml-property name="uniqueProps" value="id"/>
<xml-property name="searchable" value="id,description"/>
- <xml-property name="indexedProps" value="id,type,sub-type,model-invariant-id,model-version-id"/>
+ <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id"/>
<xml-property name="container" value="instance-groups"/>
<xml-property name="namespace" value="network"/>
<xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/>
diff --git a/aai-schema/src/main/resources/onap/oxm/v17/aai_oxm_v17.xml b/aai-schema/src/main/resources/onap/oxm/v17/aai_oxm_v17.xml
index 565f181..ef4b0c2 100644
--- a/aai-schema/src/main/resources/onap/oxm/v17/aai_oxm_v17.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v17/aai_oxm_v17.xml
@@ -408,8 +408,6 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Persist SDNC address information used by ONAP SDNC."/>
- <xml-property name="indexedProps" value="sdnc-id"/>
- <xml-property name="searchable" value="sdnc-id"/>
<xml-property name="container" value="esr-thirdparty-sdnc-list"/>
<xml-property name="namespace" value="external-system"/>
<xml-property name="requiredProps" value="thirdparty-sdnc-id"/>
@@ -2377,7 +2375,7 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Physical interface (e.g., nic)"/>
- <xml-property name="indexedProps" value="interface-name,prov-status,networkRef,operational-status,interface-role"/>
+ <xml-property name="indexedProps" value="interface-name,prov-status,network-ref,operational-status,interface-role"/>
<xml-property name="nameProps" value="prov-status"/>
<xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/>
<xml-property name="container" value="p-interfaces"/>
@@ -4120,7 +4118,7 @@
<xml-properties>
<xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated."/>
<xml-property name="nameProps" value="vnf-name"/>
- <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status"/>
+ <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status"/>
<xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/>
<xml-property name="uniqueProps" value="vnf-id"/>
<xml-property name="container" value="vces"/>
@@ -4203,7 +4201,7 @@
<xml-properties>
<xml-property name="description" value="Used to capture the network interfaces of this VCE"/>
<xml-property name="nameProps" value="port-group-name"/>
- <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-nameinterface-role,orchestration-status"/>
+ <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name,interface-role,orchestration-status"/>
<xml-property name="dependentOn" value="vce"/>
<xml-property name="container" value="port-groups"/>
<xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/>
@@ -4517,7 +4515,7 @@
<xml-properties>
<xml-property name="description" value="Generic network definition"/>
<xml-property name="nameProps" value="network-name"/>
- <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,orchestration-status"/>
+ <xml-property name="indexedProps" value="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,orchestration-status"/>
<xml-property name="searchable" value="network-id,network-name"/>
<xml-property name="uniqueProps" value="network-id"/>
<xml-property name="container" value="l3-networks"/>
@@ -5518,7 +5516,7 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Software Version"/>
- <xml-property name="indexedProps" value="softwareVersionId,isActiveSwVer"/>
+ <xml-property name="indexedProps" value="software-version-id,is-active-sw-ver"/>
<xml-property name="dependentOn" value="pnf"/>
<xml-property name="container" value="pnf"/>
<xml-property name="requiredProps" value="software-version-id,is-active-sw-ver"/>
@@ -5829,8 +5827,8 @@
<java-type name="ReservedPropNames">
<xml-properties>
<xml-property name="description" value="Internal map to define some reserved properties of a vertex"/>
- <xml-property name="uniqueProps" value="aai-unique-key,aai-uri,aai-uuid"/>
- <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid"/>
+ <xml-property name="uniqueProps" value="aai-unique-key,aai-uri"/>
+ <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri"/>
</xml-properties>
<xml-root-element name="reserved-prop-names"/>
<java-attributes>
@@ -6566,7 +6564,7 @@
<xml-property name="nameProps" value="description,instance-group-name"/>
<xml-property name="uniqueProps" value="id"/>
<xml-property name="searchable" value="id,description"/>
- <xml-property name="indexedProps" value="id,type,sub-type,model-invariant-id,model-version-id"/>
+ <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id"/>
<xml-property name="container" value="instance-groups"/>
<xml-property name="namespace" value="network"/>
<xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/>
diff --git a/aai-schema/src/main/resources/onap/oxm/v18/aai_oxm_v18.xml b/aai-schema/src/main/resources/onap/oxm/v18/aai_oxm_v18.xml
index 16e93d5..a770ba3 100644
--- a/aai-schema/src/main/resources/onap/oxm/v18/aai_oxm_v18.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v18/aai_oxm_v18.xml
@@ -408,8 +408,6 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Persist SDNC address information used by ONAP SDNC."/>
- <xml-property name="indexedProps" value="sdnc-id"/>
- <xml-property name="searchable" value="sdnc-id"/>
<xml-property name="container" value="esr-thirdparty-sdnc-list"/>
<xml-property name="namespace" value="external-system"/>
<xml-property name="requiredProps" value="thirdparty-sdnc-id"/>
@@ -2382,7 +2380,7 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Physical interface (e.g., nic)"/>
- <xml-property name="indexedProps" value="interface-name,prov-status,networkRef,operational-status,interface-role,interface-name2"/>
+ <xml-property name="indexedProps" value="interface-name,prov-status,network-ref,operational-status,interface-role,interface-name2"/>
<xml-property name="nameProps" value="prov-status"/>
<xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/>
<xml-property name="container" value="p-interfaces"/>
@@ -4145,7 +4143,7 @@
<xml-properties>
<xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated."/>
<xml-property name="nameProps" value="vnf-name"/>
- <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/>
+ <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id"/>
<xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/>
<xml-property name="uniqueProps" value="vnf-id"/>
<xml-property name="container" value="vces"/>
@@ -4228,7 +4226,7 @@
<xml-properties>
<xml-property name="description" value="Used to capture the network interfaces of this VCE"/>
<xml-property name="nameProps" value="port-group-name"/>
- <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name,interface-role,orchestration-status"/>
+ <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name,interface-role,orchestration-status"/>
<xml-property name="dependentOn" value="vce"/>
<xml-property name="container" value="port-groups"/>
<xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/>
@@ -4542,7 +4540,7 @@
<xml-properties>
<xml-property name="description" value="Generic network definition"/>
<xml-property name="nameProps" value="network-name"/>
- <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,orchestration-status"/>
+ <xml-property name="indexedProps" value="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,orchestration-status"/>
<xml-property name="searchable" value="network-id,network-name"/>
<xml-property name="uniqueProps" value="network-id"/>
<xml-property name="container" value="l3-networks"/>
@@ -5553,7 +5551,7 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Software Version"/>
- <xml-property name="indexedProps" value="softwareVersionId,isActiveSwVer"/>
+ <xml-property name="indexedProps" value="software-version-id,is-active-sw-ver"/>
<xml-property name="dependentOn" value="pnf"/>
<xml-property name="container" value="pnf"/>
<xml-property name="requiredProps" value="software-version-id,is-active-sw-ver"/>
@@ -5864,8 +5862,8 @@
<java-type name="ReservedPropNames">
<xml-properties>
<xml-property name="description" value="Internal map to define some reserved properties of a vertex"/>
- <xml-property name="uniqueProps" value="aai-unique-key,aai-uri,aai-uuid"/>
- <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid"/>
+ <xml-property name="uniqueProps" value="aai-unique-key,aai-uri"/>
+ <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri"/>
</xml-properties>
<xml-root-element name="reserved-prop-names"/>
<java-attributes>
@@ -6609,7 +6607,7 @@
<xml-property name="nameProps" value="description,instance-group-name"/>
<xml-property name="uniqueProps" value="id"/>
<xml-property name="searchable" value="id,description"/>
- <xml-property name="indexedProps" value="id,type,sub-type,model-invariant-id,model-version-id"/>
+ <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id"/>
<xml-property name="container" value="instance-groups"/>
<xml-property name="namespace" value="network"/>
<xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/>
diff --git a/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml b/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml
index 8a3dc17..9644306 100644
--- a/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml
@@ -413,8 +413,6 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Persist SDNC address information used by ONAP SDNC."/>
- <xml-property name="indexedProps" value="sdnc-id"/>
- <xml-property name="searchable" value="sdnc-id"/>
<xml-property name="container" value="esr-thirdparty-sdnc-list"/>
<xml-property name="namespace" value="external-system"/>
<xml-property name="requiredProps" value="thirdparty-sdnc-id"/>
@@ -2412,7 +2410,7 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Physical interface (e.g., nic)"/>
- <xml-property name="indexedProps" value="interface-name,prov-status,networkRef,operational-status,interface-role,interface-name2"/>
+ <xml-property name="indexedProps" value="interface-name,prov-status,network-ref,operational-status,interface-role,interface-name2"/>
<xml-property name="nameProps" value="prov-status"/>
<xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/>
<xml-property name="container" value="p-interfaces"/>
@@ -4362,7 +4360,7 @@
<xml-properties>
<xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated."/>
<xml-property name="nameProps" value="vnf-name"/>
- <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status"/>
+ <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status"/>
<xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/>
<xml-property name="uniqueProps" value="vnf-id"/>
<xml-property name="container" value="vces"/>
@@ -4445,7 +4443,7 @@
<xml-properties>
<xml-property name="description" value="Used to capture the network interfaces of this VCE"/>
<xml-property name="nameProps" value="port-group-name"/>
- <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name,interface-role,orchestration-status"/>
+ <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name,interface-role,orchestration-status"/>
<xml-property name="dependentOn" value="vce"/>
<xml-property name="container" value="port-groups"/>
<xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/>
@@ -4759,7 +4757,7 @@
<xml-properties>
<xml-property name="description" value="Generic network definition"/>
<xml-property name="nameProps" value="network-name"/>
- <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,orchestration-status"/>
+ <xml-property name="indexedProps" value="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,orchestration-status"/>
<xml-property name="searchable" value="network-id,network-name"/>
<xml-property name="uniqueProps" value="network-id"/>
<xml-property name="container" value="l3-networks"/>
@@ -5780,7 +5778,7 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Software Version"/>
- <xml-property name="indexedProps" value="softwareVersionId,isActiveSwVer"/>
+ <xml-property name="indexedProps" value="software-version-id,is-active-sw-ver"/>
<xml-property name="dependentOn" value="pnf"/>
<xml-property name="container" value="pnf"/>
<xml-property name="requiredProps" value="software-version-id,is-active-sw-ver"/>
@@ -6091,8 +6089,8 @@
<java-type name="ReservedPropNames">
<xml-properties>
<xml-property name="description" value="Internal map to define some reserved properties of a vertex"/>
- <xml-property name="uniqueProps" value="aai-unique-key,aai-uri,aai-uuid"/>
- <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid"/>
+ <xml-property name="uniqueProps" value="aai-unique-key,aai-uri"/>
+ <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri"/>
</xml-properties>
<xml-root-element name="reserved-prop-names"/>
<java-attributes>
@@ -6835,7 +6833,7 @@
<xml-property name="nameProps" value="description,instance-group-name"/>
<xml-property name="uniqueProps" value="id"/>
<xml-property name="searchable" value="id,description"/>
- <xml-property name="indexedProps" value="id,type,sub-type,model-invariant-id,model-version-id"/>
+ <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id"/>
<xml-property name="container" value="instance-groups"/>
<xml-property name="namespace" value="network"/>
<xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/>
@@ -7132,7 +7130,7 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Metadata for license group."/>
- <xml-property name="indexedProps" value="group-uuid,resource-uuid,projectNumber,orderNumber,receiptDate"/>
+ <xml-property name="indexedProps" value="group-uuid,resource-uuid,project-number,order-number,receipt-date"/>
<xml-property name="dependentOn" value="generic-vnf,vce"/>
<xml-property name="container" value="licenses"/>
<xml-property name="uriTemplate" value="/licenses/license/{group-uuid}/{resource-uuid}"/>
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 5d6cda6..9ddd1f0 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
@@ -409,8 +409,6 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Persist SDNC address information used by ONAP SDNC."/>
- <xml-property name="indexedProps" value="sdnc-id"/>
- <xml-property name="searchable" value="sdnc-id"/>
<xml-property name="container" value="esr-thirdparty-sdnc-list"/>
<xml-property name="namespace" value="external-system"/>
<xml-property name="requiredProps" value="thirdparty-sdnc-id"/>
@@ -2405,7 +2403,7 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Physical interface (e.g., nic)"/>
- <xml-property name="indexedProps" value="interface-name,prov-status,networkRef,operational-status,interface-role,interface-name2"/>
+ <xml-property name="indexedProps" value="interface-name,prov-status,network-ref,operational-status,interface-role,interface-name2"/>
<xml-property name="nameProps" value="prov-status"/>
<xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/>
<xml-property name="container" value="p-interfaces"/>
@@ -4331,7 +4329,7 @@
<xml-properties>
<xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated."/>
<xml-property name="nameProps" value="vnf-name"/>
- <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status"/>
+ <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status"/>
<xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/>
<xml-property name="uniqueProps" value="vnf-id"/>
<xml-property name="container" value="vces"/>
@@ -4413,7 +4411,7 @@
<xml-properties>
<xml-property name="description" value="Used to capture the network interfaces of this VCE"/>
<xml-property name="nameProps" value="port-group-name"/>
- <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name,interface-role,orchestration-status"/>
+ <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name,interface-role,orchestration-status"/>
<xml-property name="dependentOn" value="vce"/>
<xml-property name="container" value="port-groups"/>
<xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/>
@@ -4724,7 +4722,7 @@
<xml-properties>
<xml-property name="description" value="Generic network definition"/>
<xml-property name="nameProps" value="network-name"/>
- <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,orchestration-status"/>
+ <xml-property name="indexedProps" value="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,orchestration-status"/>
<xml-property name="searchable" value="network-id,network-name"/>
<xml-property name="uniqueProps" value="network-id"/>
<xml-property name="container" value="l3-networks"/>
@@ -5739,7 +5737,7 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Software Version"/>
- <xml-property name="indexedProps" value="softwareVersionId,isActiveSwVer"/>
+ <xml-property name="indexedProps" value="software-version-id,is-active-sw-ver"/>
<xml-property name="dependentOn" value="pnf"/>
<xml-property name="container" value="pnf"/>
<xml-property name="requiredProps" value="software-version-id,is-active-sw-ver"/>
@@ -6050,8 +6048,8 @@
<java-type name="ReservedPropNames">
<xml-properties>
<xml-property name="description" value="Internal map to define some reserved properties of a vertex"/>
- <xml-property name="uniqueProps" value="aai-unique-key,aai-uri,aai-uuid"/>
- <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid"/>
+ <xml-property name="uniqueProps" value="aai-unique-key,aai-uri"/>
+ <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri"/>
</xml-properties>
<xml-root-element name="reserved-prop-names"/>
<java-attributes>
@@ -6789,7 +6787,7 @@
<xml-property name="nameProps" value="description,instance-group-name"/>
<xml-property name="uniqueProps" value="id"/>
<xml-property name="searchable" value="id,description"/>
- <xml-property name="indexedProps" value="id,type,sub-type,model-invariant-id,model-version-id"/>
+ <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id"/>
<xml-property name="container" value="instance-groups"/>
<xml-property name="namespace" value="network"/>
<xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/>
@@ -7086,7 +7084,7 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Metadata for license group."/>
- <xml-property name="indexedProps" value="group-uuid,resource-uuid,projectNumber,orderNumber,receiptDate"/>
+ <xml-property name="indexedProps" value="group-uuid,resource-uuid,project-number,order-number,receipt-date"/>
<xml-property name="dependentOn" value="generic-vnf,vce"/>
<xml-property name="container" value="licenses"/>
<xml-property name="uriTemplate" value="/licenses/license/{group-uuid}/{resource-uuid}"/>
diff --git a/aai-schema/src/main/resources/onap/oxm/v8/aai_oxm_v8.xml b/aai-schema/src/main/resources/onap/oxm/v8/aai_oxm_v8.xml
index f23be3c..16df581 100644
--- a/aai-schema/src/main/resources/onap/oxm/v8/aai_oxm_v8.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v8/aai_oxm_v8.xml
@@ -2848,7 +2848,7 @@
<xml-properties>
<xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated."/>
<xml-property name="nameProps" value="vnf-name"/>
- <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/>
+ <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id"/>
<xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/>
<xml-property name="uniqueProps" value="vnf-id"/>
<xml-property name="container" value="vces"/>
@@ -2930,7 +2930,7 @@
<xml-properties>
<xml-property name="description" value="Used to capture the network interfaces of this VCE"/>
<xml-property name="nameProps" value="port-group-name"/>
- <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name"/>
+ <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name"/>
<xml-property name="dependentOn" value="vce"/>
<xml-property name="container" value="port-groups"/>
<xml-property name="requiredProps" value="interface-id,orchestration-status"/>
@@ -3194,7 +3194,7 @@
<xml-properties>
<xml-property name="description" value="Generic network definition"/>
<xml-property name="nameProps" value="network-name"/>
- <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-network-fqdn"/>
+ <xml-property name="indexedProps" value="heat-stack-id,service-id,network-id,network-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-network-fqdn"/>
<xml-property name="uniqueProps" value="network-id"/>
<xml-property name="container" value="l3-networks"/>
<xml-property name="namespace" value="network"/>
diff --git a/aai-schema/src/main/resources/onap/oxm/v9/aai_oxm_v9.xml b/aai-schema/src/main/resources/onap/oxm/v9/aai_oxm_v9.xml
index 59aea58..d3adbee 100644
--- a/aai-schema/src/main/resources/onap/oxm/v9/aai_oxm_v9.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v9/aai_oxm_v9.xml
@@ -3002,7 +3002,7 @@
<xml-properties>
<xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated."/>
<xml-property name="nameProps" value="vnf-name"/>
- <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id"/>
+ <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id"/>
<xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/>
<xml-property name="uniqueProps" value="vnf-id"/>
<xml-property name="container" value="vces"/>
@@ -3084,7 +3084,7 @@
<xml-properties>
<xml-property name="description" value="Used to capture the network interfaces of this VCE"/>
<xml-property name="nameProps" value="port-group-name"/>
- <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name"/>
+ <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name"/>
<xml-property name="dependentOn" value="vce"/>
<xml-property name="container" value="port-groups"/>
<xml-property name="requiredProps" value="interface-id,orchestration-status"/>
@@ -3362,7 +3362,7 @@
<xml-properties>
<xml-property name="description" value="Generic network definition"/>
<xml-property name="nameProps" value="network-name"/>
- <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/>
+ <xml-property name="indexedProps" value="heat-stack-id,service-id,network-id,network-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-network-fqdn,network-role"/>
<xml-property name="searchable" value="network-id,network-name"/>
<xml-property name="uniqueProps" value="network-id"/>
<xml-property name="container" value="l3-networks"/>
@@ -4144,7 +4144,7 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world."/>
- <xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status"/>
+ <xml-property name="indexedProps" value="pnf-name,inv-status"/>
<xml-property name="searchable" value="pnf-name"/>
<xml-property name="uniqueProps" value="pnf-name"/>
<xml-property name="container" value="pnfs"/>
diff --git a/aai-schema/src/test/java/org/onap/aai/schema/ValidateOXMTest.java b/aai-schema/src/test/java/org/onap/aai/schema/ValidateOXMTest.java
index 527e6b7..79323aa 100644
--- a/aai-schema/src/test/java/org/onap/aai/schema/ValidateOXMTest.java
+++ b/aai-schema/src/test/java/org/onap/aai/schema/ValidateOXMTest.java
@@ -60,6 +60,7 @@ public class ValidateOXMTest {
private String DBEDGERULES_OUT = "OUT";
private String DBEDGERULES_IN = "IN";
private String XMLROOTELEMENT = "xml-root-element";
+ private String XMLPROPERTIES = "xml-properties";
private String ECOMP = "ecomp";
private String NARAD = "narad";
private String ONAP = "onap";
@@ -141,6 +142,238 @@ public class ValidateOXMTest {
}
+ @Test
+ public void verifyAllIndexedPropertiesExistInObject()
+ throws XPathExpressionException, IOException, SAXException, ParserConfigurationException {
+
+ boolean foundIssue = false;
+ List<File> fileList = getOxmSchemaFiles();
+ fileList.addAll(getOnapOxmSchemaFiles());
+ StringBuilder msg = new StringBuilder();
+ for (File file : fileList) {
+ Document xmlDocument = getDocument(file);
+ XPath xPath = XPathFactory.newInstance().newXPath();
+ String expression = "/xml-bindings/java-types/java-type[count(xml-properties/xml-property[@name='indexedProps']) > 0]";
+ NodeList nodeList = (NodeList) xPath.compile(expression).evaluate(xmlDocument, XPathConstants.NODESET);
+
+ Map<String, List<String>> nodeTypeBadIndexProps = new HashMap<>();
+ for(int i = 0; i < nodeList.getLength(); i++){
+ String name = nodeList.item(i).getAttributes().getNamedItem("name").getNodeValue();
+
+ NodeList javaAttributesList = ((Element)nodeList.item(i)).getElementsByTagName("java-attributes");
+
+ Set<String> properties = new HashSet<>();
+
+ for(int j = 0; j < javaAttributesList.getLength(); j++){
+ NodeList elementList = ((Element)javaAttributesList.item(j)).getElementsByTagName("xml-element");
+ for(int k = 0; k < elementList.getLength(); k++){
+ properties.add(elementList.item(k).getAttributes().getNamedItem("name").getNodeValue());
+ }
+ }
+
+ NodeList xmlPropertiesList = ((Element)nodeList.item(i)).getElementsByTagName("xml-properties");
+ List<String> badIndexedProps = new ArrayList<>();
+ boolean foundIssueInNodeType = false;
+
+ for(int j = 0; j < xmlPropertiesList.getLength(); j++){
+ NodeList xmlProperties = ((Element)xmlPropertiesList.item(j)).getElementsByTagName("xml-property");
+ for(int k = 0; k < xmlProperties.getLength(); k++){
+ String xmlProp = xmlProperties.item(k).getAttributes().getNamedItem("name").getNodeValue();
+ if("indexedProps".equals(xmlProp)){
+ String xmlPropValue = xmlProperties.item(k).getAttributes().getNamedItem("value").getNodeValue();
+
+ List<String> indexProps = Arrays
+ .stream(xmlPropValue.split(","))
+ .collect(Collectors.toList());
+
+ for(String indexProp : indexProps){
+ if(!properties.contains(indexProp)){
+ foundIssueInNodeType = true;
+ badIndexedProps.add(indexProp);
+ }
+ }
+
+ }
+ }
+ }
+
+ if(foundIssueInNodeType){
+ foundIssue =true;
+ nodeTypeBadIndexProps.put(name, badIndexedProps);
+ }
+ }
+
+ if(!nodeTypeBadIndexProps.isEmpty()){
+ msg.append("\n");
+ msg.append("File: " + file.getAbsolutePath().replaceAll(".*aai-schema", ""));
+ msg.append("\n");
+ for (Map.Entry<String, List<String>> nodeTypeBadIndex : nodeTypeBadIndexProps.entrySet()) {
+ msg.append("NodeType: " + nodeTypeBadIndex.getKey());
+ msg.append(" contains following indexed props that are not properties in object: ");
+ msg.append(String.join(",", nodeTypeBadIndex.getValue()));
+ msg.append("\n");
+ }
+ }
+
+ }
+
+ if (foundIssue) {
+ fail(msg.toString());
+ }
+ }
+
+ @Test
+ public void verifyAllUniquePropertiesExistInObject()
+ throws XPathExpressionException, IOException, SAXException, ParserConfigurationException {
+
+ boolean foundIssue = false;
+ List<File> fileList = getOxmSchemaFiles();
+ fileList.addAll(getOnapOxmSchemaFiles());
+ StringBuilder msg = new StringBuilder();
+ for (File file : fileList) {
+ Document xmlDocument = getDocument(file);
+ XPath xPath = XPathFactory.newInstance().newXPath();
+ String expression = "/xml-bindings/java-types/java-type[count(xml-properties/xml-property[@name='uniqueProps']) > 0]";
+ NodeList nodeList = (NodeList) xPath.compile(expression).evaluate(xmlDocument, XPathConstants.NODESET);
+
+ Map<String, List<String>> nodeTypeBadUniqueProps = new HashMap<>();
+ for (int i = 0; i < nodeList.getLength(); i++) {
+ String name = nodeList.item(i).getAttributes().getNamedItem("name").getNodeValue();
+
+ NodeList javaAttributesList = ((Element) nodeList.item(i)).getElementsByTagName("java-attributes");
+
+ Set<String> properties = new HashSet<>();
+
+ for (int j = 0; j < javaAttributesList.getLength(); j++) {
+ NodeList elementList = ((Element) javaAttributesList.item(j)).getElementsByTagName("xml-element");
+ for (int k = 0; k < elementList.getLength(); k++) {
+ properties.add(elementList.item(k).getAttributes().getNamedItem("name").getNodeValue());
+ }
+ }
+
+ NodeList xmlPropertiesList = ((Element) nodeList.item(i)).getElementsByTagName("xml-properties");
+ List<String> badUniqueProps = new ArrayList<>();
+ boolean foundIssueInNodeType = false;
+
+ for (int j = 0; j < xmlPropertiesList.getLength(); j++) {
+ NodeList xmlProperties = ((Element) xmlPropertiesList.item(j)).getElementsByTagName("xml-property");
+ for (int k = 0; k < xmlProperties.getLength(); k++) {
+ String xmlProp = xmlProperties.item(k).getAttributes().getNamedItem("name").getNodeValue();
+ if ("uniqueProps".equals(xmlProp)) {
+ String xmlPropValue = xmlProperties.item(k).getAttributes().getNamedItem("value").getNodeValue();
+
+ List<String> uniqueProps = Arrays
+ .stream(xmlPropValue.split(","))
+ .collect(Collectors.toList());
+
+ for (String uniqueProp : uniqueProps) {
+ if (!properties.contains(uniqueProp)) {
+ foundIssueInNodeType = true;
+ badUniqueProps.add(uniqueProp);
+ }
+ }
+
+ }
+ }
+ }
+
+ if (foundIssueInNodeType) {
+ foundIssue = true;
+ nodeTypeBadUniqueProps.put(name, badUniqueProps);
+ }
+ }
+
+ if (!nodeTypeBadUniqueProps.isEmpty()) {
+ msg.append("\n");
+ msg.append("File: " + file.getAbsolutePath().replaceAll(".*aai-schema", ""));
+ msg.append("\n");
+ for (Map.Entry<String, List<String>> nodeTypeBadUnique : nodeTypeBadUniqueProps.entrySet()) {
+ msg.append("NodeType: " + nodeTypeBadUnique.getKey());
+ msg.append(" contains following unique props that are not properties in object: ");
+ msg.append(String.join(",", nodeTypeBadUnique.getValue()));
+ msg.append("\n");
+ }
+ }
+
+ }
+
+ if (foundIssue) {
+ fail(msg.toString());
+ }
+ }
+
+
+ /**
+ * Verifies that all of the top level node types in the oxm's have their namespace in uri templates.
+ * @throws XPathExpressionException
+ * @throws IOException
+ * @throws SAXException
+ * @throws ParserConfigurationException
+ */
+ @Test
+ public void verifyAllUriTemplateHaveNamespace()
+ throws XPathExpressionException, IOException, SAXException, ParserConfigurationException {
+ boolean foundIssue = false;
+ List<File> fileList = getOxmSchemaFiles();
+ fileList.addAll(getOnapOxmSchemaFiles());
+ StringBuilder msg = new StringBuilder();
+ for (File file : fileList) {
+ msg.append(file.getAbsolutePath().replaceAll(".*aai-schema", ""));
+ msg.append("\n");
+ Document xmlDocument = getDocument(file);
+ XPath xPath = XPathFactory.newInstance().newXPath();
+ String expression = "/xml-bindings/java-types/java-type["
+ + "count(xml-properties/xml-property[@name='namespace']) > 0 " + "]";
+ NodeList nodeList = (NodeList) xPath.compile(expression).evaluate(xmlDocument, XPathConstants.NODESET);
+
+ for (int i = 0; i < nodeList.getLength(); i++) {
+ String name = nodeList.item(i).getAttributes().getNamedItem("name").getNodeValue();
+
+ NodeList childNodeList = (NodeList) nodeList.item(i).getChildNodes();
+ for (int j = 0; j < childNodeList.getLength(); j++) {
+
+ String nodeName = childNodeList.item(j).getNodeName();
+ NodeList xmlPropertyNodeList = childNodeList.item(j).getChildNodes();
+ if (XMLPROPERTIES.equals(nodeName)) {
+
+ String namespaceVal = "";
+ String uriTemplateVal = "";
+ for (int k = 0; k < xmlPropertyNodeList.getLength(); k++) {
+
+ if ("xml-property".equals(xmlPropertyNodeList.item(k).getNodeName())) {
+
+ NamedNodeMap attributes = xmlPropertyNodeList.item(k).getAttributes();
+
+ if ("namespace".equals(attributes.getNamedItem("name").getNodeValue())) {
+ namespaceVal = attributes.getNamedItem("value").getNodeValue();
+ }
+ if ("uriTemplate".equals(attributes.getNamedItem("name").getNodeValue())) {
+ uriTemplateVal = attributes.getNamedItem("value").getNodeValue();
+ }
+
+ }
+
+ }
+
+ if (!uriTemplateVal.startsWith("/" + namespaceVal + "/")) {
+ foundIssue = true;
+ msg.append("\t");
+ msg.append(uriTemplateVal);
+ msg.append("\n");
+ }
+
+ }
+ }
+
+ }
+ }
+ if (foundIssue) {
+ System.out.println(msg.toString());
+ fail("uriTemplate doesnt start with /namespace/.");
+ }
+
+ }
+
/**
* Verifies that all specified properties are indexed
@@ -206,8 +439,8 @@ public class ValidateOXMTest {
* dependentOn relationship matches what is listed in the edge rules.
*
*/
- @Test
@Ignore
+ @Test
public void testSchemaValidationAgainstEdgeRules() throws XPathExpressionException, IOException, SAXException, ParserConfigurationException, ParseException {
Path currentRelativePath = Paths.get("../aai-schema/src/main/resources/").toAbsolutePath();
List<File> subDirs = Arrays.asList(currentRelativePath.toFile().listFiles(File::isDirectory));
@@ -450,6 +683,35 @@ public class ValidateOXMTest {
.collect(Collectors.toList());
}
+ private List<File> getOxmSchemaFiles() {
+
+ Path currentRelativePath = Paths.get("../aai-schema/src/main/resources/").toAbsolutePath();
+ return FileUtils.listFiles(
+ currentRelativePath.toFile(),
+ new RegexFileFilter(".*\\.xml"),
+ DirectoryFileFilter.DIRECTORY)
+ .stream()
+ .filter(file -> file.getAbsolutePath().contains("oxm"))
+ .filter(file -> file.getAbsolutePath().contains("aai_schema_oxm"))
+ .filter(file -> !file.getAbsolutePath().contains("onap")) // skips onap for checks
+ .collect(Collectors.toList());
+
+ }
+
+ private List<File> getOnapOxmSchemaFiles() {
+
+ Path currentRelativePath = Paths.get("../aai-schema/src/main/resources/").toAbsolutePath();
+ return FileUtils.listFiles(
+ currentRelativePath.toFile(),
+ new RegexFileFilter(".*\\.xml"),
+ DirectoryFileFilter.DIRECTORY)
+ .stream()
+ .filter(file -> file.getAbsolutePath().contains("oxm"))
+ .filter(file -> file.getAbsolutePath().contains("aai_oxm"))
+ .collect(Collectors.toList());
+
+ }
+
private List<File> getAaiSchemaOxmFiles() {
Path currentRelativePath = Paths.get("../aai-schema/src/main/resources/").toAbsolutePath();
return FileUtils.listFiles(