From: Venkata Harish K Kajur Date: Mon, 14 Aug 2017 06:10:04 +0000 (-0400) Subject: Add the vnf changes X-Git-Tag: v1.1.0~80^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2eed3bf971c7eb9638d2399c3d66ece7cf6174a3;p=aai%2Faai-common.git Add the vnf changes Change-Id: I728b32a9c81422224841f84af9c672515791b87b Issue-Id: AAI-165 Signed-off-by: Venkata Harish K Kajur --- diff --git a/aai-core/src/main/java/org/openecomp/aai/query/builder/GraphTraversalBuilder.java b/aai-core/src/main/java/org/openecomp/aai/query/builder/GraphTraversalBuilder.java index 11164d96..73b57d06 100644 --- a/aai-core/src/main/java/org/openecomp/aai/query/builder/GraphTraversalBuilder.java +++ b/aai-core/src/main/java/org/openecomp/aai/query/builder/GraphTraversalBuilder.java @@ -38,7 +38,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; import org.apache.tinkerpop.gremlin.structure.Direction; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Vertex; - import org.openecomp.aai.db.props.AAIProperties; import org.openecomp.aai.exceptions.AAIException; import org.openecomp.aai.introspection.Introspector; @@ -351,6 +350,112 @@ public abstract class GraphTraversalBuilder extends QueryBuilder { return this; } + @Override + public QueryBuilder store(String name) { + + this.traversal.store(name); + stepIndex++; + + return this; + } + + @Override + public QueryBuilder cap(String name) { + this.traversal.cap(name); + stepIndex++; + + return this; + } + + @Override + public QueryBuilder unfold() { + this.traversal.unfold(); + stepIndex++; + + return this; + } + + @Override + public QueryBuilder dedup() { + + this.traversal.dedup(); + stepIndex++; + + return this; + } + + @Override + public QueryBuilder emit() { + + this.traversal.emit(); + stepIndex++; + + return this; + + } + + @Override + public QueryBuilder repeat(QueryBuilder builder) { + + this.traversal.repeat((GraphTraversal)builder.getQuery()); + stepIndex++; + + return this; + } + + @Override + public QueryBuilder outE() { + this.traversal.outE(); + stepIndex++; + return (QueryBuilder)this; + } + + @Override + public QueryBuilder inE() { + this.traversal.inE(); + stepIndex++; + return (QueryBuilder)this; + } + + @Override + public QueryBuilder outV() { + this.traversal.outV(); + stepIndex++; + return (QueryBuilder)this; + } + + @Override + public QueryBuilder inV() { + this.traversal.inV(); + stepIndex++; + return (QueryBuilder)this; + } + + @Override + public QueryBuilder as(String name) { + this.traversal.as(name); + + stepIndex++; + return this; + } + + @Override + public QueryBuilder not(QueryBuilder builder) { + this.traversal.not(builder.getQuery()); + + stepIndex++; + return this; + } + + @Override + public QueryBuilder select(String name) { + this.traversal.select(name); + + stepIndex++; + + return this; + } + /** * Edge query. * diff --git a/aai-core/src/main/java/org/openecomp/aai/query/builder/GremlinPipelineBuilder.java b/aai-core/src/main/java/org/openecomp/aai/query/builder/GremlinPipelineBuilder.java deleted file mode 100644 index 729acbb4..00000000 --- a/aai-core/src/main/java/org/openecomp/aai/query/builder/GremlinPipelineBuilder.java +++ /dev/null @@ -1,214 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * org.openecomp.aai - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" 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. - * ============LICENSE_END========================================================= - */ - -/* -package org.openecomp.aai.query.builder; - -import java.util.LinkedHashMap; -import java.util.List; - -import org.apache.tinkerpop.gremlin.structure.Vertex; - -import org.openecomp.aai.db.AAIProperties; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.serialization.db.EdgeRule; -import org.openecomp.aai.serialization.db.EdgeRules; - -public abstract class GremlinPipelineBuilder extends QueryBuilder { - - private GremlinPipeline pipeline = null; - private EdgeRules edgeRules = EdgeRules.getInstance(); - private int parentStepIndex = 0; - private int stepIndex = 0; - - public GremlinPipelineBuilder(Loader loader) { - super(loader); - - pipeline = new GremlinPipeline(new IdentityPipe()).V(); - - } - - public GremlinPipelineBuilder(Loader loader, Vertex start) { - super(loader, start); - - pipeline = new GremlinPipeline(start); - - } - - @Override - public QueryBuilder getVerticesByIndexedProperty(String key, Object value) { - - return this.getVerticesByProperty(key, value); - } - - @Override - public QueryBuilder getVerticesByProperty(String key, Object value) { - - //this is because the index is registered as an Integer - if (value != null && value.getClass().equals(Long.class)) { - pipeline.has(key,new Integer(value.toString())); - } else { - pipeline.has(key, value); - } - stepIndex++; - return this; - } - - @Override - public QueryBuilder getChildVerticesFromParent(String parentKey, String parentValue, String childType) { - pipeline.has(parentKey, parentValue).has(AAIProperties.NODE_TYPE, childType); - stepIndex++; - return this; - } - - @Override - public QueryBuilder getTypedVerticesByMap(String type, LinkedHashMap map) { - - for (String key : map.keySet()) { - pipeline.has(key, map.get(key)); - stepIndex++; - } - pipeline.has(AAIProperties.NODE_TYPE, type); - stepIndex++; - return this; - } - - @Override - public QueryBuilder createDBQuery(Introspector obj) { - this.createKeyQuery(obj); - this.createContainerQuery(obj); - return this; - } - - @Override - public QueryBuilder createKeyQuery(Introspector obj) { - List keys = obj.getKeys(); - Object val = null; - for (String key : keys) { - val = obj.getValue(key); - //this is because the index is registered as an Integer - if (val != null && val.getClass().equals(Long.class)) { - pipeline.has(key,new Integer(val.toString())); - } else { - pipeline.has(key, val); - } - stepIndex++; - } - return this; - } - - @Override - - public QueryBuilder createContainerQuery(Introspector obj) { - String type = obj.getChildDBName(); - String abstractType = obj.getMetadata("abstract"); - if (abstractType != null) { - String[] inheritors = obj.getMetadata("inheritors").split(","); - GremlinPipeline[] pipes = new GremlinPipeline[inheritors.length]; - for (int i = 0; i < inheritors.length; i++) { - pipes[i] = new GremlinPipeline(new IdentityPipe()).has(AAIProperties.NODE_TYPE, inheritors[i]); - } - pipeline.or(pipes); - } else { - pipeline.has(AAIProperties.NODE_TYPE, type); - } - stepIndex++; - return this; - } - - @Override - public QueryBuilder createEdgeTraversal(Introspector parent, Introspector child) { - String parentName = parent.getDbName(); - String childName = child.getDbName(); - String isAbstractType = parent.getMetadata("abstract"); - if ("true".equals(isAbstractType)) { - formBoundary(); - pipeline.outE().has("isParent", true).inV(); - } else { - if (parent.isContainer()) { - parentName = parent.getChildDBName(); - } - if (child.isContainer()) { - childName = child.getChildDBName(); - } - this.edgeQuery(parentName, childName); - } - return this; - - } - - @Override - public QueryBuilder createEdgeTraversal(Vertex parent, Introspector child) { - - String nodeType = parent.getProperty(AAIProperties.NODE_TYPE); - this.edgeQuery(nodeType, child.getDbName()); - return this; - - } - - private void edgeQuery(String outType, String inType) { - formBoundary(); - EdgeRule rule; - String label = ""; - try { - rule = edgeRules.getEdgeRule(outType, inType); - label = rule.getLabel(); - } catch (AAIException e) { - // TODO Auto-generated catch block - } - pipeline = pipeline.out(label); - stepIndex++; - } - - @Override - public Object getQuery() { - return this.pipeline; - } - - @Override - public Object getParentQuery() { - GremlinPipeline parent = new GremlinPipeline(); - if (parentStepIndex == 0) { - parentStepIndex = stepIndex; - } - List pipes = this.pipeline.getPipes(); - //add two for the garbage identity pipes - for (int i = 0; i < parentStepIndex + 2; i++) { - parent.add(pipes.get(i)); - } - - return parent; - } - - @Override - public void formBoundary() { - parentStepIndex = stepIndex; - } - - - @Override - public Vertex getStart() { - return this.start; - } - -} -*/ diff --git a/aai-core/src/main/java/org/openecomp/aai/query/builder/GremlinPipelineTraversal.java b/aai-core/src/main/java/org/openecomp/aai/query/builder/GremlinPipelineTraversal.java deleted file mode 100644 index c29c367b..00000000 --- a/aai-core/src/main/java/org/openecomp/aai/query/builder/GremlinPipelineTraversal.java +++ /dev/null @@ -1,76 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * org.openecomp.aai - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" 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. - * ============LICENSE_END========================================================= - */ - -/* -package org.openecomp.aai.query.builder; - -import java.io.UnsupportedEncodingException; -import java.net.URI; - -import javax.ws.rs.core.MultivaluedMap; - -import org.apache.tinkerpop.gremlin.structure.Vertex; - -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.parsers.query.QueryParser; -import org.openecomp.aai.parsers.query.TraversalStrategy; - -public class GremlinPipelineTraversal extends GremlinPipelineBuilder { - - public GremlinPipelineTraversal(Loader loader) { - super(loader); - this.factory = new TraversalStrategy(this.loader, this); - } - - public GremlinPipelineTraversal(Loader loader, Vertex start) { - super(loader, start); - this.factory = new TraversalStrategy(this.loader, this); - } - - @Override - public QueryParser createQueryFromURI(URI uri) throws UnsupportedEncodingException, AAIException { - return factory.buildURIParser(uri); - } - - @Override - public QueryParser createQueryFromRelationship(Introspector relationship) throws UnsupportedEncodingException, AAIException { - return factory.buildRelationshipParser(relationship); - } - - @Override - public QueryParser createQueryFromURI(URI uri, MultivaluedMap queryParams) - throws UnsupportedEncodingException, AAIException { - return factory.buildURIParser(uri, queryParams); - } - - @Override - public QueryBuilder newInstance(Vertex start) { - return new GremlinPipelineTraversal(loader, start); - } - - @Override - public QueryBuilder newInstance() { - return new GremlinPipelineTraversal(loader); - } - -} -*/ diff --git a/aai-core/src/main/java/org/openecomp/aai/query/builder/GremlinQueryBuilder.java b/aai-core/src/main/java/org/openecomp/aai/query/builder/GremlinQueryBuilder.java index e4e1fd5a..f93bc484 100644 --- a/aai-core/src/main/java/org/openecomp/aai/query/builder/GremlinQueryBuilder.java +++ b/aai-core/src/main/java/org/openecomp/aai/query/builder/GremlinQueryBuilder.java @@ -32,7 +32,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSo import org.apache.tinkerpop.gremlin.structure.Direction; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Vertex; - import org.openecomp.aai.db.props.AAIProperties; import org.openecomp.aai.exceptions.AAIException; import org.openecomp.aai.introspection.Introspector; @@ -43,6 +42,7 @@ import org.openecomp.aai.serialization.db.EdgeRule; import org.openecomp.aai.serialization.db.EdgeRules; import org.openecomp.aai.serialization.db.EdgeType; import org.openecomp.aai.serialization.db.exceptions.NoEdgeRuleFoundException; + import com.google.common.base.Joiner; /** @@ -345,6 +345,109 @@ public abstract class GremlinQueryBuilder extends QueryBuilder { return this; } + @Override + public QueryBuilder store(String name) { + this.list.add(".store('"+ name + "')"); + stepIndex++; + + return this; + } + + @Override + public QueryBuilder cap(String name) { + this.list.add(".cap('"+ name + "')"); + stepIndex++; + + return this; + } + + @Override + public QueryBuilder unfold() { + this.list.add(".unfold()"); + stepIndex++; + + return this; + } + + @Override + public QueryBuilder dedup() { + this.list.add(".dedup()"); + stepIndex++; + + return this; + } + + @Override + public QueryBuilder emit() { + this.list.add(".emit()"); + stepIndex++; + + return this; + } + + @Override + public QueryBuilder repeat(QueryBuilder builder) { + this.list.add(".repeat(__" + builder.getQuery() + ")"); + stepIndex++; + + return this; + } + + @Override + public QueryBuilder outE() { + this.list.add(".outE()"); + stepIndex++; + + return (QueryBuilder)this; + } + + @Override + public QueryBuilder inE() { + this.list.add(".inE()"); + stepIndex++; + + return (QueryBuilder)this; + } + + @Override + public QueryBuilder outV() { + this.list.add(".outV()"); + stepIndex++; + + return (QueryBuilder)this; + } + + @Override + public QueryBuilder inV() { + this.list.add(".inV()"); + stepIndex++; + + return (QueryBuilder)this; + } + + @Override + public QueryBuilder not(QueryBuilder builder) { + this.list.add(".not(" + "__" + builder.getQuery() + ")"); + stepIndex++; + + return this; + } + + @Override + public QueryBuilder as(String name) { + this.list.add(".as('" + name + "')"); + stepIndex++; + + return this; + } + + @Override + public QueryBuilder select(String name) { + this.list.add(".select('" + name + "')"); + stepIndex++; + + return this; + } /** * @{inheritDoc} */ diff --git a/aai-core/src/main/java/org/openecomp/aai/query/builder/GremlinTraversal.java b/aai-core/src/main/java/org/openecomp/aai/query/builder/GremlinTraversal.java index 3daad5ef..daf795fd 100644 --- a/aai-core/src/main/java/org/openecomp/aai/query/builder/GremlinTraversal.java +++ b/aai-core/src/main/java/org/openecomp/aai/query/builder/GremlinTraversal.java @@ -29,7 +29,6 @@ import javax.ws.rs.core.MultivaluedMap; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Vertex; - import org.openecomp.aai.exceptions.AAIException; import org.openecomp.aai.introspection.Introspector; import org.openecomp.aai.introspection.Loader; diff --git a/aai-core/src/main/java/org/openecomp/aai/query/builder/QueryBuilder.java b/aai-core/src/main/java/org/openecomp/aai/query/builder/QueryBuilder.java index 565e8682..009f4fdf 100644 --- a/aai-core/src/main/java/org/openecomp/aai/query/builder/QueryBuilder.java +++ b/aai-core/src/main/java/org/openecomp/aai/query/builder/QueryBuilder.java @@ -31,7 +31,6 @@ import javax.ws.rs.core.MultivaluedMap; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Vertex; - import org.openecomp.aai.exceptions.AAIException; import org.openecomp.aai.introspection.Introspector; import org.openecomp.aai.introspection.Loader; @@ -285,7 +284,22 @@ public abstract class QueryBuilder implements Iterator { public abstract QueryBuilder union(QueryBuilder... builder); public abstract QueryBuilder where(QueryBuilder... builder); - public abstract void markContainer(); + + public abstract QueryBuilder store(String name); + public abstract QueryBuilder cap(String name); + public abstract QueryBuilder unfold(); + public abstract QueryBuilder dedup(); + public abstract QueryBuilder emit(); + public abstract QueryBuilder repeat(QueryBuilder builder); + public abstract QueryBuilder outE(); + public abstract QueryBuilder inE(); + public abstract QueryBuilder inV(); + public abstract QueryBuilder outV(); + public abstract QueryBuilder not(QueryBuilder builder); + public abstract QueryBuilder as(String name); + public abstract QueryBuilder select(String name); + + public abstract void markContainer(); public abstract QueryBuilder getContainerQuery(); diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/engines/TransactionalGraphEngine.java b/aai-core/src/main/java/org/openecomp/aai/serialization/engines/TransactionalGraphEngine.java index 9192b589..ffe866ed 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/engines/TransactionalGraphEngine.java +++ b/aai-core/src/main/java/org/openecomp/aai/serialization/engines/TransactionalGraphEngine.java @@ -145,7 +145,15 @@ public abstract class TransactionalGraphEngine { return getQueryBuilder(this.loader); } + public QueryBuilder getQueryBuilder(QueryStyle style) { + return getQueryBuilder(style, this.loader); + } + public QueryBuilder getQueryBuilder(Loader loader) { + return getQueryBuilder(this.style, loader); + } + + public QueryBuilder getQueryBuilder(QueryStyle style, Loader loader) { if (style.equals(QueryStyle.GREMLIN_TRAVERSAL)) { return new GremlinTraversal<>(loader, this.asAdmin().getTraversalSource()); } else if (style.equals(QueryStyle.GREMLIN_UNIQUE)) { @@ -170,6 +178,10 @@ public abstract class TransactionalGraphEngine { } public QueryBuilder getQueryBuilder(Loader loader, Vertex start) { + return getQueryBuilder(this.style, loader, start); + } + + public QueryBuilder getQueryBuilder(QueryStyle style, Loader loader, Vertex start) { if (style.equals(QueryStyle.GREMLIN_TRAVERSAL)) { return new GremlinTraversal<>(loader, this.asAdmin().getTraversalSource(), start); } else if (style.equals(QueryStyle.GREMLIN_UNIQUE)) { diff --git a/aai-schema/src/main/resources/aai_schema/aai_schema_v10.xsd b/aai-schema/src/main/resources/aai_schema/aai_schema_v10.xsd index 690352b3..b8521fd3 100644 --- a/aai-schema/src/main/resources/aai_schema/aai_schema_v10.xsd +++ b/aai-schema/src/main/resources/aai_schema/aai_schema_v10.xsd @@ -5458,7 +5458,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.openecomp.aai.annotations.Metadata(description="Generic description of the type of NF") + @org.openecomp.aai.annotations.Metadata(description="Generic description of the type of NF",suggestibleOnSearch="true") diff --git a/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd b/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd index cebde48a..9abf1523 100644 --- a/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd +++ b/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd @@ -2897,11 +2897,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.openecomp.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers. This is a kludge.",indexedProps="application,att-uuid,application-vendor,application-version",uniqueProps="att-uuid",container="vnf-images",namespace="service-design-and-creation") + @org.openecomp.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers. This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation") - + @org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of this asset") @@ -5624,7 +5624,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.openecomp.aai.annotations.Metadata(description="Generic description of the type of NF") + @org.openecomp.aai.annotations.Metadata(description="Generic description of the type of NF",suggestibleOnSearch="true") diff --git a/aai-schema/src/main/resources/aai_schema/aai_schema_v8.xsd b/aai-schema/src/main/resources/aai_schema/aai_schema_v8.xsd index 27d18ab1..5a16a458 100644 --- a/aai-schema/src/main/resources/aai_schema/aai_schema_v8.xsd +++ b/aai-schema/src/main/resources/aai_schema/aai_schema_v8.xsd @@ -1,9 +1,5 @@ - + @@ -77,18 +73,8 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="The specific type of node in the A&AI graph") - - - - - @org.openecomp.aai.annotations.Metadata(description="The URL to the specific resource") - - @@ -104,18 +90,8 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="A keyword provided by A&AI to indicate an attribute.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Value of the attribute.") - - @@ -124,18 +100,8 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Key part of a key/value pair") - - - - - @org.openecomp.aai.annotations.Metadata(description="Value part of a key/value pair") - - @@ -144,18 +110,8 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="A keyword provided by A&AI to indicate type of node.") - - - - - @org.openecomp.aai.annotations.Metadata(description="URL to the object in A&AI.") - - @@ -171,53 +127,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="OAM network, to be deprecated shortly. Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID of the network. Unique across a cloud-region") - - - - - @org.openecomp.aai.annotations.Metadata(description="Name of the network.") - - - - - @org.openecomp.aai.annotations.Metadata(description="cvlan-id") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for VNF firewall rule so customer cannot send customer traffic over this oam network") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for VNF firewall rule so customer cannot send customer traffic over this oam network") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -225,11 +146,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of OAM networks, to be deprecated shortly. Do not use for new purposes. ") - - @@ -237,32 +153,12 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Digital virtual switch metadata, used by SDN-C to configure VCEs. A&AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&AI. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="DVS switch name") - - - - - @org.openecomp.aai.annotations.Metadata(description="URL used to reach the vcenter") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -270,11 +166,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of digital virtual switch metadata used for vmWare VCEs and VPEs.") - - @@ -282,39 +173,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Name of the availability zone. Unique across a cloud region") - - - - - @org.openecomp.aai.annotations.Metadata(description="Type of hypervisor. Source of truth should define valid values.") - - - - - @org.openecomp.aai.annotations.Metadata(description="State that indicates whether the availability zone should be used, etc. Source of truth should define valid values.",dbAlias="operational-status") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -372,11 +238,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Serves a PATCH like function. Does not enforce concurrency control. Clear each usage with AAI team.") - - @@ -406,11 +267,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="APIs that are more action related than REST (e.g., notify, update).") - - @@ -419,46 +275,16 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="The Target provider edge router") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Name of the availability zone") - - - - - @org.openecomp.aai.annotations.Metadata(description="Describes what the intended purpose of this pool is.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Comma separated list of ctags") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -473,53 +299,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique identifier for physical location, e.g., CLLI") - - - - - @org.openecomp.aai.annotations.Metadata(description="Data center code which can be an alternate way to identify a complex") - - - - - @org.openecomp.aai.annotations.Metadata(description="Gamma complex name for LCP instance.") - - - - - @org.openecomp.aai.annotations.Metadata(description="URL of the keystone identity service") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Type, e.g., central office, data center.") - - @@ -539,11 +330,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.") - - @@ -551,53 +337,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Persistent block-level storage.",indexedProps="volume-group-name,vnf-type,heat-stack-id,volume-group-id",dependentOn="cloud-region",container="volume-groups") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of volume-group.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Name of the volume group.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this volume-group") - - - - - @org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource. This field has been overloaded and clients should expect changes to occur in the future to this field as ASDC matures.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Orchestration status of this volume-group") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -605,11 +356,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of persistent block-level storage.") - - @@ -617,32 +363,12 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Ephemeral Block storage volume.",indexedProps="volume-id",dependentOn="vserver",container="volumes") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of block storage volume relative to the vserver.") - - - - - @org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -650,11 +376,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of ephemeral Block storage volumes.") - - @@ -662,67 +383,22 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="IPv4 Address Range",indexedProps="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="IP address") - - - - - @org.openecomp.aai.annotations.Metadata(description="Prefix length, 32 for single address") - - - - - @org.openecomp.aai.annotations.Metadata(description="Inner VLAN tag") - - - - - @org.openecomp.aai.annotations.Metadata(description="Outer VLAN tag") - - - - - @org.openecomp.aai.annotations.Metadata(description="Indicator of fixed or floating address") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Neutron network id of the interface that address belongs to") - - - - - @org.openecomp.aai.annotations.Metadata(description="Neutron id of subnet that address belongs to") - - @@ -730,67 +406,22 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="IPv6 Address Range",indexedProps="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id",dependentOn="vlan,l-interface") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="IP address") - - - - - @org.openecomp.aai.annotations.Metadata(description="Prefix length, 128 for single address") - - - - - @org.openecomp.aai.annotations.Metadata(description="Inner VLAN tag") - - - - - @org.openecomp.aai.annotations.Metadata(description="Outer VLAN tag") - - - - - @org.openecomp.aai.annotations.Metadata(description="Indicator of fixed or floating address") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Neutron network id of the interface that address belongs to") - - - - - @org.openecomp.aai.annotations.Metadata(description="Neutron id of subnet that address belongs to") - - @@ -798,74 +429,24 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-id",uniqueProps="vpn-id",dependentOn="l-interface",container="vlans") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="String that identifies the interface") - - - - - @org.openecomp.aai.annotations.Metadata(description="Inner VLAN tag") - - - - - @org.openecomp.aai.annotations.Metadata(description="Outer VLAN tag") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Captures the numeric part of the speed") - - - - - @org.openecomp.aai.annotations.Metadata(description="Captures the units corresponding to the speed") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used to describe (the service associated with) the vlan") - - - - - @org.openecomp.aai.annotations.Metadata(description="Whether customer is going to use this VLAN for backdoor connection to another customer premise device.") - - - - - @org.openecomp.aai.annotations.Metadata(description="This indicates the customers VPN ID associated with this vlan",dbAlias="vpn-id-local") - - @@ -882,109 +463,34 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="PCI ID used to identify the sriov-vf") - - - - - @org.openecomp.aai.annotations.Metadata(description="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM.") - - - - - @org.openecomp.aai.annotations.Metadata(description="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM.") - - - - - @org.openecomp.aai.annotations.Metadata(description="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM.") - - - - - @org.openecomp.aai.annotations.Metadata(description="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs.") - - - - - @org.openecomp.aai.annotations.Metadata(description="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs.") - - - - - @org.openecomp.aai.annotations.Metadata(description="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports.") - - - - - @org.openecomp.aai.annotations.Metadata(description="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM") - - - - - @org.openecomp.aai.annotations.Metadata(description="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM") - - - - - @org.openecomp.aai.annotations.Metadata(description="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM") - - - - - @org.openecomp.aai.annotations.Metadata(description="This option, if set to true, instructs to insert outer tag after traffic comes out of VM.") - - - - - @org.openecomp.aai.annotations.Metadata(description="This option is used to set the link status. Valid values as of 1607 are on, off, and auto.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Neutron network id of the interface") - - @@ -992,11 +498,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of SR-IOV Virtual Functions.") - - @@ -1004,74 +505,24 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,vpe,p-interface,vserver,lag-interface",container="l-interfaces") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Name given to the interface") - - - - - @org.openecomp.aai.annotations.Metadata(description="E.g., CUSTOMER, UPLINK, etc.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B.") - - - - - @org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details") - - - - - @org.openecomp.aai.annotations.Metadata(description="ID of interface") - - - - - @org.openecomp.aai.annotations.Metadata(description="MAC address for the interface") - - - - - @org.openecomp.aai.annotations.Metadata(description="Name of the network") - - - - - @org.openecomp.aai.annotations.Metadata(description="Whether A&AI should be managing this interface of not. Could have value like CUSTOMER") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -1083,11 +534,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of logical interfaces.") - - @@ -1095,67 +541,22 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-name,vserver-id,vserver-name2",dependentOn="tenant",container="vservers") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique identifier for this vserver relative to its tenant") - - - - - @org.openecomp.aai.annotations.Metadata(description="Name of vserver") - - - - - @org.openecomp.aai.annotations.Metadata(description="Alternative name of vserver") - - - - - @org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.") - - - - - @org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details") - - - - - @org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.") - - - - - @org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether closed loop function is enabled on this node") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -1165,11 +566,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of virtual Servers, aka virtual machines or VMs.") - - @@ -1177,32 +573,12 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Openstack tenant",nameProps="tenant-name",indexedProps="tenant-name,tenant-id",dependentOn="cloud-region",container="tenants") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id relative to the cloud-region.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Readable name of tenant") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -1211,11 +587,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of openstack tenants.") - - @@ -1223,88 +594,28 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Openstack flavor.",nameProps="flavor-name",indexedProps="flavor-name,flavor-id",dependentOn="cloud-region",container="flavors") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Flavor id, expected to be unique across cloud-region.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Flavor name") - - - - - @org.openecomp.aai.annotations.Metadata(description="Number of CPUs") - - - - - @org.openecomp.aai.annotations.Metadata(description="Amount of memory") - - - - - @org.openecomp.aai.annotations.Metadata(description="Disk space") - - - - - @org.openecomp.aai.annotations.Metadata(description="Amount of ephemeral disk space") - - - - - @org.openecomp.aai.annotations.Metadata(description="amount of swap space allocation") - - - - - @org.openecomp.aai.annotations.Metadata(description="whether flavor is available to all users or private to the tenant it was created in.") - - - - - @org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details") - - - - - @org.openecomp.aai.annotations.Metadata(description="Boolean as to whether this flavor is no longer enabled") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -1312,11 +623,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of openstack flavors.") - - @@ -1324,46 +630,16 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Openstack group-assignment used to store exclusivity groups (EG).",nameProps="group-name",indexedProps="group-id,group-type,group-name",dependentOn="cloud-region",container="group-assignments") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Group id, expected to be unique across cloud-region.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Group type - the type of group this instance refers to") - - - - - @org.openecomp.aai.annotations.Metadata(description="Group name - name assigned to the group") - - - - - @org.openecomp.aai.annotations.Metadata(description="Group description - description of the group") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -1371,11 +647,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of openstack group assignments") - - @@ -1383,88 +654,28 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Openstack snapshot",nameProps="snapshot-name",uniqueProps="snapshot-id",indexedProps="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id",dependentOn="cloud-region",container="snapshots") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Snapshot id, this is the key UUID assoc associated in glance with the snapshots.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Snapshot name") - - - - - @org.openecomp.aai.annotations.Metadata(description="Operating system architecture") - - - - - @org.openecomp.aai.annotations.Metadata(description="The common name of the operating system distribution in lowercase") - - - - - @org.openecomp.aai.annotations.Metadata(description="The operating system version as specified by the distributor.") - - - - - @org.openecomp.aai.annotations.Metadata(description="The application that the image instantiates.") - - - - - @org.openecomp.aai.annotations.Metadata(description="The vendor of the application.") - - - - - @org.openecomp.aai.annotations.Metadata(description="The version of the application.") - - - - - @org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details") - - - - - @org.openecomp.aai.annotations.Metadata(description="This field contains the UUID of the previous snapshot (if any).") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -1472,11 +683,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of openstack snapshots") - - @@ -1484,37 +690,17 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true) - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Collection of metadatum (key/value pairs)") - - @@ -1522,81 +708,26 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Openstack image.",nameProps="image-name",indexedProps="application,image-name,application-vendor,image-id,application-version",dependentOn="cloud-region",container="images") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Image id, expected to be unique across cloud region") - - - - - @org.openecomp.aai.annotations.Metadata(description="Image name") - - - - - @org.openecomp.aai.annotations.Metadata(description="Operating system architecture.") - - - - - @org.openecomp.aai.annotations.Metadata(description="The common name of the operating system distribution in lowercase") - - - - - @org.openecomp.aai.annotations.Metadata(description="The operating system version as specified by the distributor.") - - - - - @org.openecomp.aai.annotations.Metadata(description="The application that the image instantiates.") - - - - - @org.openecomp.aai.annotations.Metadata(description="The vendor of the application.") - - - - - @org.openecomp.aai.annotations.Metadata(description="The version of the application.") - - - - - @org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -1605,11 +736,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collectio of Openstack images.") - - @@ -1617,11 +743,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of availability zones") - - @@ -1629,74 +750,24 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&T's AIC.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Identifier used by the vendor for the region. Second part of composite key") - - - - - @org.openecomp.aai.annotations.Metadata(description="Type of the cloud (e.g., openstack)") - - - - - @org.openecomp.aai.annotations.Metadata(description="Cloud-owner defined type indicator (e.g., DCP, LCP)") - - - - - @org.openecomp.aai.annotations.Metadata(description="Software version employed at the site") - - - - - @org.openecomp.aai.annotations.Metadata(description="URL of the keystone identity service") - - - - - @org.openecomp.aai.annotations.Metadata(description="Zone where the cloud is homed") - - - - - @org.openecomp.aai.annotations.Metadata(description="complex name for cloud-region instance") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -1720,32 +791,12 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique name of network profile.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Encrypted SNMP community string") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -1753,11 +804,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of network profiles") - - @@ -1765,67 +811,22 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Name that identifies the physical interface") - - - - - @org.openecomp.aai.annotations.Metadata(description="Captures the numeric part of the speed") - - - - - @org.openecomp.aai.annotations.Metadata(description="Captures the units corresponding to the speed") - - - - - @org.openecomp.aai.annotations.Metadata(description="Nature of the services and connectivity on this port.") - - - - - @org.openecomp.aai.annotations.Metadata(description="CLEI or other specification for p-interface hardware.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Role specification for p-interface hardware.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Indicates the physical properties of the interface.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -1834,11 +835,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of physical interfaces.") - - @@ -1846,39 +842,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name",dependentOn="generic-vnf,pserver,vpe,vpls-pe,pnf",container="lag-interfaces") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Name that identifies the link aggregate interface") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Captures the numeric part of the speed") - - - - - @org.openecomp.aai.annotations.Metadata(description="Captures the units corresponding to the speed") - - @@ -1887,11 +858,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of link aggregate interfaces.") - - @@ -1899,137 +865,42 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,in-maint,pserver-id,pserver-name2",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address",container="pservers",namespace="cloud-infrastructure") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Value from executing hostname on the compute node.") - - - - - @org.openecomp.aai.annotations.Metadata(description="PTNII name") - - - - - @org.openecomp.aai.annotations.Metadata(description="Number of cpus") - - - - - @org.openecomp.aai.annotations.Metadata(description="Disk size, in GBs") - - - - - @org.openecomp.aai.annotations.Metadata(description="RAM size, in MBs") - - - - - @org.openecomp.aai.annotations.Metadata(description="Equipment type. Source of truth should define valid values.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Equipment vendor. Source of truth should define valid values.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Equipment model. Source of truth should define valid values.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Fully-qualified domain name") - - - - - @org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used to configure device, also used for troubleshooting and is IP used for traps generated by device.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Serial number, may be queried") - - - - - @org.openecomp.aai.annotations.Metadata(description="ID of Pserver") - - - - - @org.openecomp.aai.annotations.Metadata(description="internet topology of Pserver") - - - - - @org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - - - - @org.openecomp.aai.annotations.Metadata(description="alternative pserver name") - - - - - @org.openecomp.aai.annotations.Metadata(description="purpose of pserver") - - @@ -2039,11 +910,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of compute hosts.") - - @@ -2051,32 +917,12 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of the vdc") - - - - - @org.openecomp.aai.annotations.Metadata(description="Name of the virtual data center") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -2084,11 +930,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context") - - @@ -2096,11 +937,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Namespace for cloud infrastructure.") - - @@ -2112,60 +948,20 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version",container="connectors",namespace="business") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of resource instance.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",dbAlias="model-invariant-id-local",requires="persona-model-version",visibility="deployment") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="persona-model-id") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dbAlias="model-version-id-local",dataCopy="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&AI widget.") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.") - - @@ -2174,11 +970,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets") - - @@ -2186,116 +977,36 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Instance of a service",indexedProps="service-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id",nameProps="service-instance-name",searchable="service-instance-id",uniqueProps="service-instance-id",dependentOn="service-subscription",container="service-instances") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this instance of a service") - - - - - @org.openecomp.aai.annotations.Metadata(description="This field will store a name assigned to the service-instance.") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",dbAlias="model-invariant-id-local",requires="persona-model-version",visibility="deployment") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="persona-model-id") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dbAlias="model-version-id-local",dataCopy="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&AI widget.") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Indicates the total bandwidth to be used for this service.") - - - - - @org.openecomp.aai.annotations.Metadata(description="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device.") - - - - - @org.openecomp.aai.annotations.Metadata(description="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device.") - - - - - @org.openecomp.aai.annotations.Metadata(description="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device.") - - - - - @org.openecomp.aai.annotations.Metadata(description="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device.") - - - - - @org.openecomp.aai.annotations.Metadata(description="URL customers will use to access the vHN Portal.") - - - - - @org.openecomp.aai.annotations.Metadata(description="An identifier that customers assign to the location where this service is being used.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -2304,11 +1015,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of service instances") - - @@ -2316,32 +1022,12 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Object that group service instances.",indexedProps="service-type",dependentOn="customer",container="service-subscriptions") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Value defined by orchestration to identify this service across ECOMP.") - - - - - @org.openecomp.aai.annotations.Metadata(description="This property will be deleted from A&AI in the near future. Only stop gap solution.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -2350,11 +1036,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of objects that group service instances.") - - @@ -2362,39 +1043,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="subscriber-name,global-customer-id",uniqueProps="global-customer-id",container="customers",namespace="business") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Global customer id used across ECOMP to uniquely identify customer.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Subscriber name, an alternate way to retrieve a customer.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Subscriber type, a way to provide VID with only the INFRA customers.",defaultValue="CUST") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -2403,11 +1059,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of customer identifiers to provide linkage back to BSS information.") - - @@ -2415,11 +1066,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Namespace for business related constructs") - - @@ -2428,53 +1074,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers. This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of this asset") - - - - - @org.openecomp.aai.annotations.Metadata(description="The application that the image instantiates.") - - - - - @org.openecomp.aai.annotations.Metadata(description="The vendor of the application.") - - - - - @org.openecomp.aai.annotations.Metadata(description="The version of the application.") - - - - - @org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -2482,11 +1093,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of image objects that pertain to a VNF that doesn't have associated vservers. This is a kludge.") - - @@ -2494,46 +1100,16 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Stand-in for service model definitions. Likely to be deprecated in favor of models from ASDC.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Description of the service") - - - - - @org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - - - - @org.openecomp.aai.annotations.Metadata(description="service version") - - @@ -2541,11 +1117,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of service model definitions. Likely to be deprecated in favor of models from ASDC.") - - @@ -2553,32 +1124,12 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models. No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="String capturing type of vnf, that was intended to identify the ASDC resource. This field has been overloaded and clients should expect changes to occur in the future to this field as ASDC matures.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -2586,11 +1137,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of service capabilities.") - - @@ -2598,18 +1144,8 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="element-choice-set-uuid",indexedProps="element-choice-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="element-choice-sets") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true") - - @@ -2628,18 +1164,8 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",container="constrained-element-sets") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true") - - @@ -2658,18 +1184,8 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-constraints") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true") - - @@ -2685,54 +1201,19 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true") - - - - - @org.openecomp.aai.annotations.Metadata(description="Indicates whether this element was created as part of instantiation from this model") - - - - - @org.openecomp.aai.annotations.Metadata(description="How many of this type of element are required/allowed") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model") - - - - - @org.openecomp.aai.annotations.Metadata(description="Describes new constraints on this model element that are not part of that model's definition") - - @@ -2747,60 +1228,20 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models",nameProps="model-name,model-type",indexedProps="model-name-version-id,model-type,model-name,model-id,model-version",alternateKeys1="model-id,model-version",uniqueProps="model-name-version-id",container="models",namespace="service-design-and-creation") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC") - - - - - @org.openecomp.aai.annotations.Metadata(description="Type of the model, e.g., service, resource, widget, etc.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Name of the model, which can change from version to version.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Invariant unique ID which does not change from version to version") - - - - - @org.openecomp.aai.annotations.Metadata(description="Version") - - - - - @org.openecomp.aai.annotations.Metadata(description="Description") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -2810,11 +1251,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models") - - @@ -2822,18 +1258,8 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="TBD",uniqueProps="related-lookup-uuid",indexedProps="related-lookup-uuid",allowDirectRead="true",allowDirectWrite="false",container="related-lookups") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true") - - @@ -2854,18 +1280,8 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="TBD",uniqueProps="property-constraint-uuid",indexedProps="property-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",container="property-constraints") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true") - - @@ -2883,18 +1299,8 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="TBD",uniqueProps="named-query-element-uuid",indexedProps="named-query-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="named-query-elements") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,autoGenerateUuid="true") - - @@ -2916,28 +1322,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true) - - - - - @org.openecomp.aai.annotations.Metadata(description="TBD",nameProps="named-query-name",uniqueProps="named-query-uuid",indexedProps="named-query-uuid,named-query-name",container="named-queries",namespace="service-design-and-creation") - - @@ -2959,11 +1350,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Namespace for objects managed by ASDC") - - @@ -2975,123 +1361,38 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,link-id",uniqueProps="link-id",container="logical-links",namespace="network") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ") - - - - - @org.openecomp.aai.annotations.Metadata(description="Type of logical link, e.g., evc") - - - - - @org.openecomp.aai.annotations.Metadata(description="Captures the numeric part of the speed") - - - - - @org.openecomp.aai.annotations.Metadata(description="Captures the units corresponding to the speed") - - - - - @org.openecomp.aai.annotations.Metadata(description="v4, v6, or ds for dual stack") - - - - - @org.openecomp.aai.annotations.Metadata(description="For example, static or BGP") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",dbAlias="model-invariant-id-local",requires="persona-model-version",visibility="deployment") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="persona-model-id") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dbAlias="model-version-id-local",dataCopy="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&AI widget.") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Indication of operational status of the logical link.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Indication of the network use of the logical link.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Alias or alternate name (CLCI or D1 name).") - - - - - @org.openecomp.aai.annotations.Metadata(description="UUID of the logical-link, SDNC generates this.") - - @@ -3099,11 +1400,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of logical connections") - - @@ -3111,39 +1407,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(indexedProps="cos",dependentOn="site-pair",container="classes-of-service") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="unique identifier of probe") - - - - - @org.openecomp.aai.annotations.Metadata(description="identifier of probe") - - - - - @org.openecomp.aai.annotations.Metadata(description="type of probe") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -3151,11 +1422,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="class-of-service of probe") - - @@ -3163,60 +1429,20 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(indexedProps="site-pair-id",uniqueProps="site-pair-id",dependentOn="routing-instance",container="site-pairs") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="unique identifier of probe") - - - - - @org.openecomp.aai.annotations.Metadata(description="Prefix address") - - - - - @org.openecomp.aai.annotations.Metadata(description="Prefix address") - - - - - @org.openecomp.aai.annotations.Metadata(description="ip version, v4, v6") - - - - - @org.openecomp.aai.annotations.Metadata(description="Hostname of the destination equipment to which SLAs are measured against.") - - - - - @org.openecomp.aai.annotations.Metadata(description="The type of destinatination equipment. Could be Router, etc.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -3225,11 +1451,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="probe within a set") - - @@ -3237,32 +1458,12 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(indexedProps="routing-instance-id",uniqueProps="routing-instance-id",dependentOn="site-pair-set",container="routing-instances") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of routing instance") - - - - - @org.openecomp.aai.annotations.Metadata(description="rpm owner") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -3271,11 +1472,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="set of probes related to generic-vnf routing instance") - - @@ -3283,25 +1479,10 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of site pair set.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -3310,11 +1491,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of sets of instances for probes related to generic-vnf") - - @@ -3322,53 +1498,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name",indexedProps="vpn-name,vpn-id,global-route-target",uniqueProps="vpn-id",container="vpn-bindings",namespace="network") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="VPN ID, globally unique within A&AI") - - - - - @org.openecomp.aai.annotations.Metadata(description="VPN Name") - - - - - @org.openecomp.aai.annotations.Metadata(description="Number used to identify a VPN, globally unique in the network") - - - - - @org.openecomp.aai.annotations.Metadata(description="the platform associated with the VPN example AVPN, Mobility") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - - - - @org.openecomp.aai.annotations.Metadata(description="l3-networks relate to vpn-bindings") - - @@ -3382,53 +1523,18 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true) - - - - - @org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).") - - - - - @org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value, e.g., VPLS-PE.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Temporary location for stag to get to VCE") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -3438,11 +1544,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of VPLS Provider Edge routers") - - @@ -3450,39 +1551,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(indexedProps="multicast-configuration-id",uniqueProps="multicast-configuration-id",container="multicast-configurations",namespace="network") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of multicast configuration.") - - - - - @org.openecomp.aai.annotations.Metadata(description="protocol of multicast configuration") - - - - - @org.openecomp.aai.annotations.Metadata(description="rp type of multicast configuration") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -3490,11 +1566,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="multicast configuration of generic-vnf ip-address") - - @@ -3502,25 +1573,10 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="See mis-na-virtualization-platform.yang") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -3535,88 +1591,28 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.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") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of the interface") - - - - - @org.openecomp.aai.annotations.Metadata(description="Neutron network id of this Interface") - - - - - @org.openecomp.aai.annotations.Metadata(description="Neutron network name of this Interface") - - - - - @org.openecomp.aai.annotations.Metadata(description="Role assigned to this Interface, should use values as defined in ECOMP Yang models.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Unique ID for port group in vmware") - - - - - @org.openecomp.aai.annotations.Metadata(description="Likely to duplicate value of neutron network name") - - - - - @org.openecomp.aai.annotations.Metadata(description="DVS or standard switch name (should be non-null for port groups associated with DVS)") - - - - - @org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO") - - - - - @org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO") - - - - - @org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE") - - @@ -3632,144 +1628,44 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.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") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF. This is unique across the graph.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Name of VNF.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.") - - - - - @org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource. This field has been overloaded and clients should expect changes to occur in the future to this field as ASDC matures.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Unique identifier of service from ASDC. Expect this to change as ASDC matures.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values") - - - - - @org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational",dbAlias="operational-status") - - - - - @org.openecomp.aai.annotations.Metadata(description="License key") - - - - - @org.openecomp.aai.annotations.Metadata(description="Network role being played by this VNF") - - - - - @org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO") - - - - - @org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO") - - - - - @org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE") - - - - - @org.openecomp.aai.annotations.Metadata(description="Unique ID of VPE connected to this VCE.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Valid v6 IP address for the WAN Link on this router. Implied length of /64.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Loopback0 address") - - - - - @org.openecomp.aai.annotations.Metadata(description="Entitlement resource uuid") - - @@ -3778,11 +1674,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of Virtual Customer Edge Routers, used specifically for Gamma. This object is deprecated.") - - @@ -3790,165 +1681,50 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Relationship-list must include related to info for complex.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vpes",namespace="network",extendsFrom="vnf") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF. This is unique across the graph.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Name of VNF.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.") - - - - - @org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource. This field has been overloaded and clients should expect changes to occur in the future to this field as ASDC matures.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Unique identifier of service from ASDC") - - - - - @org.openecomp.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values") - - - - - @org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational",dbAlias="operational-status") - - - - - @org.openecomp.aai.annotations.Metadata(description="License key") - - - - - @org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value") - - - - - @org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO") - - - - - @org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO") - - - - - @org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE") - - - - - @org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).") - - - - - @org.openecomp.aai.annotations.Metadata(description="Prefix length for oam-address") - - - - - @org.openecomp.aai.annotations.Metadata(description="Gateway address") - - - - - @org.openecomp.aai.annotations.Metadata(description="Loopback0 address") - - - - - @org.openecomp.aai.annotations.Metadata(description="Temporary location for stag to get to VCE") - - - - - @org.openecomp.aai.annotations.Metadata(description="as-number of the VPE") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - - - - @org.openecomp.aai.annotations.Metadata(description="details regarding the vpe operation") - - - - - @org.openecomp.aai.annotations.Metadata(description="indicates whether vpe access uses SSH") - - @@ -3958,11 +1734,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Virtual provider edge router. In 1504, A&AI will populate this object through an M&P and tool provided to operations.") - - @@ -3970,81 +1741,26 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(indexedProps="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation",container="vnfcs",namespace="network") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of vnfc.") - - - - - @org.openecomp.aai.annotations.Metadata(description="function code") - - - - - @org.openecomp.aai.annotations.Metadata(description="type") - - - - - @org.openecomp.aai.annotations.Metadata(description="prov status of this vnfc") - - - - - @org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by APP-C") - - - - - @org.openecomp.aai.annotations.Metadata(description="Oam V4 vip address of this vnfc") - - - - - @org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)") - - - - - @org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node") - - - - - @org.openecomp.aai.annotations.Metadata(description="Group notation of VNFC") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -4052,11 +1768,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="virtual network components associated with a vserver from application controller.") - - @@ -4064,95 +1775,30 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(indexedProps="subnet-id,subnet-name",nameProps="subnet-name",uniqueProps="subnet-id",dependentOn="l3-network",container="subnets") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Subnet ID, should be UUID.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Name associated with the subnet.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Neutron id of this subnet") - - - - - @org.openecomp.aai.annotations.Metadata(description="gateway ip address") - - - - - @org.openecomp.aai.annotations.Metadata(description="network start address") - - - - - @org.openecomp.aai.annotations.Metadata(description="cidr mask") - - - - - @org.openecomp.aai.annotations.Metadata(description="ip version") - - - - - @org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO") - - - - - @org.openecomp.aai.annotations.Metadata(defaultValue="false",description="dhcp enabled") - - - - - @org.openecomp.aai.annotations.Metadata(description="the start address reserved for use by dhcp") - - - - - @org.openecomp.aai.annotations.Metadata(description="the last address reserved for use by dhcp") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -4167,25 +1813,10 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(indexedProps="vlan-id-inner",dependentOn="l3-network",container="ctag-assignments") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="id.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -4200,25 +1831,10 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Openstack segmentation assignment.",indexedProps="segmentation-id",dependentOn="l3-network",container="segmentation-assignments") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Concurrency value") - - @@ -4226,11 +1842,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of openstack segmentation assignments") - - @@ -4238,182 +1849,57 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Generic network definition",nameProps="network-name",indexedProps="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",uniqueProps="network-id",container="l3-networks",namespace="network") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Network ID, should be uuid. Unique across A&AI.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Name of the network, governed by some naming convention..") - - - - - @org.openecomp.aai.annotations.Metadata(description="Type of the network - who defines these values?") - - - - - @org.openecomp.aai.annotations.Metadata(description="Role the network plans - who defines these values?") - - - - - @org.openecomp.aai.annotations.Metadata(description="Network technology - who defines these values?") - - - - - @org.openecomp.aai.annotations.Metadata(description="Neutron network id of this Interface") - - - - - @org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Set to true if bound to VPN") - - - - - @org.openecomp.aai.annotations.Metadata(description="Unique identifier of service from ASDC") - - - - - @org.openecomp.aai.annotations.Metadata(description="network role instance") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO") - - - - - @org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO") - - - - - @org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE") - - - - - @org.openecomp.aai.annotations.Metadata(description="Contrail FQDN for the network") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",dbAlias="model-invariant-id-local",requires="persona-model-version",visibility="deployment") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="persona-model-id") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dbAlias="model-version-id-local",dataCopy="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&AI widget.") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Name associated with the physical network.") - - - - - @org.openecomp.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a provider network.") - - - - - @org.openecomp.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is a shared network.") - - - - - @org.openecomp.aai.annotations.Metadata(defaultValue="false",description="boolean indicatating whether or not network is an external network.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding") - - @@ -4427,39 +1913,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(nameProps="network-policy-fqdn",indexedProps="network-policy-id,network-policy-fqdn",uniqueProps="network-policy-id",container="network-policies",namespace="network") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID representing unique key to this instance") - - - - - @org.openecomp.aai.annotations.Metadata(description="Contrail FQDN for the policy") - - - - - @org.openecomp.aai.annotations.Metadata(description="ID for the openStack Heat instance") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -4474,95 +1935,30 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="a deployment unit of VNFCs",indexedProps="vf-module-id,vf-module-name,heat-stack-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-service-instance-fqdn",dependentOn="generic-vnf",container="vf-modules") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of vf-module.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Name of vf-module") - - - - - @org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance.") - - - - - @org.openecomp.aai.annotations.Metadata(description="orchestration status of this vf-module, mastered by MSO") - - - - - @org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is base vf module") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",dbAlias="model-invariant-id-local",requires="persona-model-version",visibility="deployment") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="persona-model-id") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dbAlias="model-version-id-local",dataCopy="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&AI widget.") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.") - - - - - @org.openecomp.aai.annotations.Metadata(description="the Contrail unique ID for a service-instance") - - @@ -4570,11 +1966,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of vf-modules, a deployment unit of VNFCs") - - @@ -4582,263 +1973,78 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF. This is unique across the graph.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Name of VNF.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.") - - - - - @org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource. This field has been overloaded and clients should expect changes to occur in the future to this field as ASDC matures.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Unique identifier of service from ASDC") - - - - - @org.openecomp.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values") - - - - - @org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational",dbAlias="operational-status") - - - - - @org.openecomp.aai.annotations.Metadata(description="License key") - - - - - @org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value") - - - - - @org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, used by MSO.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO") - - - - - @org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE") - - - - - @org.openecomp.aai.annotations.Metadata(description="identifier of managed by company or customer") - - - - - @org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by generic-vnf.") - - - - - @org.openecomp.aai.annotations.Metadata(description="v4 Loopback0 address") - - - - - @org.openecomp.aai.annotations.Metadata(description="v6 Loopback address") - - - - - @org.openecomp.aai.annotations.Metadata(description="v6 management address") - - - - - @org.openecomp.aai.annotations.Metadata(description="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors") - - - - - @org.openecomp.aai.annotations.Metadata(description="units associated with vcpu, used for VNFs with no vservers/flavors") - - - - - @org.openecomp.aai.annotations.Metadata(description="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors") - - - - - @org.openecomp.aai.annotations.Metadata(description="units associated with vmemory, used for VNFs with no vservers/flavors") - - - - - @org.openecomp.aai.annotations.Metadata(description="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors") - - - - - @org.openecomp.aai.annotations.Metadata(description="units associated with vdisk, used for VNFs with no vservers/flavors") - - - - - @org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.") - - - - - @org.openecomp.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether closed loop function is enabled on this node") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - - - - @org.openecomp.aai.annotations.Metadata(description="details regarding the generic-vnf operation") - - - - - @org.openecomp.aai.annotations.Metadata(description="indicates whether generic-vnf access uses SSH") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",dbAlias="model-invariant-id-local",requires="persona-model-version",visibility="deployment") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="persona-model-id") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dbAlias="model-version-id-local",dataCopy="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&AI widget.") - - - - - @org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.") - - - - - @org.openecomp.aai.annotations.Metadata(description="as-number of the VNF") - - - - - @org.openecomp.aai.annotations.Metadata(description="represents sub zone of the rr plane") - - @@ -4849,11 +2055,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of VNFs") - - @@ -4861,25 +2062,10 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Alphabetical concatenation of lag-interface names") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -4887,11 +2073,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of link aggregation connections") - - @@ -4899,109 +2080,34 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf. This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF, can't use same attribute name right now until we promote this new object") - - - - - @org.openecomp.aai.annotations.Metadata(description="Name of VNF.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.") - - - - - @org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource. This field has been overloaded and clients should expect changes to occur in the future to this field as ASDC matures.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational",dbAlias="operational-status") - - - - - @org.openecomp.aai.annotations.Metadata(description="License key") - - - - - @org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).") - - - - - @org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value, e.g., VPE.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - - - - @org.openecomp.aai.annotations.Metadata(description="v4 Loopback0 address") - - - - - @org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO") - - - - - @org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE") - - @@ -5010,11 +2116,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf. This object will be retired with vce.") - - @@ -5022,109 +2123,34 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world.",indexedProps="pnf-name,orchestration-status",uniqueProps="pnf-name",container="pnfs",namespace="network") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="unique name of Physical Network Function.") - - - - - @org.openecomp.aai.annotations.Metadata(description="name of Physical Network Function.") - - - - - @org.openecomp.aai.annotations.Metadata(description="source of name2") - - - - - @org.openecomp.aai.annotations.Metadata(description="id of pnf") - - - - - @org.openecomp.aai.annotations.Metadata(description="Equipment type. Source of truth should define valid values.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Equipment vendor. Source of truth should define valid values.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Equipment model. Source of truth should define valid values.") - - - - - @org.openecomp.aai.annotations.Metadata(description="identifier of managed by company or customer") - - - - - @org.openecomp.aai.annotations.Metadata(description="ipv4-oam-address with new naming convention for IP addresses") - - - - - @org.openecomp.aai.annotations.Metadata(description="sw-version is the version of SW for the hosted application on the PNF.") - - - - - @org.openecomp.aai.annotations.Metadata(description="orchestration-status is the status of orchestration on the PNF.") - - - - - @org.openecomp.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.") - - - - - @org.openecomp.aai.annotations.Metadata(description="ID of the physical frame (relay rack) where pnf is installed.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -5134,11 +2160,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of Physical Network Functions.") - - @@ -5146,67 +2167,22 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces",indexedProps="circuit-id,link-name",alternateKeys1="circuit-id",container="physical-links",namespace="network") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ") - - - - - @org.openecomp.aai.annotations.Metadata(description="Captures the numeric part of the speed") - - - - - @org.openecomp.aai.annotations.Metadata(description="Captures the units corresponding to the speed") - - - - - @org.openecomp.aai.annotations.Metadata(description="Circuit it") - - - - - @org.openecomp.aai.annotations.Metadata(description="Dual access mode (e.g., primary, secondary") - - - - - @org.openecomp.aai.annotations.Metadata(description="To provide information on who manages this circuit. A&AI or 3rd party transport provider") - - - - - @org.openecomp.aai.annotations.Metadata(description="Name of the service Provider on this link.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -5214,11 +2190,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of physical connections, typically between p-interfaces") - - @@ -5226,39 +2197,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="indicates whether the VIG is for AVPN or INTERNET") - - - - - @org.openecomp.aai.annotations.Metadata(description="v4 IP of the vig server") - - - - - @org.openecomp.aai.annotations.Metadata(description="v6 IP of the vig server") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -5273,165 +2219,50 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID of this configuration") - - - - - @org.openecomp.aai.annotations.Metadata(description="Indicate the type of VIG server like AVPN, INTERNET, BOTH") - - - - - @org.openecomp.aai.annotations.Metadata(description="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc") - - - - - @org.openecomp.aai.annotations.Metadata(description="can offer a shared DMZ or a DMZ specific to a customer") - - - - - @org.openecomp.aai.annotations.Metadata(description="Network address of shared DMZ") - - - - - @org.openecomp.aai.annotations.Metadata(description="If the DMZ is a custom DMZ, this field will indicate the customer information") - - - - - @org.openecomp.aai.annotations.Metadata(description="can be 1 or 2") - - - - - @org.openecomp.aai.annotations.Metadata(description="Contains values like md5, sha1, sha256, sha384") - - - - - @org.openecomp.aai.annotations.Metadata(description="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc") - - - - - @org.openecomp.aai.annotations.Metadata(description="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14") - - - - - @org.openecomp.aai.annotations.Metadata(description="Group name defined in VIG for clients using aggressive mode") - - - - - @org.openecomp.aai.annotations.Metadata(description="pre-shared key for the above group name ") - - - - - @org.openecomp.aai.annotations.Metadata(description="Lifetime for IKEv1 SA") - - - - - @org.openecomp.aai.annotations.Metadata(description="md5, sha1, sha256, sha384") - - - - - @org.openecomp.aai.annotations.Metadata(description="3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc") - - - - - @org.openecomp.aai.annotations.Metadata(description="Life time for IPSec SA") - - - - - @org.openecomp.aai.annotations.Metadata(description="enable PFS or not") - - - - - @org.openecomp.aai.annotations.Metadata(description="user ID for xAuth, sm-user, ,nmteHostName") - - - - - @org.openecomp.aai.annotations.Metadata(description="Encrypted using the Juniper $9$ algorithm") - - - - - @org.openecomp.aai.annotations.Metadata(description="The time between DPD probe") - - - - - @org.openecomp.aai.annotations.Metadata(description="Maximum number of DPD before claiming the tunnel is down") - - - - - @org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - @@ -5447,32 +2278,12 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.") - - - - - @org.openecomp.aai.annotations.Metadata(description="FQDN entry in the route table.") - - - - - @org.openecomp.aai.annotations.Metadata(description="Concurrency value") - - @@ -5480,11 +2291,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Collection of openstack route table references") - - @@ -5492,11 +2298,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Namespace for network inventory resources.") - - @@ -5520,11 +2321,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key",indexedProps="aai-unique-key,source-of-truth,aai-node-type") - - @@ -5537,11 +2333,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Internal map to define the properties of an edge and interpret the map EdgeRules",edgeInfo="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV") - - @@ -5604,11 +2395,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="QueryParameters for performing a named-query or model query") - - @@ -5622,11 +2408,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="InstanceFilters for performing a named-query or model query") - - @@ -5634,11 +2415,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query") - - @@ -5648,11 +2424,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Property holder for query properties or instance properties") - - @@ -5666,11 +2437,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Inventory item for response list",container="inventory-response-items") - - @@ -5680,11 +2446,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Container for inventory items in response list",container="response-list") - - @@ -5692,11 +2453,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Response container for the results of a named-query or model query") - - @@ -5711,18 +2467,8 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - @org.openecomp.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,vpe,generic-vnf",isAbstract="true") - - - - - @org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF. This is unique across the graph.") - - diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml index efba01b5..9fae061b 100644 --- a/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml +++ b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml @@ -2290,7 +2290,7 @@ - + @@ -2324,8 +2324,8 @@ - - + + diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v8.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v8.xml index e00e5df1..ba71f6ac 100644 --- a/aai-schema/src/main/resources/oxm/aai_oxm_v8.xml +++ b/aai-schema/src/main/resources/oxm/aai_oxm_v8.xml @@ -2073,6 +2073,7 @@ +