diff options
72 files changed, 5025 insertions, 11601 deletions
diff --git a/aai-annotations/.gitignore b/aai-annotations/.gitignore index ae3c1726..2f30844c 100644 --- a/aai-annotations/.gitignore +++ b/aai-annotations/.gitignore @@ -1 +1,2 @@ /bin/ +/.checkstyle diff --git a/aai-annotations/src/test/java/org/openecomp/aai/annotations/AnnotationsTest.java b/aai-annotations/src/test/java/org/openecomp/aai/annotations/AnnotationsTest.java index 848d8b08..e97cdef8 100644 --- a/aai-annotations/src/test/java/org/openecomp/aai/annotations/AnnotationsTest.java +++ b/aai-annotations/src/test/java/org/openecomp/aai/annotations/AnnotationsTest.java @@ -17,6 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.openecomp.aai.annotations; import org.openecomp.aai.annotations.Metadata; diff --git a/aai-core/.gitignore b/aai-core/.gitignore index 574ae547..2db7c680 100644 --- a/aai-core/.gitignore +++ b/aai-core/.gitignore @@ -9,3 +9,4 @@ bundleconfig-local/etc/logback.xml /.pydevproject /test_csvWriter.csv /bin/ +/.checkstyle diff --git a/aai-core/pom.xml b/aai-core/pom.xml index 3fa131f7..7248f491 100644 --- a/aai-core/pom.xml +++ b/aai-core/pom.xml @@ -428,6 +428,12 @@ <groupId>com.att.nsa</groupId> <artifactId>dmaapClient</artifactId> <version>0.2.12</version> + <exclusions> + <exclusion> + <groupId>com.att.aft</groupId> + <artifactId>dme2</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId> diff --git a/aai-core/src/main/java/org/openecomp/aai/dmaap/AAIDmaapEventJMSProducer.java b/aai-core/src/main/java/org/openecomp/aai/dmaap/AAIDmaapEventJMSProducer.java index 06a4fa0f..89ed9348 100644 --- a/aai-core/src/main/java/org/openecomp/aai/dmaap/AAIDmaapEventJMSProducer.java +++ b/aai-core/src/main/java/org/openecomp/aai/dmaap/AAIDmaapEventJMSProducer.java @@ -23,6 +23,7 @@ package org.openecomp.aai.dmaap; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.command.ActiveMQQueue; import org.json.JSONObject; +import org.openecomp.aai.util.AAIConfig; import org.springframework.jms.connection.CachingConnectionFactory; import org.springframework.jms.core.JmsTemplate; @@ -31,14 +32,18 @@ public class AAIDmaapEventJMSProducer { private JmsTemplate jmsTemplate; public AAIDmaapEventJMSProducer() { - this.jmsTemplate = new JmsTemplate(); - this.jmsTemplate.setConnectionFactory(new CachingConnectionFactory(new ActiveMQConnectionFactory("tcp://localhost:61447"))); - this.jmsTemplate.setDefaultDestination(new ActiveMQQueue("IN_QUEUE")); + if(AAIConfig.get("aai.jms.enable", "true").equals("true")){ + this.jmsTemplate = new JmsTemplate(); + this.jmsTemplate.setConnectionFactory(new CachingConnectionFactory(new ActiveMQConnectionFactory("tcp://localhost:61447"))); + this.jmsTemplate.setDefaultDestination(new ActiveMQQueue("IN_QUEUE")); + } } public void sendMessageToDefaultDestination(JSONObject finalJson) { - jmsTemplate.convertAndSend(finalJson.toString()); - CachingConnectionFactory ccf = (CachingConnectionFactory)this.jmsTemplate.getConnectionFactory(); - ccf.destroy(); + if(jmsTemplate != null){ + jmsTemplate.convertAndSend(finalJson.toString()); + CachingConnectionFactory ccf = (CachingConnectionFactory) this.jmsTemplate.getConnectionFactory(); + ccf.destroy(); + } } } diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/db/EdgeProperty.java b/aai-core/src/main/java/org/openecomp/aai/serialization/db/EdgeProperty.java index 29461bcf..21f07451 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/db/EdgeProperty.java +++ b/aai-core/src/main/java/org/openecomp/aai/serialization/db/EdgeProperty.java @@ -21,10 +21,16 @@ package org.openecomp.aai.serialization.db; public enum EdgeProperty { + FROM("from"), + TO("to"), + LABEL("label"), + DIRECTION("direction"), + MULTIPLICITY("multiplicity"), CONTAINS("contains-other-v"), DELETE_OTHER_V("delete-other-v"), SVC_INFRA("SVC-INFRA"), PREVENT_DELETE("prevent-delete"); + private final String name; private EdgeProperty(String name) { diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/db/EdgeRules.java b/aai-core/src/main/java/org/openecomp/aai/serialization/db/EdgeRules.java index 0aeafabc..22a94554 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/db/EdgeRules.java +++ b/aai-core/src/main/java/org/openecomp/aai/serialization/db/EdgeRules.java @@ -40,7 +40,6 @@ 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.dbmodel.DbEdgeRules; import org.openecomp.aai.exceptions.AAIException; import org.openecomp.aai.introspection.Version; import org.openecomp.aai.serialization.db.exceptions.EdgeMultiplicityException; @@ -58,8 +57,6 @@ public class EdgeRules { private EELFLogger logger = EELFManager.getInstance().getLogger(EdgeRules.class); - private Multimap<String, String> deleteScope = DbEdgeRules.DefaultDeleteScope; - private DocumentContext rulesDoc; /** @@ -74,22 +71,28 @@ public class EdgeRules { } + private EdgeRules(String rulesFilename) { + String json = this.getEdgeRuleJson(rulesFilename); + rulesDoc = JsonPath.parse(json); + } + + private String getEdgeRuleJson(String rulesFilename) { + InputStream is = getClass().getResourceAsStream(rulesFilename); + + Scanner scanner = new Scanner(is); + String json = scanner.useDelimiter("\\Z").next(); + scanner.close(); + + return json; + } + /** * Loads the versioned DbEdgeRules json file for later parsing. */ @SuppressWarnings("unchecked") private EdgeRules(Version version) { - String json = this.getEdgeRuleJson(version); rulesDoc = JsonPath.parse(json); - - if (!Version.isLatest(version)) { - try { - Class<?> dbEdgeRules = Class.forName("org.openecomp.aai.dbmodel." + version.toString() + ".gen.DbEdgeRules"); - this.deleteScope = (Multimap<String, String>)dbEdgeRules.getDeclaredField("DefaultDeleteScope").get(null); - } catch (Exception e) { - } - } } private String getEdgeRuleJson(Version version) { @@ -105,6 +108,11 @@ public class EdgeRules { private static class Helper { private static final EdgeRules INSTANCE = new EdgeRules(); private static final Map<Version, EdgeRules> INSTANCEMAP = new ConcurrentHashMap<>(); + + private static EdgeRules getEdgeRulesByFilename(String rulesFilename) { + return new EdgeRules(rulesFilename); + } + private static EdgeRules getVersionedEdgeRules(Version v) { if (Version.isLatest(v)) { return INSTANCE; @@ -137,6 +145,16 @@ public class EdgeRules { } /** + * Loads edge rules from the given file. + * + * @param rulesFilename - name of the file to load rules from + * @return the EdgeRules instance + */ + public static EdgeRules getInstance(String rulesFilename) { + return Helper.getEdgeRulesByFilename(rulesFilename); + } + + /** * Adds the tree edge. * * @param aVertex the out vertex @@ -252,8 +270,8 @@ public class EdgeRules { where("from").is(nodeB).and("to").is(nodeA) ); - List<Object> results = rulesDoc.read("$.rules.[?]", aToB); - results.addAll(rulesDoc.read("$.rules.[?]", bToA)); + List<Map<String, String>> results = readRules(aToB); + results.addAll(readRules(bToA)); return !results.isEmpty(); @@ -300,6 +318,8 @@ public class EdgeRules { return result; } + + /** * Gets the edge rule of the given type that exists between A and B. * Will check B|A as well, and flips the direction accordingly if that succeeds @@ -313,19 +333,21 @@ public class EdgeRules { */ public EdgeRule getEdgeRule(EdgeType type, String nodeA, String nodeB) throws AAIException { //try A to B - List<Map<String, String>> aToBEdges = rulesDoc.read("$.rules.[?]", buildFilter(type, nodeA, nodeB)); + List<Map<String, String>> aToBEdges = readRules(buildFilter(type, nodeA, nodeB)); if (!aToBEdges.isEmpty()) { //lazily stop iterating if we find a match //should there be a mismatch between type and isParent, //the caller will receive something. //this operates on the assumption that there are at most two rules //for a given vertex pair + verifyRule(aToBEdges.get(0)); return buildRule(aToBEdges.get(0)); } //we get here if there was nothing for A to B, so let's try B to A - List<Map<String, String>> bToAEdges = rulesDoc.read("$.rules.[?]", buildFilter(type, nodeB, nodeA)); + List<Map<String, String>> bToAEdges = readRules(buildFilter(type, nodeB, nodeA)); if (!bToAEdges.isEmpty()) { + verifyRule(bToAEdges.get(0)); return flipDirection(buildRule(bToAEdges.get(0))); //bc we need to return as A|B, so flip the direction to match } @@ -468,6 +490,61 @@ public class EdgeRules { } /** + * Verifies that all required properties are defined in the given edge rule. + * If they are not, throws a RuntimeException. + * + * @param rule - Map<String edge property, String edge property value> representing + * an edge rule + */ + private void verifyRule(Map<String, String> rule) { + for (EdgeProperty prop : EdgeProperty.values()) { + if (!rule.containsKey(prop.toString())) { + /* Throws RuntimeException as rule definition errors + * cannot be recovered from, and should never happen anyway + * because these are configuration files, so requiring all + * downstream code to check for this exception seems inappropriate. + * It's instantiated with an AAIException to make sure all + * relevant information is present in the error message. + */ + throw new RuntimeException(new AAIException("AAI_4005", + "Rule between " + rule.get("from") + " and " + rule.get("to") + + " is missing property " + prop + ".")); + } + } + } + + /** + * Reads all the edge rules from the loaded json file. + * + * @return List<Map<String edge property, String edge property value>> + * Each map represents a rule read from the json. + */ + private List<Map<String, String>> readRules() { + return readRules(null); + } + + /** + * Reads the edge rules from the loaded json file, using the given filter + * to get specific rules. If filter is null, will get all rules. + * + * @param filter - may be null to indicate get all + * @return List<Map<String edge property, String edge property value>> + * Each map represents a rule read from the json. + */ + private List<Map<String, String>> readRules(Filter filter) { + List<Map<String, String>> results; + if (filter == null) { //no filter means get all + results = rulesDoc.read("$.rules.*"); + } else { + results = rulesDoc.read("$.rules.[?]", filter); + } + for (Map<String, String> result : results) { + verifyRule(result); + } + return results; + } + + /** * Gets all the edge rules we define. * * @return Multimap<String "from|to", EdgeRule rule> @@ -475,7 +552,7 @@ public class EdgeRules { public Multimap<String, EdgeRule> getAllRules() { Multimap<String, EdgeRule> result = ArrayListMultimap.create(); - List<Map<String, String>> rules = rulesDoc.read("$.rules.*"); + List<Map<String, String>> rules = readRules(); for (Map<String, String> rule : rules) { EdgeRule er = buildRule(rule); String name = rule.get("from") + "|" + rule.get("to"); @@ -485,19 +562,23 @@ public class EdgeRules { return result; } - public Multimap<String, String> getDeleteSemantics() { - return this.deleteScope; - } - + /** + * Gets all edge rules that define a child relationship from + * the given node type. + * + * @param nodeType + * @return + */ public Set<EdgeRule> getChildren(String nodeType) { final Filter filter = filter( where("from").is(nodeType).and(EdgeProperty.CONTAINS.toString()).is("${direction}") ).or(where("to").is(nodeType).and(EdgeProperty.CONTAINS.toString()).is("!${direction}")); - final List<Map<String, String>> rules = rulesDoc.read("$.rules.[?]", filter); + final List<Map<String, String>> rules = readRules(filter); final Set<EdgeRule> result = new HashSet<>(); rules.forEach(item -> { + verifyRule(item); result.add(buildRule(item)); }); diff --git a/aai-core/src/test/java/org/openecomp/aai/AAISetup.java b/aai-core/src/test/java/org/openecomp/aai/AAISetup.java new file mode 100644 index 00000000..b0fce58d --- /dev/null +++ b/aai-core/src/test/java/org/openecomp/aai/AAISetup.java @@ -0,0 +1,34 @@ +/*- + * ============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; + +import org.junit.BeforeClass; +import org.openecomp.aai.serialization.queryformats.QueryFormatTestHelper; +import org.openecomp.aai.util.AAIConstants; + +public abstract class AAISetup { + + @BeforeClass + public static void setupBundleconfig() throws Exception { + System.setProperty("AJSC_HOME", "."); + System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); + QueryFormatTestHelper.setFinalStatic(AAIConstants.class.getField("AAI_HOME_ETC_OXM"), "src/test/resources/bundleconfig-local/etc/oxm/"); + } +} diff --git a/aai-core/src/test/java/org/openecomp/aai/dbmodel/DbEdgeRulesConverterTest.java b/aai-core/src/test/java/org/openecomp/aai/dbmodel/DbEdgeRulesConverterTest.java index 3a1d9cc1..7cf5ac71 100644 --- a/aai-core/src/test/java/org/openecomp/aai/dbmodel/DbEdgeRulesConverterTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/dbmodel/DbEdgeRulesConverterTest.java @@ -20,22 +20,15 @@ package org.openecomp.aai.dbmodel; -import static org.junit.Assert.*; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.io.Writer; -import java.util.Map.Entry; - +import com.google.common.collect.ImmutableSetMultimap; +import com.google.common.collect.Multimap; import org.apache.commons.io.FileUtils; import org.junit.Test; -import com.google.common.collect.ImmutableSetMultimap; -import com.google.common.collect.Multimap; +import java.io.*; +import java.util.Map.Entry; -import freemarker.template.TemplateException; +import static org.junit.Assert.*; public class DbEdgeRulesConverterTest { diff --git a/aai-core/src/test/java/org/openecomp/aai/exceptions/AAIExceptionTest.java b/aai-core/src/test/java/org/openecomp/aai/exceptions/AAIExceptionTest.java index 862f6911..554b6418 100644 --- a/aai-core/src/test/java/org/openecomp/aai/exceptions/AAIExceptionTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/exceptions/AAIExceptionTest.java @@ -20,26 +20,18 @@ package org.openecomp.aai.exceptions; +import org.junit.Test; +import org.openecomp.aai.AAISetup; + import static org.junit.Assert.assertEquals; -import org.junit.BeforeClass; -import org.junit.Test; -import org.openecomp.aai.serialization.queryformats.QueryFormatTestHelper; -import org.openecomp.aai.util.AAIConstants; +public class AAIExceptionTest extends AAISetup { -public class AAIExceptionTest { private static final String code = "4004"; private static final String details = "This is a detailed description of the exception."; private static final Throwable cause = new RuntimeException("This is a runtime exception."); private static final Throwable noMessage = new RuntimeException(); - @BeforeClass - public static void configure() throws NoSuchFieldException, SecurityException, Exception { - System.setProperty("AJSC_HOME", "."); - System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); - QueryFormatTestHelper.setFinalStatic(AAIConstants.class.getField("AAI_HOME_ETC_OXM"), "src/test/resources/org/openecomp/aai/introspection/"); - } - /** * Test constructor with 0 params. * diff --git a/aai-core/src/test/java/org/openecomp/aai/exceptions/AAIExceptionWithInfoTest.java b/aai-core/src/test/java/org/openecomp/aai/exceptions/AAIExceptionWithInfoTest.java index b6357e43..41841ac7 100644 --- a/aai-core/src/test/java/org/openecomp/aai/exceptions/AAIExceptionWithInfoTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/exceptions/AAIExceptionWithInfoTest.java @@ -20,16 +20,14 @@ package org.openecomp.aai.exceptions; -import org.junit.BeforeClass; import org.junit.Test; -import org.openecomp.aai.serialization.queryformats.QueryFormatTestHelper; -import org.openecomp.aai.util.AAIConstants; +import org.openecomp.aai.AAISetup; import java.util.HashMap; import static org.junit.Assert.assertEquals; -public class AAIExceptionWithInfoTest { +public class AAIExceptionWithInfoTest extends AAISetup { private static final HashMap<String, Object> map = new HashMap<String, Object>(); @@ -45,13 +43,6 @@ public class AAIExceptionWithInfoTest { private static final String details = "This is a detailed description of the exception."; private static final Throwable cause = new RuntimeException("This is a runtime exception."); - @BeforeClass - public static void configure() throws NoSuchFieldException, SecurityException, Exception { - System.setProperty("AJSC_HOME", "."); - System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); - QueryFormatTestHelper.setFinalStatic(AAIConstants.class.getField("AAI_HOME_ETC_OXM"), "src/test/resources/org/openecomp/aai/introspection/"); - } - /** * Test constructor with 2 params. * diff --git a/aai-core/src/test/java/org/openecomp/aai/introspection/IntrospectorTestSpec.java b/aai-core/src/test/java/org/openecomp/aai/introspection/IntrospectorTestSpec.java index 47fef7ee..1ecc6923 100644 --- a/aai-core/src/test/java/org/openecomp/aai/introspection/IntrospectorTestSpec.java +++ b/aai-core/src/test/java/org/openecomp/aai/introspection/IntrospectorTestSpec.java @@ -20,15 +20,12 @@ package org.openecomp.aai.introspection; -import static org.junit.Assert.assertEquals; - -import java.util.Arrays; -import java.util.Set; - +import org.openecomp.aai.AAISetup; import org.openecomp.aai.introspection.exceptions.AAIUnknownObjectException; -import com.google.common.collect.Sets; -public class IntrospectorTestSpec { +import static org.junit.Assert.assertEquals; + +public class IntrospectorTestSpec extends AAISetup { diff --git a/aai-core/src/test/java/org/openecomp/aai/introspection/MoxyEngineTest.java b/aai-core/src/test/java/org/openecomp/aai/introspection/MoxyEngineTest.java index 9504c46b..0f67ddfc 100644 --- a/aai-core/src/test/java/org/openecomp/aai/introspection/MoxyEngineTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/introspection/MoxyEngineTest.java @@ -20,37 +20,12 @@ package org.openecomp.aai.introspection; -import java.io.StringReader; - -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; - -import org.eclipse.persistence.dynamic.DynamicEntity; -import org.eclipse.persistence.jaxb.UnmarshallerProperties; -import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext; -import org.junit.BeforeClass; import org.junit.Test; - import org.openecomp.aai.introspection.exceptions.AAIUnknownObjectException; -import org.openecomp.aai.serialization.queryformats.QueryFormatTestHelper; -import org.openecomp.aai.util.AAIConstants; public class MoxyEngineTest extends IntrospectorTestSpec { /** - * Configure. - * @throws Exception - * @throws SecurityException - * @throws NoSuchFieldException - */ - @BeforeClass - public static void configure() throws NoSuchFieldException, SecurityException, Exception { - System.setProperty("AJSC_HOME", "."); - System.setProperty("BUNDLECONFIG_DIR", "bundleconfig-local"); - QueryFormatTestHelper.setFinalStatic(AAIConstants.class.getField("AAI_HOME_ETC_OXM"), "src/test/resources/org/openecomp/aai/introspection/"); - } - - /** * Container object. * @throws AAIUnknownObjectException */ diff --git a/aai-core/src/test/java/org/openecomp/aai/introspection/PojoInjestorTest.java b/aai-core/src/test/java/org/openecomp/aai/introspection/PojoInjestorTest.java index 34a6279b..b820cfef 100644 --- a/aai-core/src/test/java/org/openecomp/aai/introspection/PojoInjestorTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/introspection/PojoInjestorTest.java @@ -20,25 +20,17 @@ package org.openecomp.aai.introspection; -import static org.junit.Assert.*; +import org.junit.Test; +import org.openecomp.aai.db.props.AAIProperties; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; -import org.junit.BeforeClass; -import org.junit.Test; - -import org.openecomp.aai.db.props.AAIProperties; +import static org.junit.Assert.*; public class PojoInjestorTest { - @BeforeClass - public static void configure() { - System.setProperty("AJSC_HOME", "."); - System.setProperty("BUNDLECONFIG_DIR", "bundleconfig-local"); - } - @Test public void getVersionTest() { String latestVersion = "org.openecomp.aai.yang.VnfImage"; diff --git a/aai-core/src/test/java/org/openecomp/aai/introspection/PojoLoaderTest.java b/aai-core/src/test/java/org/openecomp/aai/introspection/PojoLoaderTest.java index 0eeb966b..e4e58b60 100644 --- a/aai-core/src/test/java/org/openecomp/aai/introspection/PojoLoaderTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/introspection/PojoLoaderTest.java @@ -20,24 +20,18 @@ package org.openecomp.aai.introspection; -import static org.junit.Assert.*; - -import org.junit.BeforeClass; import org.junit.Test; - +import org.openecomp.aai.AAISetup; import org.openecomp.aai.domain.yang.v9.VnfImage; import org.openecomp.aai.introspection.exceptions.AAIUnmarshallingException; import org.openecomp.aai.restcore.MediaType; -public class PojoLoaderTest { +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +public class PojoLoaderTest extends AAISetup { + - - @BeforeClass - public static void configure() { - System.setProperty("AJSC_HOME", "."); - System.setProperty("BUNDLECONFIG_DIR", "bundleconfig-local"); - } - @Test public void test() { Loader pojoLoader = LoaderFactory.createLoaderForVersion(ModelType.POJO, Version.v9); diff --git a/aai-core/src/test/java/org/openecomp/aai/introspection/PojoStrategyTest.java b/aai-core/src/test/java/org/openecomp/aai/introspection/PojoStrategyTest.java index 4843b10d..0bd61178 100644 --- a/aai-core/src/test/java/org/openecomp/aai/introspection/PojoStrategyTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/introspection/PojoStrategyTest.java @@ -20,14 +20,13 @@ package org.openecomp.aai.introspection; -import static org.junit.Assert.*; - import org.junit.Test; - import org.openecomp.aai.domain.yang.CloudRegion; import org.openecomp.aai.domain.yang.VolumeGroup; import org.openecomp.aai.schema.enums.ObjectMetadata; +import static org.junit.Assert.assertEquals; + public class PojoStrategyTest { @Test diff --git a/aai-core/src/test/java/org/openecomp/aai/introspection/PropertyPredicatesTest.java b/aai-core/src/test/java/org/openecomp/aai/introspection/PropertyPredicatesTest.java index ac430e1b..50aea8fe 100644 --- a/aai-core/src/test/java/org/openecomp/aai/introspection/PropertyPredicatesTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/introspection/PropertyPredicatesTest.java @@ -20,34 +20,29 @@ package org.openecomp.aai.introspection; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; -import java.util.Set; - -import org.junit.BeforeClass; +import org.junit.Before; import org.junit.Test; -import org.junit.Ignore; +import org.openecomp.aai.AAISetup; import org.openecomp.aai.introspection.exceptions.AAIUnknownObjectException; -import org.openecomp.aai.serialization.queryformats.QueryFormatTestHelper; -import org.openecomp.aai.util.AAIConstants; -@Ignore -public class PropertyPredicatesTest { +import java.util.Set; +import static org.hamcrest.Matchers.hasItems; +import static org.hamcrest.Matchers.not; +import static org.junit.Assert.assertThat; + +public class PropertyPredicatesTest extends AAISetup { + + private final Version version = Version.getLatest(); + + private Loader loader; + private ModelType introspectorFactoryType = ModelType.MOXY; + private Introspector obj; - private final static Version version = Version.v10; - private static Loader loader; - private final static ModelType introspectorFactoryType = ModelType.MOXY; - private static Introspector obj; - - @BeforeClass - public static void setup() throws NoSuchFieldException, SecurityException, Exception { - System.setProperty("AJSC_HOME", "./src/test/resources/"); - System.setProperty("BUNDLECONFIG_DIR", "bundleconfig-local"); - QueryFormatTestHelper.setFinalStatic(AAIConstants.class.getField("AAI_HOME_ETC_OXM"), "src/test/resources/org/openecomp/aai/introspection/"); + @Before + public void setup() throws Exception { loader = LoaderFactory.createLoaderForVersion(introspectorFactoryType, version); obj = loader.introspectorFromName("test-object"); - } @Test diff --git a/aai-core/src/test/java/org/openecomp/aai/introspection/ReflectionEngineTest.java b/aai-core/src/test/java/org/openecomp/aai/introspection/ReflectionEngineTest.java index 8781d59c..d7cd7b18 100644 --- a/aai-core/src/test/java/org/openecomp/aai/introspection/ReflectionEngineTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/introspection/ReflectionEngineTest.java @@ -20,31 +20,12 @@ package org.openecomp.aai.introspection; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; - -import javax.xml.bind.JAXBException; - -import org.junit.BeforeClass; import org.junit.Test; - import org.openecomp.aai.introspection.exceptions.AAIUnknownObjectException; -import org.openecomp.aai.restcore.CustomJacksonJaxBJsonProvider; public class ReflectionEngineTest extends IntrospectorTestSpec { /** - * Configure. - */ - @BeforeClass - public static void configure() { - System.setProperty("AJSC_HOME", "./src/test/resources"); - System.setProperty("BUNDLECONFIG_DIR", "bundleconfig-local"); - } - - /** * Container object. * * @throws InstantiationException the instantiation exception diff --git a/aai-core/src/test/java/org/openecomp/aai/introspection/sideeffect/DataCopyTest.java b/aai-core/src/test/java/org/openecomp/aai/introspection/sideeffect/DataCopyTest.java index 0d40f89f..8e37fe05 100644 --- a/aai-core/src/test/java/org/openecomp/aai/introspection/sideeffect/DataCopyTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/introspection/sideeffect/DataCopyTest.java @@ -20,17 +20,8 @@ package org.openecomp.aai.introspection.sideeffect; -import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; - -import java.io.FileInputStream; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.lang.reflect.InvocationTargetException; -import java.net.MalformedURLException; -import java.net.URISyntaxException; - +import com.thinkaurelius.titan.core.TitanFactory; +import com.thinkaurelius.titan.core.TitanGraph; import org.apache.commons.io.IOUtils; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Graph; @@ -43,11 +34,7 @@ import org.mockito.MockitoAnnotations; import org.openecomp.aai.db.props.AAIProperties; import org.openecomp.aai.dbmap.DBConnectionType; import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.introspection.LoaderFactory; -import org.openecomp.aai.introspection.ModelType; -import org.openecomp.aai.introspection.Version; +import org.openecomp.aai.introspection.*; import org.openecomp.aai.introspection.sideeffect.exceptions.AAIMissingRequiredPropertyException; import org.openecomp.aai.parsers.query.QueryParser; import org.openecomp.aai.serialization.db.DBSerializer; @@ -55,17 +42,22 @@ import org.openecomp.aai.serialization.db.EdgeProperty; import org.openecomp.aai.serialization.engines.QueryStyle; import org.openecomp.aai.serialization.engines.TitanDBEngine; import org.openecomp.aai.serialization.engines.TransactionalGraphEngine; -import org.openecomp.aai.serialization.queryformats.QueryFormatTestHelper; -import org.openecomp.aai.util.AAIConstants; -import com.thinkaurelius.titan.core.TitanFactory; -import com.thinkaurelius.titan.core.TitanGraph; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.lang.reflect.InvocationTargetException; +import java.net.MalformedURLException; +import java.net.URISyntaxException; + +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; -@Ignore public class DataCopyTest { private static TitanGraph graph; - private final static Version version = Version.v10; + private final static Version version = Version.getLatest(); private final static ModelType introspectorFactoryType = ModelType.MOXY; private final static QueryStyle queryStyle = QueryStyle.TRAVERSAL; private final static DBConnectionType type = DBConnectionType.REALTIME; @@ -83,7 +75,6 @@ public class DataCopyTest { graph = TitanFactory.build().set("storage.backend","inmemory").open(); System.setProperty("AJSC_HOME", "."); System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); - QueryFormatTestHelper.setFinalStatic(AAIConstants.class.getField("AAI_HOME_ETC_OXM"), "src/test/resources/org/openecomp/aai/introspection/"); loader = LoaderFactory.createLoaderForVersion(introspectorFactoryType, version); dbEngine = new TitanDBEngine( queryStyle, @@ -112,7 +103,7 @@ public class DataCopyTest { @Test public void runPopulatePersonaModelVer() throws URISyntaxException, AAIException, UnsupportedEncodingException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, SecurityException, InstantiationException, NoSuchMethodException, MalformedURLException { - final Loader loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.v10); + final Loader loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.getLatest()); final Introspector obj = loader.introspectorFromName("test-object"); obj.setValue("vnf-id", "myId"); obj.setValue("model-invariant-id", "key1"); @@ -168,7 +159,7 @@ public class DataCopyTest { @Test public void verifyNestedSideEffect() throws URISyntaxException, AAIException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, SecurityException, InstantiationException, NoSuchMethodException, IOException { - final Loader loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.v10); + final Loader loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.getLatest()); final Introspector obj = loader.unmarshal("customer", this.getJsonString("nested-case.json")); System.out.println(obj.marshal(true)); TransactionalGraphEngine spy = spy(dbEngine); @@ -194,7 +185,7 @@ public class DataCopyTest { @Test public void expectedMissingPropertyExceptionInURI() throws AAIException, UnsupportedEncodingException { - final Loader loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.v10); + final Loader loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.getLatest()); final Introspector obj = loader.introspectorFromName("test-object"); obj.setValue("vnf-id", "myId"); obj.setValue("model-invariant-id", "key1"); @@ -217,7 +208,7 @@ public class DataCopyTest { @Test public void expectedMissingPropertyExceptionForResultingObject() throws AAIException, UnsupportedEncodingException { - final Loader loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.v10); + final Loader loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.getLatest()); final Introspector obj = loader.introspectorFromName("test-object"); obj.setValue("vnf-id", "myId"); obj.setValue("model-invariant-id", "key3"); @@ -241,7 +232,7 @@ public class DataCopyTest { @Test public void expectNoProcessingWithNoProperties() throws AAIException, UnsupportedEncodingException { - final Loader loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.v10); + final Loader loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.getLatest()); final Introspector obj = loader.introspectorFromName("test-object"); obj.setValue("vnf-id", "myId"); @@ -267,7 +258,7 @@ public class DataCopyTest { private String getJsonString(String filename) throws IOException { - FileInputStream is = new FileInputStream("src/test/resources/org/openecomp/aai/introspection/sideeffect/" + filename); + FileInputStream is = new FileInputStream("src/test/resources/bundleconfig-local/etc/oxm/sideeffect/" + filename); String s = IOUtils.toString(is, "UTF-8"); IOUtils.closeQuietly(is); diff --git a/aai-core/src/test/java/org/openecomp/aai/introspection/sideeffect/DataLinkTest.java b/aai-core/src/test/java/org/openecomp/aai/introspection/sideeffect/DataLinkTest.java index 4aafe460..8220b86c 100644 --- a/aai-core/src/test/java/org/openecomp/aai/introspection/sideeffect/DataLinkTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/introspection/sideeffect/DataLinkTest.java @@ -20,16 +20,8 @@ package org.openecomp.aai.introspection.sideeffect; -import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; - -import java.io.UnsupportedEncodingException; -import java.lang.reflect.InvocationTargetException; -import java.net.MalformedURLException; -import java.net.URISyntaxException; -import java.util.List; - +import com.thinkaurelius.titan.core.TitanFactory; +import com.thinkaurelius.titan.core.TitanGraph; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Vertex; @@ -41,28 +33,28 @@ import org.mockito.MockitoAnnotations; import org.openecomp.aai.db.props.AAIProperties; import org.openecomp.aai.dbmap.DBConnectionType; import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.introspection.LoaderFactory; -import org.openecomp.aai.introspection.ModelType; -import org.openecomp.aai.introspection.Version; +import org.openecomp.aai.introspection.*; import org.openecomp.aai.parsers.query.QueryParser; import org.openecomp.aai.serialization.db.DBSerializer; import org.openecomp.aai.serialization.db.EdgeProperty; import org.openecomp.aai.serialization.engines.QueryStyle; import org.openecomp.aai.serialization.engines.TitanDBEngine; import org.openecomp.aai.serialization.engines.TransactionalGraphEngine; -import org.openecomp.aai.serialization.queryformats.QueryFormatTestHelper; -import org.openecomp.aai.util.AAIConstants; -import com.thinkaurelius.titan.core.TitanFactory; -import com.thinkaurelius.titan.core.TitanGraph; +import java.io.UnsupportedEncodingException; +import java.lang.reflect.InvocationTargetException; +import java.net.MalformedURLException; +import java.net.URISyntaxException; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; -@Ignore public class DataLinkTest { private static TitanGraph graph; - private final static Version version = Version.v10; + private final static Version version = Version.getLatest(); private final static ModelType introspectorFactoryType = ModelType.MOXY; private final static QueryStyle queryStyle = QueryStyle.TRAVERSAL; private final static DBConnectionType type = DBConnectionType.REALTIME; @@ -80,7 +72,6 @@ public class DataLinkTest { graph = TitanFactory.build().set("storage.backend","inmemory").open(); System.setProperty("AJSC_HOME", "."); System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); - QueryFormatTestHelper.setFinalStatic(AAIConstants.class.getField("AAI_HOME_ETC_OXM"), "src/test/resources/org/openecomp/aai/introspection/"); loader = LoaderFactory.createLoaderForVersion(introspectorFactoryType, version); dbEngine = new TitanDBEngine( queryStyle, @@ -184,6 +175,7 @@ public class DataLinkTest { GraphTraversalSource traversal = g.traversal(); when(spy.asAdmin()).thenReturn(adminSpy); when(adminSpy.getTraversalSource()).thenReturn(traversal); + when(adminSpy.getReadOnlyTraversalSource()).thenReturn(traversal); when(spy.tx()).thenReturn(g); when(self.<String>property(AAIProperties.AAI_URI)).thenReturn(prop); when(prop.orElse(null)).thenReturn(obj.getURI()); diff --git a/aai-core/src/test/java/org/openecomp/aai/introspection/validation/IntrospectorValidationTest.java b/aai-core/src/test/java/org/openecomp/aai/introspection/validation/IntrospectorValidationTest.java index d3a9492f..8b76967a 100644 --- a/aai-core/src/test/java/org/openecomp/aai/introspection/validation/IntrospectorValidationTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/introspection/validation/IntrospectorValidationTest.java @@ -20,27 +20,22 @@ package org.openecomp.aai.introspection.validation; -import static org.junit.Assert.assertEquals; - -import java.util.List; - import org.junit.Before; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; - import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.introspection.LoaderFactory; -import org.openecomp.aai.introspection.ModelType; -import org.openecomp.aai.introspection.Version; +import org.openecomp.aai.introspection.*; import org.openecomp.aai.introspection.tools.IntrospectorValidator; import org.openecomp.aai.introspection.tools.Issue; import org.openecomp.aai.introspection.tools.IssueType; import org.openecomp.aai.serialization.queryformats.QueryFormatTestHelper; import org.openecomp.aai.util.AAIConstants; +import java.util.List; + +import static org.junit.Assert.assertEquals; + public class IntrospectorValidationTest { diff --git a/aai-core/src/test/java/org/openecomp/aai/logging/LoggingContextTest.java b/aai-core/src/test/java/org/openecomp/aai/logging/LoggingContextTest.java index 3fe2098c..9cc522eb 100644 --- a/aai-core/src/test/java/org/openecomp/aai/logging/LoggingContextTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/logging/LoggingContextTest.java @@ -20,18 +20,11 @@ package org.openecomp.aai.logging; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import org.junit.Test; -import java.util.Collections; -import java.util.Deque; -import java.util.LinkedList; -import java.util.Map; -import java.util.UUID; +import java.util.*; -import org.junit.Test; +import static org.junit.Assert.*; public class LoggingContextTest { diff --git a/aai-core/src/test/java/org/openecomp/aai/parsers/query/GraphTraversalTest.java b/aai-core/src/test/java/org/openecomp/aai/parsers/query/GraphTraversalTest.java index b22a98e6..a4070b02 100644 --- a/aai-core/src/test/java/org/openecomp/aai/parsers/query/GraphTraversalTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/parsers/query/GraphTraversalTest.java @@ -20,30 +20,15 @@ package org.openecomp.aai.parsers.query; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.Matchers.hasProperty; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; - -import java.io.UnsupportedEncodingException; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; - -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriBuilder; - import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.junit.BeforeClass; -import org.junit.Ignore; +import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; - +import org.openecomp.aai.AAISetup; import org.openecomp.aai.db.props.AAIProperties; import org.openecomp.aai.exceptions.AAIException; import org.openecomp.aai.introspection.LoaderFactory; @@ -53,15 +38,24 @@ import org.openecomp.aai.rest.RestTokens; import org.openecomp.aai.serialization.engines.QueryStyle; import org.openecomp.aai.serialization.engines.TitanDBEngine; import org.openecomp.aai.serialization.engines.TransactionalGraphEngine; -import org.openecomp.aai.serialization.queryformats.QueryFormatTestHelper; -import org.openecomp.aai.util.AAIConstants; -@Ignore -public class GraphTraversalTest { +import javax.ws.rs.core.MultivaluedHashMap; +import javax.ws.rs.core.MultivaluedMap; +import javax.ws.rs.core.UriBuilder; +import java.io.UnsupportedEncodingException; +import java.net.URI; +import java.util.ArrayList; +import java.util.List; - private static TransactionalGraphEngine dbEngine; - - private static TransactionalGraphEngine dbEnginev9; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.Matchers.hasProperty; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertEquals; + +public class GraphTraversalTest extends AAISetup { + + private TransactionalGraphEngine dbEngine; + private TransactionalGraphEngine dbEnginev9; @Rule public ExpectedException thrown = ExpectedException.none(); @@ -72,12 +66,9 @@ public class GraphTraversalTest { * @throws SecurityException * @throws NoSuchFieldException */ - @BeforeClass - public static void configure() throws NoSuchFieldException, SecurityException, Exception { - System.setProperty("AJSC_HOME", "."); - System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); - QueryFormatTestHelper.setFinalStatic(AAIConstants.class.getField("AAI_HOME_ETC_OXM"), "src/test/resources/org/openecomp/aai/introspection/"); - dbEngine = + @Before + public void configure() throws Exception { + dbEngine = new TitanDBEngine(QueryStyle.TRAVERSAL, LoaderFactory.createLoaderForVersion(ModelType.MOXY, AAIProperties.LATEST), false); @@ -693,7 +684,6 @@ public class GraphTraversalTest { assertEquals("dependent",true, query.isDependent()); } - @Ignore @Test public void pluralCousin() throws UnsupportedEncodingException, AAIException { URI uri = UriBuilder.fromPath("cloud-infrastructure/complexes/complex/key1/related-to/pservers").build(); @@ -728,7 +718,6 @@ public class GraphTraversalTest { assertEquals("dependent",true, query.isDependent()); } - @Ignore @Test public void specificCousin() throws UnsupportedEncodingException, AAIException { URI uri = UriBuilder.fromPath("cloud-infrastructure/complexes/complex/key1/related-to/pservers/pserver/key2").build(); @@ -764,7 +753,6 @@ public class GraphTraversalTest { assertEquals("dependent",true, query.isDependent()); } - @Ignore @Test public void doubleSpecificCousin() throws UnsupportedEncodingException, AAIException { URI uri = UriBuilder.fromPath("cloud-infrastructure/complexes/complex/key1/related-to/pservers/pserver/key2/related-to/vservers/vserver/key3").build(); @@ -804,7 +792,6 @@ public class GraphTraversalTest { assertEquals("dependent",true, query.isDependent()); } - @Ignore @Test public void traversalEndsInRelatedTo() throws UnsupportedEncodingException, AAIException { URI uri = UriBuilder.fromPath("cloud-infrastructure/complexes/complex/key1/related-to").build(); @@ -815,7 +802,6 @@ public class GraphTraversalTest { } - @Ignore @Test public void pluralCousinToPluralCousin() throws UnsupportedEncodingException, AAIException { URI uri = UriBuilder.fromPath("cloud-infrastructure/complexes/related-to/pservers").build(); diff --git a/aai-core/src/test/java/org/openecomp/aai/parsers/query/LegacyQueryTest.java b/aai-core/src/test/java/org/openecomp/aai/parsers/query/LegacyQueryTest.java index 2a1f94b4..5c68fc67 100644 --- a/aai-core/src/test/java/org/openecomp/aai/parsers/query/LegacyQueryTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/parsers/query/LegacyQueryTest.java @@ -20,19 +20,10 @@ package org.openecomp.aai.parsers.query; -import static org.junit.Assert.assertEquals; - -import java.io.UnsupportedEncodingException; -import java.net.URI; - -import javax.ws.rs.core.UriBuilder; -import javax.xml.bind.JAXBException; - import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext; -import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; - +import org.openecomp.aai.AAISetup; import org.openecomp.aai.exceptions.AAIException; import org.openecomp.aai.introspection.LoaderFactory; import org.openecomp.aai.introspection.ModelInjestor; @@ -42,10 +33,19 @@ import org.openecomp.aai.serialization.engines.QueryStyle; import org.openecomp.aai.serialization.engines.TitanDBEngine; import org.openecomp.aai.serialization.engines.TransactionalGraphEngine; +import javax.ws.rs.core.UriBuilder; +import javax.xml.bind.JAXBException; +import java.io.UnsupportedEncodingException; +import java.net.URI; + +import static org.junit.Assert.assertEquals; + @Ignore -public class LegacyQueryTest { +public class LegacyQueryTest extends AAISetup { + private ModelInjestor injestor = ModelInjestor.getInstance(); + private TransactionalGraphEngine dbEngine = new TitanDBEngine(QueryStyle.GREMLIN_TRAVERSAL, LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.v8), @@ -53,16 +53,7 @@ public class LegacyQueryTest { private final Version version = Version.v8; private DynamicJAXBContext context = injestor.getContextForVersion(version); - - /** - * Configure. - */ - @BeforeClass - public static void configure() { - System.setProperty("AJSC_HOME", "."); - System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); - } - + /** * Parent query. * diff --git a/aai-core/src/test/java/org/openecomp/aai/parsers/query/RelationshipGremlinQueryTest.java b/aai-core/src/test/java/org/openecomp/aai/parsers/query/RelationshipGremlinQueryTest.java index 3ab45379..0aad09c4 100644 --- a/aai-core/src/test/java/org/openecomp/aai/parsers/query/RelationshipGremlinQueryTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/parsers/query/RelationshipGremlinQueryTest.java @@ -20,38 +20,31 @@ package org.openecomp.aai.parsers.query; -import static org.hamcrest.CoreMatchers.containsString; -import static org.junit.Assert.assertEquals; - -import java.io.StringReader; -import java.io.UnsupportedEncodingException; - -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import javax.xml.transform.stream.StreamSource; - import org.eclipse.persistence.dynamic.DynamicEntity; import org.eclipse.persistence.jaxb.UnmarshallerProperties; import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext; -import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; - +import org.openecomp.aai.AAISetup; import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.IntrospectorFactory; -import org.openecomp.aai.introspection.LoaderFactory; -import org.openecomp.aai.introspection.ModelInjestor; -import org.openecomp.aai.introspection.ModelType; -import org.openecomp.aai.introspection.Version; +import org.openecomp.aai.introspection.*; import org.openecomp.aai.serialization.engines.QueryStyle; import org.openecomp.aai.serialization.engines.TitanDBEngine; import org.openecomp.aai.serialization.engines.TransactionalGraphEngine; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Unmarshaller; +import javax.xml.transform.stream.StreamSource; +import java.io.StringReader; +import java.io.UnsupportedEncodingException; + +import static org.hamcrest.CoreMatchers.containsString; +import static org.junit.Assert.assertEquals; + @Ignore -public class RelationshipGremlinQueryTest { +public class RelationshipGremlinQueryTest extends AAISetup { private ModelInjestor injestor = ModelInjestor.getInstance(); private TransactionalGraphEngine dbEngine = @@ -65,16 +58,6 @@ public class RelationshipGremlinQueryTest { public ExpectedException thrown = ExpectedException.none(); /** - * Configure. - */ - @BeforeClass - public static void configure() { - System.setProperty("AJSC_HOME", "."); - System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); - } - - - /** * Parent query. * * @throws JAXBException the JAXB exception diff --git a/aai-core/src/test/java/org/openecomp/aai/parsers/query/RelationshipQueryTest.java b/aai-core/src/test/java/org/openecomp/aai/parsers/query/RelationshipQueryTest.java index 25369338..94fe0c59 100644 --- a/aai-core/src/test/java/org/openecomp/aai/parsers/query/RelationshipQueryTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/parsers/query/RelationshipQueryTest.java @@ -20,35 +20,29 @@ package org.openecomp.aai.parsers.query; -import static org.junit.Assert.assertEquals; - -import java.io.StringReader; -import java.io.UnsupportedEncodingException; - -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import javax.xml.transform.stream.StreamSource; - import org.eclipse.persistence.dynamic.DynamicEntity; import org.eclipse.persistence.jaxb.UnmarshallerProperties; import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext; -import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; - +import org.openecomp.aai.AAISetup; import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.IntrospectorFactory; -import org.openecomp.aai.introspection.LoaderFactory; -import org.openecomp.aai.introspection.ModelInjestor; -import org.openecomp.aai.introspection.ModelType; -import org.openecomp.aai.introspection.Version; +import org.openecomp.aai.introspection.*; import org.openecomp.aai.serialization.engines.QueryStyle; import org.openecomp.aai.serialization.engines.TitanDBEngine; import org.openecomp.aai.serialization.engines.TransactionalGraphEngine; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Unmarshaller; +import javax.xml.transform.stream.StreamSource; +import java.io.StringReader; +import java.io.UnsupportedEncodingException; + +import static org.junit.Assert.assertEquals; + @Ignore -public class RelationshipQueryTest { +public class RelationshipQueryTest extends AAISetup { + private ModelInjestor injestor = ModelInjestor.getInstance(); private TransactionalGraphEngine dbEngine = @@ -57,17 +51,7 @@ public class RelationshipQueryTest { false); private final Version version = Version.v8; private DynamicJAXBContext context = injestor.getContextForVersion(version); - - /** - * Configure. - */ - @BeforeClass - public static void configure() { - System.setProperty("AJSC_HOME", "."); - System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); - } - - + /** * Parent query. * diff --git a/aai-core/src/test/java/org/openecomp/aai/parsers/query/UniqueRelationshipQueryTest.java b/aai-core/src/test/java/org/openecomp/aai/parsers/query/UniqueRelationshipQueryTest.java index 50bbbd0e..870bbd36 100644 --- a/aai-core/src/test/java/org/openecomp/aai/parsers/query/UniqueRelationshipQueryTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/parsers/query/UniqueRelationshipQueryTest.java @@ -20,15 +20,6 @@ package org.openecomp.aai.parsers.query; -import static org.junit.Assert.assertEquals; - -import java.io.StringReader; -import java.io.UnsupportedEncodingException; - -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import javax.xml.transform.stream.StreamSource; - import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; import org.apache.tinkerpop.gremlin.structure.Vertex; @@ -36,22 +27,26 @@ import org.eclipse.persistence.dynamic.DynamicEntity; import org.eclipse.persistence.jaxb.UnmarshallerProperties; import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; - +import org.openecomp.aai.AAISetup; import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.IntrospectorFactory; -import org.openecomp.aai.introspection.LoaderFactory; -import org.openecomp.aai.introspection.ModelInjestor; -import org.openecomp.aai.introspection.ModelType; -import org.openecomp.aai.introspection.Version; +import org.openecomp.aai.introspection.*; import org.openecomp.aai.serialization.engines.QueryStyle; import org.openecomp.aai.serialization.engines.TitanDBEngine; import org.openecomp.aai.serialization.engines.TransactionalGraphEngine; + +import javax.xml.bind.JAXBException; +import javax.xml.bind.Unmarshaller; +import javax.xml.transform.stream.StreamSource; +import java.io.StringReader; +import java.io.UnsupportedEncodingException; + +import static org.junit.Assert.assertEquals; + @Ignore -public class UniqueRelationshipQueryTest { +public class UniqueRelationshipQueryTest extends AAISetup { + private ModelInjestor injestor = ModelInjestor.getInstance(); private TransactionalGraphEngine dbEngine = new TitanDBEngine(QueryStyle.GREMLIN_UNIQUE, @@ -62,16 +57,6 @@ public class UniqueRelationshipQueryTest { private Unmarshaller unmarshaller = null; /** - * Configure. - */ - @BeforeClass - public static void configure() { - System.setProperty("AJSC_HOME", "."); - System.setProperty("BUNDLECONFIG_DIR", "bundleconfig-local"); - } - - - /** * Setup. * * @throws JAXBException the JAXB exception diff --git a/aai-core/src/test/java/org/openecomp/aai/parsers/query/UniqueURIQueryTest.java b/aai-core/src/test/java/org/openecomp/aai/parsers/query/UniqueURIQueryTest.java index 9bf4919b..e1be7f25 100644 --- a/aai-core/src/test/java/org/openecomp/aai/parsers/query/UniqueURIQueryTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/parsers/query/UniqueURIQueryTest.java @@ -20,21 +20,13 @@ package org.openecomp.aai.parsers.query; -import static org.junit.Assert.assertEquals; - -import java.io.UnsupportedEncodingException; -import java.net.URI; - -import javax.ws.rs.core.UriBuilder; - import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext; -import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; - +import org.openecomp.aai.AAISetup; import org.openecomp.aai.exceptions.AAIException; import org.openecomp.aai.introspection.LoaderFactory; import org.openecomp.aai.introspection.ModelInjestor; @@ -44,8 +36,15 @@ import org.openecomp.aai.serialization.engines.QueryStyle; import org.openecomp.aai.serialization.engines.TitanDBEngine; import org.openecomp.aai.serialization.engines.TransactionalGraphEngine; +import javax.ws.rs.core.UriBuilder; +import java.io.UnsupportedEncodingException; +import java.net.URI; + +import static org.junit.Assert.assertEquals; + @Ignore -public class UniqueURIQueryTest { +public class UniqueURIQueryTest extends AAISetup { + private ModelInjestor injestor = ModelInjestor.getInstance(); private TransactionalGraphEngine dbEngine = new TitanDBEngine(QueryStyle.GREMLIN_UNIQUE, @@ -55,16 +54,6 @@ public class UniqueURIQueryTest { private DynamicJAXBContext context = injestor.getContextForVersion(version); /** - * Configure. - */ - @BeforeClass - public static void configure() { - System.setProperty("AJSC_HOME", "."); - System.setProperty("BUNDLECONFIG_DIR", "bundleconfig-local"); - } - - - /** * Parent query. * * @throws UnsupportedEncodingException the unsupported encoding exception diff --git a/aai-core/src/test/java/org/openecomp/aai/parsers/relationship/RelationshipToURITest.java b/aai-core/src/test/java/org/openecomp/aai/parsers/relationship/RelationshipToURITest.java index 6fac3427..bc20af11 100644 --- a/aai-core/src/test/java/org/openecomp/aai/parsers/relationship/RelationshipToURITest.java +++ b/aai-core/src/test/java/org/openecomp/aai/parsers/relationship/RelationshipToURITest.java @@ -20,38 +20,28 @@ package org.openecomp.aai.parsers.relationship; -import static org.hamcrest.Matchers.hasProperty; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; - -import java.io.FileInputStream; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; - import org.apache.commons.io.IOUtils; -import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; - +import org.openecomp.aai.AAISetup; import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.introspection.LoaderFactory; -import org.openecomp.aai.introspection.ModelType; -import org.openecomp.aai.introspection.Version; +import org.openecomp.aai.introspection.*; import org.openecomp.aai.parsers.exceptions.AAIIdentityMapParseException; import org.openecomp.aai.parsers.exceptions.AmbiguousMapAAIException; -import org.openecomp.aai.serialization.queryformats.QueryFormatTestHelper; -import org.openecomp.aai.util.AAIConstants; -@Ignore -public class RelationshipToURITest { +import java.io.FileInputStream; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; + +import static org.hamcrest.Matchers.hasProperty; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertEquals; + +public class RelationshipToURITest extends AAISetup { - - private final ModelType modelType = ModelType.MOXY; private final Version version10 = Version.v10; private final Version version9 = Version.v9; @@ -59,14 +49,6 @@ public class RelationshipToURITest { @Rule public ExpectedException thrown = ExpectedException.none(); - @BeforeClass - public static void setup() throws NoSuchFieldException, SecurityException, Exception { - System.setProperty("AJSC_HOME", "."); - System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); - QueryFormatTestHelper.setFinalStatic(AAIConstants.class.getField("AAI_HOME_ETC_OXM"), "src/test/resources/org/openecomp/aai/introspection/"); - - } - @Test public void onlyLink() throws AAIException, URISyntaxException, IOException { Loader loader = LoaderFactory.createLoaderForVersion(modelType, version10); @@ -223,7 +205,7 @@ public class RelationshipToURITest { private String getJsonString(String filename) throws IOException { - FileInputStream is = new FileInputStream("src/test/resources/org/openecomp/aai/parsers/relationship/" + filename); + FileInputStream is = new FileInputStream("src/test/resources/bundleconfig-local/etc/relationship/" + filename); String s = IOUtils.toString(is, "UTF-8"); IOUtils.closeQuietly(is); diff --git a/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIParserTest.java b/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIParserTest.java index 1fa3aea2..da863c1e 100644 --- a/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIParserTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIParserTest.java @@ -20,29 +20,25 @@ package org.openecomp.aai.parsers.uri; -import static org.hamcrest.Matchers.hasProperty; -import static org.hamcrest.Matchers.is; - -import java.io.UnsupportedEncodingException; -import java.net.URI; - -import javax.ws.rs.core.UriBuilder; -import javax.xml.bind.JAXBException; - -import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; - +import org.openecomp.aai.AAISetup; import org.openecomp.aai.exceptions.AAIException; import org.openecomp.aai.introspection.Loader; import org.openecomp.aai.introspection.LoaderFactory; import org.openecomp.aai.introspection.ModelType; import org.openecomp.aai.introspection.Version; -@Ignore -public class URIParserTest { +import javax.ws.rs.core.UriBuilder; +import javax.xml.bind.JAXBException; +import java.io.UnsupportedEncodingException; +import java.net.URI; + +import static org.hamcrest.Matchers.hasProperty; +import static org.hamcrest.Matchers.is; + +public class URIParserTest extends AAISetup { private Loader loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.v8); @@ -50,15 +46,6 @@ public class URIParserTest { public ExpectedException thrown = ExpectedException.none(); /** - * Configure. - */ - @BeforeClass - public static void configure() { - System.setProperty("AJSC_HOME", "."); - System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); - } - - /** * Invalid path. * * @throws JAXBException the JAXB exception @@ -71,7 +58,7 @@ public class URIParserTest { URI uri = UriBuilder.fromPath("/aai/" + loader.getVersion() + "/network/tenants/tenant/key1/vservers/vserver/key2/l-interfaces/l-interface/key3").build(); thrown.expect(AAIException.class); - thrown.expect(hasProperty("code", is("AAI_3001"))); + thrown.expect(hasProperty("code", is("AAI_3000"))); new URIToDBKey(loader, uri); } diff --git a/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIToDBKeyTest.java b/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIToDBKeyTest.java index 5ba47119..9aabdf1a 100644 --- a/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIToDBKeyTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIToDBKeyTest.java @@ -20,34 +20,28 @@ package org.openecomp.aai.parsers.uri; -import static org.hamcrest.Matchers.hasProperty; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; - -import java.io.UnsupportedEncodingException; -import java.net.URI; - -import javax.ws.rs.core.UriBuilder; -import javax.xml.bind.JAXBException; - -import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.openecomp.aai.AAISetup; +import org.openecomp.aai.exceptions.AAIException; +import org.openecomp.aai.introspection.*; import org.powermock.core.classloader.annotations.PrepareForTest; -import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.introspection.LoaderFactory; -import org.openecomp.aai.introspection.ModelInjestor; -import org.openecomp.aai.introspection.ModelType; -import org.openecomp.aai.introspection.Version; +import javax.ws.rs.core.UriBuilder; +import javax.xml.bind.JAXBException; +import java.io.UnsupportedEncodingException; +import java.net.URI; + +import static org.hamcrest.Matchers.hasProperty; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertEquals; @Ignore @PrepareForTest(ModelInjestor.class) -public class URIToDBKeyTest { +public class URIToDBKeyTest extends AAISetup { private Loader loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.v8); @@ -55,13 +49,45 @@ public class URIToDBKeyTest { public ExpectedException thrown = ExpectedException.none(); /** - * Configure. + * Uri. + * + * @throws JAXBException the JAXB exception + * @throws AAIException the AAI exception + * @throws IllegalArgumentException the illegal argument exception + * @throws UnsupportedEncodingException the unsupported encoding exception + */ + @Test + public void uri() throws JAXBException, AAIException, IllegalArgumentException, UnsupportedEncodingException { + URI uri = UriBuilder.fromPath("/aai/" + loader.getVersion() + "/cloud-infrastructure/tenants/tenant/key1/vservers/vserver/key2/l-interfaces/l-interface/key3").build(); + URIToDBKey parse = new URIToDBKey(loader, uri); + Object result = parse.getResult(); + + String expected = "cloud-region/att-aic/AAIAIC25/tenant/key1/vserver/key2/l-interface/key3"; + + assertEquals("blah", expected, result); + + } + + /** + * Uri no version. + * + * @throws JAXBException the JAXB exception + * @throws AAIException the AAI exception + * @throws IllegalArgumentException the illegal argument exception + * @throws UnsupportedEncodingException the unsupported encoding exception */ - @BeforeClass - public static void configure() { - System.setProperty("AJSC_HOME", "."); - System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); + @Test + public void uriNoVersion() throws JAXBException, AAIException, IllegalArgumentException, UnsupportedEncodingException { + URI uri = UriBuilder.fromPath("/cloud-infrastructure/tenants/tenant/key1/vservers/vserver/key2/l-interfaces/l-interface/key3").build(); + URIToDBKey parse = new URIToDBKey(loader, uri); + Object result = parse.getResult(); + + String expected = "cloud-region/att-aic/AAIAIC25/tenant/key1/vserver/key2/l-interface/key3"; + + assertEquals("blah", expected, result); + } + /** * Bad URI. @@ -76,7 +102,7 @@ public class URIToDBKeyTest { URI uri = UriBuilder.fromPath("/aai/" + loader.getVersion() + "/cloud-infrastructure/tenants/tenant/key1/vservers/vserver/key2/l-interadsfaces/l-interface/key3").build(); thrown.expect(AAIException.class); - thrown.expect(hasProperty("code", is("AAI_3001"))); + thrown.expect(hasProperty("code", is("AAI_3000"))); new URIToDBKey(loader, uri); } @@ -107,6 +133,17 @@ public class URIToDBKeyTest { * @throws IllegalArgumentException the illegal argument exception * @throws UnsupportedEncodingException the unsupported encoding exception */ + @Test + public void startsWithValidNamespace() throws JAXBException, AAIException, IllegalArgumentException, UnsupportedEncodingException { + URI uri = UriBuilder.fromPath("/aai/" + loader.getVersion() + "/cloud-infrastructure/tenants/tenant/key1/vservers/vserver/key2/l-interfaces/l-interface/key3").build(); + + URIToDBKey parse = new URIToDBKey(loader, uri); + Object result = parse.getResult(); + + String expected = "cloud-region/att-aic/AAIAIC25/tenant/key1/vserver/key2/l-interface/key3"; + + assertEquals("blah", expected, result); + } /** * Naming exceptions. diff --git a/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIToExtensionInformationTest.java b/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIToExtensionInformationTest.java new file mode 100644 index 00000000..ee665d31 --- /dev/null +++ b/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIToExtensionInformationTest.java @@ -0,0 +1,94 @@ +/*- + * ============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.parsers.uri; + +import org.junit.Ignore; +import org.junit.Test; +import org.openecomp.aai.AAISetup; +import org.openecomp.aai.exceptions.AAIException; +import org.openecomp.aai.introspection.Loader; +import org.openecomp.aai.introspection.LoaderFactory; +import org.openecomp.aai.introspection.ModelType; +import org.openecomp.aai.introspection.Version; +import org.openecomp.aai.restcore.HttpMethod; + +import javax.ws.rs.core.UriBuilder; +import javax.xml.bind.JAXBException; +import java.io.UnsupportedEncodingException; +import java.net.URI; + +import static org.junit.Assert.assertEquals; + +@Ignore +public class URIToExtensionInformationTest extends AAISetup { + + private Loader v8Loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.v8); + + /** + * Vservers V 7. + * + * @throws JAXBException the JAXB exception + * @throws AAIException the AAI exception + * @throws IllegalArgumentException the illegal argument exception + * @throws UnsupportedEncodingException the unsupported encoding exception + */ + @Test + public void vserversV8() throws JAXBException, AAIException, IllegalArgumentException, UnsupportedEncodingException { + URI uri = UriBuilder.fromPath("/aai/" + v8Loader.getVersion() + "/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant/key1/vservers/vserver/key2").build(); + URIToExtensionInformation parse = new URIToExtensionInformation(v8Loader, uri); + + String namespace = "cloudInfrastructure"; + String preMethodName = "DynamicAddCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverPreProc"; + String postMethodName = "DynamicAddCloudInfrastructureCloudRegionsCloudRegionTenantsTenantVserversVserverPostProc"; + String topLevel = "CloudRegion"; + testSpec(parse, HttpMethod.PUT, namespace, preMethodName, postMethodName, topLevel); + + } + + /** + * Test spec. + * + * @param info the info + * @param httpMethod the http method + * @param namespace the namespace + * @param preMethodName the pre method name + * @param postMethodName the post method name + * @param topLevel the top level + */ + private void testSpec(URIToExtensionInformation info, HttpMethod httpMethod, String namespace, String preMethodName, String postMethodName, String topLevel) { + + + String namespaceResult = info.getNamespace(); + String methodNameResult = info.getMethodName(httpMethod, true); + + assertEquals("namespace", namespace, namespaceResult); + assertEquals("preprocess method name", preMethodName, methodNameResult); + methodNameResult = info.getMethodName(httpMethod, false); + + assertEquals("postprocess method name", postMethodName, methodNameResult); + + String topLevelResult = info.getTopObject(); + + assertEquals("topLevel", topLevel, topLevelResult); + } + + +} diff --git a/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIToObjectTest.java b/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIToObjectTest.java index 3bbc00fd..7261a2dc 100644 --- a/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIToObjectTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIToObjectTest.java @@ -20,52 +20,37 @@ package org.openecomp.aai.parsers.uri; -import static org.hamcrest.Matchers.hasProperty; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; - -import java.io.UnsupportedEncodingException; -import java.net.URI; -import java.util.HashMap; - -import javax.ws.rs.core.UriBuilder; -import javax.xml.bind.JAXBException; - -import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; - +import org.openecomp.aai.AAISetup; import org.openecomp.aai.db.props.AAIProperties; import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.introspection.LoaderFactory; -import org.openecomp.aai.introspection.ModelType; -import org.openecomp.aai.introspection.Version; +import org.openecomp.aai.introspection.*; import org.openecomp.aai.introspection.exceptions.AAIUnknownObjectException; +import javax.ws.rs.core.UriBuilder; +import javax.xml.bind.JAXBException; +import java.io.UnsupportedEncodingException; +import java.net.URI; +import java.util.HashMap; + +import static org.hamcrest.Matchers.hasProperty; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertEquals; + @Ignore -public class URIToObjectTest { +public class URIToObjectTest extends AAISetup { private Version version = Version.v8; private Version currentVersion = AAIProperties.LATEST; private Loader loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, version); + @Rule public ExpectedException thrown = ExpectedException.none(); - - /** - * Configure. - */ - @BeforeClass - public static void configure() { - System.setProperty("AJSC_HOME", "."); - System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); - } - - + /** * Uri. * diff --git a/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIToRelationshipObjectTest.java b/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIToRelationshipObjectTest.java index ed278243..42c602ba 100644 --- a/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIToRelationshipObjectTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIToRelationshipObjectTest.java @@ -20,50 +20,35 @@ package org.openecomp.aai.parsers.uri; -import static org.hamcrest.Matchers.hasProperty; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertTrue; - -import java.io.UnsupportedEncodingException; -import java.net.MalformedURLException; -import java.net.URI; -import java.net.URISyntaxException; - -import javax.ws.rs.core.UriBuilder; -import javax.xml.bind.JAXBException; - -import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; - +import org.openecomp.aai.AAISetup; import org.openecomp.aai.db.props.AAIProperties; import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.introspection.LoaderFactory; -import org.openecomp.aai.introspection.ModelType; -import org.openecomp.aai.introspection.Version; +import org.openecomp.aai.introspection.*; + +import javax.ws.rs.core.UriBuilder; +import javax.xml.bind.JAXBException; +import java.io.UnsupportedEncodingException; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; + +import static org.hamcrest.Matchers.hasProperty; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertTrue; @Ignore -public class URIToRelationshipObjectTest { +public class URIToRelationshipObjectTest extends AAISetup { private Version latest = AAIProperties.LATEST; private Loader loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, latest); @Rule public ExpectedException thrown = ExpectedException.none(); - - /** - * Configure. - */ - @BeforeClass - public static void configure() { - System.setProperty("AJSC_HOME", "."); - System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); - } - + /** * Uri. * diff --git a/aai-core/src/test/java/org/openecomp/aai/query/builder/SimplePathTest.java b/aai-core/src/test/java/org/openecomp/aai/query/builder/SimplePathTest.java index 072ba694..e57fb0e5 100644 --- a/aai-core/src/test/java/org/openecomp/aai/query/builder/SimplePathTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/query/builder/SimplePathTest.java @@ -17,20 +17,17 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.openecomp.aai.query.builder; - -import static org.junit.Assert.*; -import java.util.List; +package org.openecomp.aai.query.builder; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; -import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.T; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; import org.junit.Before; import org.junit.Test; +import org.openecomp.aai.AAISetup; import org.openecomp.aai.exceptions.AAIException; import org.openecomp.aai.introspection.Loader; import org.openecomp.aai.introspection.LoaderFactory; @@ -38,15 +35,17 @@ import org.openecomp.aai.introspection.ModelType; import org.openecomp.aai.introspection.Version; import org.openecomp.aai.serialization.db.EdgeRules; import org.openecomp.aai.serialization.db.EdgeType; -import org.openecomp.aai.serialization.db.exceptions.NoEdgeRuleFoundException; -public class SimplePathTest { +import java.util.List; + +import static org.junit.Assert.assertTrue; + +public class SimplePathTest extends AAISetup { + public Loader loader; @Before - public void setup() { - System.setProperty("AJSC_HOME", "."); - System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); + public void setup() throws Exception { loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.getLatest()); } diff --git a/aai-core/src/test/java/org/openecomp/aai/query/builder/TraversalQueryTest.java b/aai-core/src/test/java/org/openecomp/aai/query/builder/TraversalQueryTest.java index 0ea9a11c..f8418bd1 100644 --- a/aai-core/src/test/java/org/openecomp/aai/query/builder/TraversalQueryTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/query/builder/TraversalQueryTest.java @@ -20,40 +20,36 @@ package org.openecomp.aai.query.builder; -import static org.junit.Assert.assertEquals; - -import java.io.UnsupportedEncodingException; -import java.net.URI; -import java.net.URISyntaxException; - import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.junit.BeforeClass; +import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.mockito.Mock; - +import org.openecomp.aai.AAISetup; import org.openecomp.aai.db.props.AAIProperties; import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; import org.openecomp.aai.introspection.Loader; import org.openecomp.aai.introspection.LoaderFactory; import org.openecomp.aai.introspection.ModelType; -import org.openecomp.aai.serialization.queryformats.QueryFormatTestHelper; -import org.openecomp.aai.util.AAIConstants; -public class TraversalQueryTest { +import java.io.UnsupportedEncodingException; +import java.net.URI; +import java.net.URISyntaxException; + +import static org.junit.Assert.assertEquals; + +public class TraversalQueryTest extends AAISetup { - public static Loader loader; - @Mock public GraphTraversalSource g; - @BeforeClass - public static void configure() throws NoSuchFieldException, SecurityException, Exception { - - System.setProperty("AJSC_HOME", "."); - System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); - QueryFormatTestHelper.setFinalStatic(AAIConstants.class.getField("AAI_HOME_ETC_OXM"), "src/test/resources/org/openecomp/aai/introspection/"); + private Loader loader; + + @Mock + private GraphTraversalSource g; + + @Before + public void configure() throws Exception { loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, AAIProperties.LATEST); } diff --git a/aai-core/src/test/java/org/openecomp/aai/query/builder/UntilTest.java b/aai-core/src/test/java/org/openecomp/aai/query/builder/UntilTest.java index fa434b44..b6c6025a 100644 --- a/aai-core/src/test/java/org/openecomp/aai/query/builder/UntilTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/query/builder/UntilTest.java @@ -17,12 +17,9 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.openecomp.aai.query.builder; -import static org.junit.Assert.assertTrue; +package org.openecomp.aai.query.builder; -import java.util.ArrayList; -import java.util.List; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.T; @@ -30,6 +27,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; import org.junit.Before; import org.junit.Test; +import org.openecomp.aai.AAISetup; import org.openecomp.aai.db.props.AAIProperties; import org.openecomp.aai.exceptions.AAIException; import org.openecomp.aai.introspection.Loader; @@ -38,15 +36,18 @@ import org.openecomp.aai.introspection.ModelType; import org.openecomp.aai.serialization.db.EdgeRules; import org.openecomp.aai.serialization.db.EdgeType; -public class UntilTest { - public Loader loader; +import java.util.ArrayList; +import java.util.List; + +import static org.junit.Assert.assertTrue; + +public class UntilTest extends AAISetup { + + private Loader loader; @Before - public void setup(){ - System.setProperty("AJSC_HOME", "."); - System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); + public void setup() throws Exception { loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, AAIProperties.LATEST); - } private QueryBuilder<Vertex> buildTestQuery(QueryBuilder<Vertex> qb) throws AAIException{ diff --git a/aai-core/src/test/java/org/openecomp/aai/serialization/db/DbAliasTest.java b/aai-core/src/test/java/org/openecomp/aai/serialization/db/DbAliasTest.java index cc419c67..d4793939 100644 --- a/aai-core/src/test/java/org/openecomp/aai/serialization/db/DbAliasTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/serialization/db/DbAliasTest.java @@ -20,71 +20,63 @@ package org.openecomp.aai.serialization.db; -import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; - -import java.io.UnsupportedEncodingException; -import java.lang.reflect.InvocationTargetException; -import java.net.MalformedURLException; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Collections; -import java.util.Map; - +import com.thinkaurelius.titan.core.TitanFactory; +import com.thinkaurelius.titan.core.TitanGraph; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; +import org.openecomp.aai.AAISetup; import org.openecomp.aai.dbmap.DBConnectionType; import org.openecomp.aai.exceptions.AAIException; -import org.openecomp.aai.introspection.Introspector; -import org.openecomp.aai.introspection.Loader; -import org.openecomp.aai.introspection.LoaderFactory; -import org.openecomp.aai.introspection.ModelType; -import org.openecomp.aai.introspection.Version; +import org.openecomp.aai.introspection.*; import org.openecomp.aai.parsers.query.QueryParser; import org.openecomp.aai.schema.enums.PropertyMetadata; import org.openecomp.aai.serialization.engines.QueryStyle; import org.openecomp.aai.serialization.engines.TitanDBEngine; import org.openecomp.aai.serialization.engines.TransactionalGraphEngine; -import com.thinkaurelius.titan.core.TitanFactory; -import com.thinkaurelius.titan.core.TitanGraph; +import java.io.UnsupportedEncodingException; +import java.lang.reflect.InvocationTargetException; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Collections; +import java.util.Map; + +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; -@Ignore -public class DbAliasTest { +public class DbAliasTest extends AAISetup { - - private TitanGraph graph; + private final Version version = Version.v9; private final ModelType introspectorFactoryType = ModelType.MOXY; private final QueryStyle queryStyle = QueryStyle.TRAVERSAL; private final DBConnectionType type = DBConnectionType.REALTIME; private Loader loader; private TransactionalGraphEngine dbEngine; + @Before - public void setup() throws NoSuchFieldException, SecurityException, Exception { + public void setup() throws Exception { graph = TitanFactory.build().set("storage.backend","inmemory").open(); - System.setProperty("AJSC_HOME", "."); - System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); loader = LoaderFactory.createLoaderForVersion(introspectorFactoryType, version); dbEngine = new TitanDBEngine( queryStyle, type, loader); } - + @After public void tearDown() { graph.tx().rollback(); graph.close(); } - + @Test public void checkOnWrite() throws AAIException, UnsupportedEncodingException, URISyntaxException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, InstantiationException, NoSuchMethodException, InterruptedException { final String property = "persona-model-customization-id"; @@ -109,17 +101,17 @@ public class DbAliasTest { if (map.containsKey(PropertyMetadata.DB_ALIAS)) { dbPropertyName = map.get(PropertyMetadata.DB_ALIAS); } - + assertEquals("dbAlias is ", "model-customization-id", dbPropertyName); assertEquals("dbAlias property exists", "hello", v.property(dbPropertyName).orElse("")); assertEquals("model property does not", "missing", v.property(property).orElse("missing")); - + } - + @Test public void checkOnRead() throws AAIException, UnsupportedEncodingException, URISyntaxException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, InstantiationException, NoSuchMethodException, InterruptedException, MalformedURLException { final String property = "persona-model-customization-id"; - + TransactionalGraphEngine spy = spy(dbEngine); TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin()); Vertex v = graph.traversal().addV("vnf-id", "key1", "model-customization-id", "hello").next(); @@ -131,9 +123,10 @@ public class DbAliasTest { DBSerializer serializer = new DBSerializer(version, spy, introspectorFactoryType, "AAI_TEST"); Introspector obj = loader.introspectorFromName("generic-vnf"); serializer.dbToObject(Collections.singletonList(v), obj, 0, true, "false"); - + assertEquals("dbAlias property exists", "hello", obj.getValue(property)); - + } - + + } diff --git a/aai-core/src/test/java/org/openecomp/aai/serialization/db/DbSerializerTest.java b/aai-core/src/test/java/org/openecomp/aai/serialization/db/DbSerializerTest.java index b100b014..3c3ec789 100644 --- a/aai-core/src/test/java/org/openecomp/aai/serialization/db/DbSerializerTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/serialization/db/DbSerializerTest.java @@ -20,17 +20,14 @@ package org.openecomp.aai.serialization.db; -import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; - +import com.thinkaurelius.titan.core.TitanFactory; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; +import org.openecomp.aai.AAISetup; import org.openecomp.aai.dbmap.DBConnectionType; import org.openecomp.aai.exceptions.AAIException; import org.openecomp.aai.introspection.Loader; @@ -41,10 +38,12 @@ import org.openecomp.aai.serialization.engines.QueryStyle; import org.openecomp.aai.serialization.engines.TitanDBEngine; import org.openecomp.aai.serialization.engines.TransactionalGraphEngine; -import com.thinkaurelius.titan.core.TitanFactory; +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + +public class DbSerializerTest extends AAISetup { -@Ignore -public class DbSerializerTest { protected Graph graph; protected final EdgeRules rules = EdgeRules.getInstance(); @@ -58,10 +57,8 @@ public class DbSerializerTest { TransactionalGraphEngine.Admin adminSpy; @Before - public void setup() throws NoSuchFieldException, SecurityException, Exception { + public void setup() throws Exception { graph = TitanFactory.build().set("storage.backend", "inmemory").open(); - System.setProperty("AJSC_HOME", "."); - System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); loader = LoaderFactory.createLoaderForVersion(introspectorFactoryType, version); dbEngine = new TitanDBEngine(queryStyle, type, loader); spy = spy(dbEngine); diff --git a/aai-core/src/test/java/org/openecomp/aai/serialization/db/EdgePropertyMapTest.java b/aai-core/src/test/java/org/openecomp/aai/serialization/db/EdgePropertyMapTest.java new file mode 100644 index 00000000..fb3c0469 --- /dev/null +++ b/aai-core/src/test/java/org/openecomp/aai/serialization/db/EdgePropertyMapTest.java @@ -0,0 +1,43 @@ +/*- + * ============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.serialization.db; + +import org.junit.Test; + +import java.util.Map; + +import static org.junit.Assert.assertEquals; + +public class EdgePropertyMapTest { + + @Test + public void run() { + Map<String, String> map = new EdgePropertyMap<>(); + map.put("direction", "OUT"); + map.put("test", "hello"); + map.put("isParent", "${direction}"); + map.put("SVC-INFRA", "!${direction}"); + + assertEquals("normal retrieval", "hello", map.get("test")); + assertEquals("variable retrieval", "OUT", map.get("isParent")); + assertEquals("negate variable retrieval", "IN", map.get("SVC-INFRA")); + } +} diff --git a/aai-core/src/test/java/org/openecomp/aai/serialization/db/EdgeRulesTest.java b/aai-core/src/test/java/org/openecomp/aai/serialization/db/EdgeRulesTest.java index faa4d28e..87bb6ca7 100644 --- a/aai-core/src/test/java/org/openecomp/aai/serialization/db/EdgeRulesTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/serialization/db/EdgeRulesTest.java @@ -20,26 +20,37 @@ package org.openecomp.aai.serialization.db; + +import org.apache.tinkerpop.gremlin.structure.Direction; +import org.junit.Test; +import org.openecomp.aai.AAISetup; import static org.junit.Assert.assertEquals; import java.util.Map; +import java.util.Set; + +import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; +import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.T; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; +import org.junit.Rule; +import org.junit.rules.ExpectedException; -import org.apache.tinkerpop.gremlin.structure.Direction; -import org.junit.BeforeClass; -import org.junit.Test; import org.openecomp.aai.exceptions.AAIException; import org.openecomp.aai.introspection.Version; +import org.openecomp.aai.serialization.db.exceptions.EdgeMultiplicityException; import org.openecomp.aai.serialization.db.exceptions.NoEdgeRuleFoundException; -public class EdgeRulesTest { +import com.google.common.collect.Multimap; + +public class EdgeRulesTest extends AAISetup { + + //set thrown.expect to whatever a specific test needs + //this establishes a default of expecting no exceptions to be thrown + @Rule + public ExpectedException thrown = ExpectedException.none(); - @BeforeClass - public static void setup() { - System.setProperty("AJSC_HOME", "."); - System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); - } - - @Test public void verifyOutDirection() throws AAIException, NoEdgeRuleFoundException { EdgeRules rules = EdgeRules.getInstance(); @@ -93,4 +104,134 @@ public class EdgeRulesTest { assertEquals(false, EdgeRules.getInstance(Version.v8).hasEdgeRule("model-element", "model-ver")); } + @Test + public void hasEdgeRuleVertexTest() { + Graph graph = TinkerGraph.open(); + Vertex v1 = graph.addVertex("aai-node-type", "cloud-region"); + Vertex v2 = graph.addVertex("aai-node-type", "tenant"); + assertEquals(true, EdgeRules.getInstance().hasEdgeRule(v1, v2)); + } + + @Test + public void getEdgeRuleByTypeAndVertices() throws AAIException { + Graph graph = TinkerGraph.open(); + Vertex v1 = graph.addVertex("aai-node-type", "cloud-region"); + Vertex v2 = graph.addVertex("aai-node-type", "tenant"); + EdgeRules rules = EdgeRules.getInstance(); + EdgeRule rule = rules.getEdgeRule(EdgeType.TREE, v1, v2); + assertEquals(true, "OUT".equalsIgnoreCase(rule.getContains())); + assertEquals(true, "NONE".equalsIgnoreCase(rule.getDeleteOtherV())); + assertEquals(true, MultiplicityRule.ONE2MANY.equals(rule.getMultiplicityRule())); + assertEquals(true, "IN".equalsIgnoreCase(rule.getServiceInfrastructure())); + assertEquals(true, "OUT".equalsIgnoreCase(rule.getPreventDelete())); + } + + @Test + public void addTreeEdgeTest() throws AAIException { + Graph graph = TinkerGraph.open(); + Vertex v1 = graph.addVertex(T.id, "1", "aai-node-type", "cloud-region"); + Vertex v2 = graph.addVertex(T.id, "10", "aai-node-type", "tenant"); + EdgeRules rules = EdgeRules.getInstance(); + GraphTraversalSource g = graph.traversal(); + rules.addTreeEdge(g, v1, v2); + assertEquals(true, g.V(v1).out("has").has("aai-node-type", "tenant").hasNext()); + + Vertex v3 = graph.addVertex(T.id, "2", "aai-node-type", "cloud-region"); + assertEquals(null, rules.addTreeEdgeIfPossible(g, v3, v2)); + } + + @Test + public void addCousinEdgeTest() throws AAIException { + Graph graph = TinkerGraph.open(); + Vertex v1 = graph.addVertex(T.id, "1", "aai-node-type", "flavor"); + Vertex v2 = graph.addVertex(T.id, "10", "aai-node-type", "vserver"); + EdgeRules rules = EdgeRules.getInstance(Version.getLatest()); + GraphTraversalSource g = graph.traversal(); + rules.addEdge(g, v1, v2); + assertEquals(true, g.V(v2).out("hasFlavor").has("aai-node-type", "flavor").hasNext()); + + Vertex v3 = graph.addVertex(T.id, "2", "aai-node-type", "flavor"); + assertEquals(null, rules.addEdgeIfPossible(g, v3, v2)); + } + + @Test + public void multiplicityViolationTest() throws AAIException { + thrown.expect(EdgeMultiplicityException.class); + thrown.expectMessage("multiplicity rule violated: only one edge can exist with label: uses between vf-module and volume-group"); + + Graph graph = TinkerGraph.open(); + Vertex v1 = graph.addVertex(T.id, "1", "aai-node-type", "vf-module"); + Vertex v2 = graph.addVertex(T.id, "10", "aai-node-type", "volume-group"); + EdgeRules rules = EdgeRules.getInstance(Version.getLatest()); + GraphTraversalSource g = graph.traversal(); + + rules.addEdge(g, v2, v1); + Vertex v3 = graph.addVertex(T.id, "3", "aai-node-type", "vf-module"); + rules.addEdge(g, v2, v3); + } + + @Test + public void getChildrenTest() { + EdgeRules rules = EdgeRules.getInstance("/dbedgerules/DbEdgeRules_test.json"); + Set<EdgeRule> children = rules.getChildren("foo"); + assertEquals(2, children.size()); + boolean sawBazRule = false; + boolean sawQuuxRule = false; + for (EdgeRule r : children) { + if ("isVeryHappyAbout".equals(r.getLabel())) { + sawBazRule = true; + } else if ("dancesWith".equals(r.getLabel())) { + sawQuuxRule = true; + } + } + assertEquals(true, sawBazRule && sawQuuxRule); + } + + @Test + public void getAllRulesTest() { + EdgeRules rules = EdgeRules.getInstance("/dbedgerules/DbEdgeRules_test.json"); + Multimap<String, EdgeRule> allRules = rules.getAllRules(); + assertEquals(3, allRules.size()); + assertEquals(true, allRules.containsKey("foo|bar")); + assertEquals(true, allRules.containsKey("foo|bar")); + assertEquals(true, allRules.containsKey("quux|foo")); + } + + @Test + public void getAllRulesMissingPropertyTest() { + EdgeRules rules = EdgeRules.getInstance("/dbedgerules/DbEdgeRules_test_broken.json"); + + thrown.expect(RuntimeException.class); + thrown.expectMessage("org.openecomp.aai.exceptions.AAIException: Rule between foo and bar is missing property delete-other-v."); + rules.getAllRules(); + } + + @Test + public void getChildrenMissingPropertyTest() { + EdgeRules rules = EdgeRules.getInstance("/dbedgerules/DbEdgeRules_test_broken.json"); + + thrown.expect(RuntimeException.class); + thrown.expectMessage("org.openecomp.aai.exceptions.AAIException: Rule between quux and foo is missing property SVC-INFRA."); + rules.getChildren("foo"); + } + + @Test + public void getEdgeRuleMissingPropertyTest() throws AAIException { + EdgeRules rules = EdgeRules.getInstance("/dbedgerules/DbEdgeRules_test_broken.json"); + + thrown.expect(RuntimeException.class); + thrown.expectMessage("org.openecomp.aai.exceptions.AAIException: Rule between quux and foo is missing property SVC-INFRA."); + rules.getEdgeRules("foo", "quux"); + } + + @Test + public void verifyAllRules() { + // This will cause every rule in the real json files to be verified + // so if any required properties are missing, the verification builds + // will catch it and incorrect rules can't get merged in. + for (Version v : Version.values()) { + EdgeRules rules = EdgeRules.getInstance(v); + rules.getAllRules(); + } + } } diff --git a/aai-core/src/test/java/org/openecomp/aai/serialization/queryformats/QueryFormatTestHelper.java b/aai-core/src/test/java/org/openecomp/aai/serialization/queryformats/QueryFormatTestHelper.java index 8b6d4913..f9a511a2 100644 --- a/aai-core/src/test/java/org/openecomp/aai/serialization/queryformats/QueryFormatTestHelper.java +++ b/aai-core/src/test/java/org/openecomp/aai/serialization/queryformats/QueryFormatTestHelper.java @@ -20,24 +20,23 @@ package org.openecomp.aai.serialization.queryformats; -import static org.mockito.Matchers.isA; -import static org.mockito.Mockito.when; - -import java.io.IOException; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; - import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.io.IoCore; import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; - import org.openecomp.aai.db.props.AAIProperties; import org.openecomp.aai.serialization.queryformats.exceptions.AAIFormatVertexException; import org.openecomp.aai.serialization.queryformats.utils.UrlBuilder; +import java.io.IOException; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; + +import static org.mockito.Matchers.isA; +import static org.mockito.Mockito.when; + public class QueryFormatTestHelper { diff --git a/aai-core/src/test/java/org/openecomp/aai/serialization/queryformats/SimpleFormatTest.java b/aai-core/src/test/java/org/openecomp/aai/serialization/queryformats/SimpleFormatTest.java index 51ccd363..766274cd 100644 --- a/aai-core/src/test/java/org/openecomp/aai/serialization/queryformats/SimpleFormatTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/serialization/queryformats/SimpleFormatTest.java @@ -20,19 +20,7 @@ package org.openecomp.aai.serialization.queryformats; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; - -import java.io.UnsupportedEncodingException; - +import com.google.gson.JsonObject; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy; import org.apache.tinkerpop.gremlin.structure.Graph; @@ -57,9 +45,15 @@ import org.openecomp.aai.serialization.engines.TitanDBEngine; import org.openecomp.aai.serialization.engines.TransactionalGraphEngine; import org.openecomp.aai.serialization.queryformats.exceptions.AAIFormatVertexException; import org.openecomp.aai.serialization.queryformats.utils.UrlBuilder; -import org.openecomp.aai.util.AAIConstants; -import com.google.gson.JsonObject; +import java.io.UnsupportedEncodingException; + +import static org.junit.Assert.*; +import static org.mockito.Matchers.anyBoolean; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Matchers.anyObject; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.*; public class SimpleFormatTest { @@ -72,9 +66,6 @@ public class SimpleFormatTest { private DBSerializer serializer; private RawFormat simpleFormat; private Vertex vfModule; - - - private final ModelType factoryType = ModelType.MOXY; @Before @@ -82,11 +73,6 @@ public class SimpleFormatTest { MockitoAnnotations.initMocks(this); - System.setProperty("AJSC_HOME", "src/test/resources"); - System.setProperty("BUNDLECONFIG_DIR", "bundleconfig-local"); - QueryFormatTestHelper.setFinalStatic(AAIConstants.class.getField("AAI_HOME_ETC_OXM"), - "src/test/resources/org/openecomp/aai/introspection/"); - graph = TinkerGraph.open(); vfModule = graph.addVertex( diff --git a/aai-core/src/test/java/org/openecomp/aai/serialization/queryformats/utils/QueryParamInjectorTest.java b/aai-core/src/test/java/org/openecomp/aai/serialization/queryformats/utils/QueryParamInjectorTest.java index d5a09ece..3eade856 100644 --- a/aai-core/src/test/java/org/openecomp/aai/serialization/queryformats/utils/QueryParamInjectorTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/serialization/queryformats/utils/QueryParamInjectorTest.java @@ -20,11 +20,6 @@ package org.openecomp.aai.serialization.queryformats.utils; -import static org.junit.Assert.assertEquals; - -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; - import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -34,6 +29,11 @@ import org.openecomp.aai.serialization.db.DBSerializer; import org.openecomp.aai.serialization.queryformats.Resource; import org.openecomp.aai.serialization.queryformats.Resource.Builder; +import javax.ws.rs.core.MultivaluedHashMap; +import javax.ws.rs.core.MultivaluedMap; + +import static org.junit.Assert.assertEquals; + public class QueryParamInjectorTest { diff --git a/aai-core/src/test/java/org/openecomp/aai/serialization/queryformats/utils/UrlBuilderTest.java b/aai-core/src/test/java/org/openecomp/aai/serialization/queryformats/utils/UrlBuilderTest.java index dd22c0b5..605bbcd9 100644 --- a/aai-core/src/test/java/org/openecomp/aai/serialization/queryformats/utils/UrlBuilderTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/serialization/queryformats/utils/UrlBuilderTest.java @@ -19,40 +19,37 @@ */ package org.openecomp.aai.serialization.queryformats.utils; -import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.when; - -import java.io.UnsupportedEncodingException; -import java.net.URI; -import java.net.URISyntaxException; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.openecomp.aai.AAISetup; import org.openecomp.aai.introspection.Version; import org.openecomp.aai.serialization.db.DBSerializer; import org.openecomp.aai.serialization.queryformats.exceptions.AAIFormatVertexException; import org.openecomp.aai.util.AAIConstants; -public class UrlBuilderTest { +import java.io.UnsupportedEncodingException; +import java.net.URI; +import java.net.URISyntaxException; + +import static org.junit.Assert.assertEquals; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.when; + +public class UrlBuilderTest extends AAISetup { + + @Mock + private DBSerializer serializer; + @Mock + private Vertex v; - @Mock private DBSerializer serializer; - @Mock private Vertex v; private static final String uri = "/test/uri"; private static final Object vId = new Long(123); private static final String protocolAndHost = "http://localhost/aai/"; - @BeforeClass - public static void setUp() { - System.setProperty("AJSC_HOME", "."); - System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); - } - @Before public void before() throws UnsupportedEncodingException, URISyntaxException { MockitoAnnotations.initMocks(this); @@ -60,7 +57,6 @@ public class UrlBuilderTest { when(v.id()).thenReturn(vId); } - @Ignore @Test public void v11Pathed() throws UnsupportedEncodingException, URISyntaxException, AAIFormatVertexException { Version version = Version.v11; @@ -71,7 +67,6 @@ public class UrlBuilderTest { } - @Ignore @Test public void v11Id() throws UnsupportedEncodingException, URISyntaxException, AAIFormatVertexException { Version version = Version.v11; diff --git a/aai-core/src/test/java/org/openecomp/aai/serialization/tinkerpop/TreeBackedVertexTest.java b/aai-core/src/test/java/org/openecomp/aai/serialization/tinkerpop/TreeBackedVertexTest.java index 7a0a1693..c4440527 100644 --- a/aai-core/src/test/java/org/openecomp/aai/serialization/tinkerpop/TreeBackedVertexTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/serialization/tinkerpop/TreeBackedVertexTest.java @@ -20,33 +20,29 @@ package org.openecomp.aai.serialization.tinkerpop; -import static org.junit.Assert.assertEquals; - import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree; -import org.apache.tinkerpop.gremlin.structure.Direction; -import org.apache.tinkerpop.gremlin.structure.Element; -import org.apache.tinkerpop.gremlin.structure.Graph; -import org.apache.tinkerpop.gremlin.structure.T; -import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.*; import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; -import org.junit.BeforeClass; +import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.openecomp.aai.serialization.db.EdgeProperty; import org.openecomp.aai.serialization.engines.query.GraphTraversalQueryEngine; +import static org.junit.Assert.assertEquals; + @Ignore public class TreeBackedVertexTest { - - private static Graph graph = TinkerGraph.open(); - private static Object startKey = null; - private static Tree<Element> tree = null; - private static Tree<Element> treeDepth1 = null; - private static Tree<Element> treeDepth0NodeOnly = null; - @BeforeClass - public static void configure() { + private Graph graph = TinkerGraph.open(); + private Object startKey = null; + private Tree<Element> tree = null; + private Tree<Element> treeDepth1 = null; + private Tree<Element> treeDepth0NodeOnly = null; + + @Before + public void configure() { GraphTraversalSource g = graph.traversal(); startKey = g.addV(T.label, "vserver").as("v1").property("test", "hello") diff --git a/aai-core/src/test/java/org/openecomp/aai/util/CNNameTest.java b/aai-core/src/test/java/org/openecomp/aai/util/CNNameTest.java index 6b2536c9..f5b67233 100644 --- a/aai-core/src/test/java/org/openecomp/aai/util/CNNameTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/util/CNNameTest.java @@ -21,11 +21,11 @@ package org.openecomp.aai.util; import ch.qos.logback.access.spi.IAccessEvent; -import org.openecomp.aai.logging.CNName; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; import org.mockito.Mockito; +import org.openecomp.aai.logging.CNName; +import org.openecomp.aai.serialization.queryformats.QueryFormatTestHelper; import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.agent.PowerMockAgent; @@ -55,9 +55,10 @@ public class CNNameTest { * Initialize. */ @Before - public void initialize(){ + public void initialize() throws Exception { System.setProperty("AJSC_HOME", "."); System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); + QueryFormatTestHelper.setFinalStatic(AAIConstants.class.getField("AAI_HOME_ETC_OXM"), "src/test/resources/bundleconfig-local/etc/oxm/"); mockAccEvent = Mockito.mock(IAccessEvent.class); mockHttpServletRequest = Mockito.mock(HttpServletRequest.class); cert = Mockito.mock(X509Certificate.class); diff --git a/aai-core/src/test/java/org/openecomp/aai/util/CustomLogPatternLayoutTest.java b/aai-core/src/test/java/org/openecomp/aai/util/CustomLogPatternLayoutTest.java index 090f9101..31a7b5e4 100644 --- a/aai-core/src/test/java/org/openecomp/aai/util/CustomLogPatternLayoutTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/util/CustomLogPatternLayoutTest.java @@ -20,16 +20,13 @@ package org.openecomp.aai.util; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import org.junit.Ignore; import org.junit.Test; - import org.openecomp.aai.logging.CNName; import org.openecomp.aai.logging.CustomLogPatternLayout; -@Ignore +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public class CustomLogPatternLayoutTest { /** diff --git a/aai-core/src/test/java/org/openecomp/aai/workarounds/RemoveDME2QueryParamsTest.java b/aai-core/src/test/java/org/openecomp/aai/workarounds/RemoveDME2QueryParamsTest.java index 61ba275d..51636271 100644 --- a/aai-core/src/test/java/org/openecomp/aai/workarounds/RemoveDME2QueryParamsTest.java +++ b/aai-core/src/test/java/org/openecomp/aai/workarounds/RemoveDME2QueryParamsTest.java @@ -20,13 +20,13 @@ package org.openecomp.aai.workarounds; -import static org.junit.Assert.*; +import org.junit.Before; +import org.junit.Test; import javax.ws.rs.core.MultivaluedHashMap; import javax.ws.rs.core.MultivaluedMap; -import org.junit.Before; -import org.junit.Test; +import static org.junit.Assert.assertEquals; public class RemoveDME2QueryParamsTest { diff --git a/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml index 568b2ad3..2d09ff0f 100644 --- a/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml +++ b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml @@ -8,7 +8,9 @@ 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 + + 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. @@ -17,7 +19,7 @@ ============LICENSE_END========================================================= --> -<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.openecomp.org.v10" xml-mapping-metadata-complete="true"> +<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v10" xml-mapping-metadata-complete="true"> <xml-schema element-form-default="QUALIFIED"> <xml-ns namespace-uri="http://org.openecomp.aai.inventory/v10" /> </xml-schema> @@ -25,381 +27,290 @@ <java-type name="Inventory"> <xml-root-element name="inventory" /> <java-attributes> - <xml-element java-attribute="search" name="search" type="inventory.aai.openecomp.org.v10.Search" /> - <xml-element java-attribute="actions" name="actions" type="inventory.aai.openecomp.org.v10.Actions" /> - <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.openecomp.org.v10.CloudInfrastructure" /> - <xml-element java-attribute="business" name="business" type="inventory.aai.openecomp.org.v10.Business" /> - <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.openecomp.org.v10.ServiceDesignAndCreation" /> - <xml-element java-attribute="network" name="network" type="inventory.aai.openecomp.org.v10.Network" /> - <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.openecomp.org.v10.AaiInternal" /> - <xml-element java-attribute="nodes" name="nodes" type="inventory.aai.openecomp.org.v10.Nodes" /> + <xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v10.Search" /> + <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v10.Actions" /> + <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v10.CloudInfrastructure" /> + <xml-element java-attribute="licenseManagement" name="license-management" type="inventory.aai.onap.org.v10.LicenseManagement" /> + <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v10.Business" /> + <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v10.ServiceDesignAndCreation" /> + <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v10.Network" /> + <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v10.AaiInternal" /> + <xml-element java-attribute="nodes" name="nodes" type="inventory.aai.onap.org.v10.Nodes"/> </java-attributes> </java-type> + <java-type name="Nodes"> <xml-root-element name="nodes" /> </java-type> <java-type name="Search"> <xml-root-element name="search" /> <java-attributes> - <xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.openecomp.org.v10.EdgeTagQueryResult" /> - <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.openecomp.org.v10.EdgeTagQueryRequest" /> - <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.openecomp.org.v10.SearchResults" /> - <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.openecomp.org.v10.SdnZoneResponse" /> + <xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v10.EdgeTagQueryResult" /> + <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v10.EdgeTagQueryRequest" /> + <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v10.SearchResults" /> + <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v10.SdnZoneResponse" /> </java-attributes> </java-type> + <java-type name="EdgeTagQueryResult"> <xml-root-element name="edge-tag-query-result" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.openecomp.org.v10.TaggedInventoryItemList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v10.TaggedInventoryItemList" /> </java-attributes> </java-type> + <java-type name="TaggedInventoryItemList"> <xml-root-element name="tagged-inventory-item-list" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.openecomp.org.v10.InventoryItem" /> + <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v10.InventoryItem" /> </java-attributes> </java-type> + <java-type name="InventoryItem"> <xml-root-element name="inventory-item" /> <java-attributes> - <xml-element java-attribute="inventoryItemType" name="inventory-item-type" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="inventoryItemLink" name="inventory-item-link" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.openecomp.org.v10.InventoryItemData" /> - <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.openecomp.org.v10.TaggedInventoryItemList" /> + <xml-element java-attribute="inventoryItemType" name="inventory-item-type" type="java.lang.String" /> + <xml-element java-attribute="inventoryItemLink" name="inventory-item-link" type="java.lang.String" /> + <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.onap.org.v10.InventoryItemData" /> + <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v10.TaggedInventoryItemList" /> </java-attributes> </java-type> + <java-type name="InventoryItemData"> <xml-root-element name="inventory-item-data" /> <java-attributes> - <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> + <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" /> + <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" /> </java-attributes> </java-type> + <java-type name="EdgeTagQueryRequest"> <xml-root-element name="edge-tag-query-request" /> <java-attributes> - <xml-element java-attribute="edgeTag" name="edge-tag" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resultDetail" name="result-detail" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="startNodeType" name="start-node-type" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.openecomp.org.v10.StartNodeFilter" /> - <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.openecomp.org.v10.IncludeNodeFilter" /> - <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.openecomp.org.v10.SecondaryFilter" /> + <xml-element java-attribute="edgeTag" name="edge-tag" type="java.lang.String" /> + <xml-element java-attribute="resultDetail" name="result-detail" type="java.lang.String" /> + <xml-element java-attribute="startNodeType" name="start-node-type" type="java.lang.String" /> + <xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.onap.org.v10.StartNodeFilter" /> + <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v10.IncludeNodeFilter" /> + <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v10.SecondaryFilter" /> </java-attributes> </java-type> + <java-type name="StartNodeFilter"> <xml-root-element name="start-node-filter" /> <java-attributes> - <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> + <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" /> + <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" /> </java-attributes> </java-type> + <java-type name="IncludeNodeFilter"> <xml-root-element name="include-node-filter" /> <java-attributes> - <xml-element java-attribute="includeNodeType" name="include-node-type" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> + <xml-element java-attribute="includeNodeType" name="include-node-type" type="java.lang.String" /> </java-attributes> </java-type> + <java-type name="SecondaryFilter"> <xml-root-element name="secondary-filter" /> <java-attributes> - <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="filterType" name="filter-type" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> + <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" /> + <xml-element java-attribute="filterType" name="filter-type" type="java.lang.String" /> + <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" /> </java-attributes> </java-type> + <java-type name="SearchResults"> <xml-root-element name="search-results" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.openecomp.org.v10.ResultData" /> + <xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v10.ResultData" /> </java-attributes> </java-type> + <java-type name="ResultData"> <xml-root-element name="result-data" /> <java-attributes> <xml-element java-attribute="resourceType" name="resource-type" type="java.lang.String"> <xml-properties> <xml-property name="description" value="The specific type of node in the A&AI graph" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceLink" name="resource-link" type="java.lang.String"> <xml-properties> <xml-property name="description" value="The URL to the specific resource" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> </java-attributes> </java-type> + <java-type name="SdnZoneResponse"> <xml-root-element name="sdn-zone-response" /> <java-attributes> - <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.openecomp.org.v10.OamNetworks" /> - <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.openecomp.org.v10.AzAndDvsSwitches" /> + <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v10.OamNetworks" /> + <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v10.AzAndDvsSwitches" /> </java-attributes> </java-type> + <java-type name="AzAndDvsSwitches"> <xml-root-element name="az-and-dvs-switches" /> <java-attributes> - <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.openecomp.org.v10.DvsSwitches" /> - <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.openecomp.org.v10.AvailabilityZone" /> + <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v10.DvsSwitches" /> + <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v10.AvailabilityZone" /> </java-attributes> </java-type> + <java-type name="Actions"> <xml-properties> <xml-property name="description" value="APIs that are more action related than REST (e.g., notify, update)." /> </xml-properties> <xml-root-element name="actions" /> <java-attributes> - <xml-element java-attribute="update" name="update" type="inventory.aai.openecomp.org.v10.Update" /> - <xml-element java-attribute="notify" name="notify" type="inventory.aai.openecomp.org.v10.Notify" /> + <xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v10.Update" /> + <xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v10.Notify" /> </java-attributes> </java-type> + <java-type name="Update"> <xml-properties> <xml-property name="description" value="Serves a PATCH like function. Does not enforce concurrency control. Clear each usage with AAI team." /> </xml-properties> <xml-root-element name="update" /> <java-attributes> - <xml-element java-attribute="updateNodeType" name="update-node-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.openecomp.org.v10.UpdateNodeKey" /> - <xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.openecomp.org.v10.Action" /> + <xml-element java-attribute="updateNodeType" name="update-node-type" required="true" type="java.lang.String" /> + <xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.v10.UpdateNodeKey" /> + <xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String" /> + <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v10.Action" /> </java-attributes> </java-type> + <java-type name="Action"> <xml-root-element name="action" /> <java-attributes> - <xml-element java-attribute="actionType" name="action-type" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.openecomp.org.v10.ActionData" /> + <xml-element java-attribute="actionType" name="action-type" type="java.lang.String" /> + <xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.onap.org.v10.ActionData" /> </java-attributes> </java-type> + <java-type name="ActionData"> <xml-root-element name="action-data" /> <java-attributes> - <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> + <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" /> + <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" /> </java-attributes> </java-type> + <java-type name="UpdateNodeKey"> <xml-root-element name="update-node-key" /> <java-attributes> - <xml-element java-attribute="keyName" name="key-name" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="keyValue" name="key-value" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> + <xml-element java-attribute="keyName" name="key-name" type="java.lang.String" /> + <xml-element java-attribute="keyValue" name="key-value" type="java.lang.String" /> </java-attributes> </java-type> + <java-type name="Notify"> <xml-root-element name="notify" /> <java-attributes> - <xml-element java-attribute="eventId" name="event-id" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="nodeType" name="node-type" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="eventTrigger" name="event-trigger" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.openecomp.org.v10.KeyData" /> - <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> + <xml-element java-attribute="eventId" name="event-id" required="true" type="java.lang.String" /> + <xml-element java-attribute="nodeType" name="node-type" type="java.lang.String" /> + <xml-element java-attribute="eventTrigger" name="event-trigger" type="java.lang.String" /> + <xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.onap.org.v10.KeyData" /> + <xml-element java-attribute="selflink" name="selflink" type="java.lang.String" /> </java-attributes> </java-type> + <java-type name="KeyData"> <xml-root-element name="key-data" /> <java-attributes> - <xml-element java-attribute="keyName" name="key-name" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="keyValue" name="key-value" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> + <xml-element java-attribute="keyName" name="key-name" type="java.lang.String" /> + <xml-element java-attribute="keyValue" name="key-value" type="java.lang.String" /> </java-attributes> </java-type> + <java-type name="CloudInfrastructure"> <xml-properties> <xml-property name="description" value="Namespace for cloud infrastructure." /> </xml-properties> <xml-root-element name="cloud-infrastructure" /> <java-attributes> - <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.openecomp.org.v10.Complexes" /> - <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.openecomp.org.v10.CloudRegions" /> - <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.openecomp.org.v10.NetworkProfiles" /> - <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.openecomp.org.v10.Pservers" /> - <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.openecomp.org.v10.VirtualDataCenters" /> + <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v10.Complexes" /> + <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v10.CloudRegions" /> + <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v10.NetworkProfiles" /> + <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v10.Pservers" /> + <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v10.VirtualDataCenters" /> </java-attributes> </java-type> + <java-type name="CloudRegions"> <xml-root-element name="cloud-regions" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.openecomp.org.v10.CloudRegion" /> + <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v10.CloudRegion" /> </java-attributes> - <xml-properties> + <xml-properties> <xml-property name="maximumDepth" value="0" /> </xml-properties> </java-type> + <java-type name="CloudRegion"> <xml-root-element name="cloud-region" /> <java-attributes> <xml-element java-attribute="cloudOwner" name="cloud-owner" required="true" type="java.lang.String" xml-key="true"> <xml-properties> - <xml-property name="description" value="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname" /> - <xml-property name="sourceOfTruthType" value="aai" /> + <xml-property name="description" value="Identifies the vendor and cloud name, e.g., att-aic. First part of composite key should be formatted as vendor-cloudname" /> </xml-properties> </xml-element> <xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Identifier used by the vendor for the region. Second part of composite key" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="cloudType" name="cloud-type" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Type of the cloud (e.g., openstack)" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ownerDefinedType" name="owner-defined-type" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Cloud-owner defined type indicator (e.g., dcp, lcp)" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="cloudRegionVersion" name="cloud-region-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Software version employed at the site. NOTE - THIS FIELD IS NOT KEPT UP TO DATE." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String"> <xml-properties> <xml-property name="description" value="URL of the keystone identity service" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="cloudZone" name="cloud-zone" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Zone where the cloud is homed. NOTE - THIS FIELD IS NOT CORRECTLY POPULATED." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String"> <xml-properties> <xml-property name="description" value="complex name for cloud-region instance. NOTE - THIS FIELD IS NOT CORRECTLY POPULATED." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.openecomp.org.v10.VolumeGroups" /> - <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.openecomp.org.v10.Tenants" /> - <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.openecomp.org.v10.Flavors" /> - <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.openecomp.org.v10.GroupAssignments" /> - <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.openecomp.org.v10.Snapshots" /> - <xml-element java-attribute="images" name="images" type="inventory.aai.openecomp.org.v10.Images" /> - <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.openecomp.org.v10.DvsSwitches" /> - <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.openecomp.org.v10.OamNetworks" /> - <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.openecomp.org.v10.AvailabilityZones" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v10.VolumeGroups" /> + <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v10.Tenants" /> + <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v10.Flavors" /> + <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v10.GroupAssignments" /> + <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v10.Snapshots" /> + <xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v10.Images" /> + <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v10.DvsSwitches" /> + <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v10.OamNetworks" /> + <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v10.AvailabilityZones" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> - <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation." /> + <xml-property name="description" value="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." /> <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type" /> <xml-property name="nameProps" value="owner-defined-type" /> <xml-property name="container" value="cloud-regions" /> @@ -412,61 +323,54 @@ </xml-properties> <xml-root-element name="volume-groups" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.openecomp.org.v10.VolumeGroup" /> + <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v10.VolumeGroup" /> </java-attributes> </java-type> + <java-type name="VolumeGroup"> <xml-root-element name="volume-group" /> <java-attributes> <xml-element java-attribute="volumeGroupId" name="volume-group-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique ID of volume-group." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="volumeGroupName" name="volume-group-name" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Name of the volume group." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Heat stack id corresponding to this volume-group" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource. This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Orchestration status of this volume-group" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vfModuleModelCustomizationId" name="vf-module-model-customization-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="helps relate the volume group to the vf-module whose components will require the volume group" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Persistent block-level storage." /> @@ -476,173 +380,123 @@ <xml-property name="container" value="volume-groups" /> </xml-properties> </java-type> + <java-type name="RelationshipList"> <xml-root-element name="relationship-list" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.openecomp.org.v10.Relationship" /> + <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v10.Relationship" /> </java-attributes> </java-type> + <java-type name="Relationship"> <xml-root-element name="relationship" /> <java-attributes> <xml-element java-attribute="relatedTo" name="related-to" type="java.lang.String"> <xml-properties> <xml-property name="description" value="A keyword provided by A&AI to indicate type of node." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="relatedLink" name="related-link" type="java.lang.String"> <xml-properties> <xml-property name="description" value="URL to the object in A&AI." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.openecomp.org.v10.RelationshipData" /> - <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.openecomp.org.v10.RelatedToProperty" /> + <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v10.RelationshipData" /> + <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v10.RelatedToProperty" /> </java-attributes> </java-type> + <java-type name="RelatedToProperty"> <xml-root-element name="related-to-property" /> <java-attributes> <xml-element java-attribute="propertyKey" name="property-key" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Key part of a key/value pair" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Value part of a key/value pair" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> </java-attributes> </java-type> + <java-type name="RelationshipData"> <xml-root-element name="relationship-data" /> <java-attributes> <xml-element java-attribute="relationshipKey" name="relationship-key" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="A keyword provided by A&AI to indicate an attribute." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="relationshipValue" name="relationship-value" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Value of the attribute." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> </java-attributes> </java-type> + <java-type name="Complexes"> <xml-properties> <xml-property name="description" value="Collection of physical locations that can house cloud-regions." /> </xml-properties> <xml-root-element name="complexes" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.openecomp.org.v10.Complex" /> + <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v10.Complex" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> </xml-properties> </java-type> + <java-type name="Complex"> <xml-root-element name="complex" /> <java-attributes> <xml-element java-attribute="physicalLocationId" name="physical-location-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique identifier for physical location, e.g., CLLI" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="dataCenterCode" name="data-center-code" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Data center code which can be an alternate way to identify a complex" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Gamma complex name for LCP instance." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String"> <xml-properties> <xml-property name="description" value="URL of the keystone identity service" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="physicalLocationType" name="physical-location-type" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Type, e.g., central office, data center." /> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="street1" name="street1" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="street2" name="street2" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="city" name="city" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="state" name="state" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="postalCode" name="postal-code" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="country" name="country" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="region" name="region" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="latitude" name="latitude" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="longitude" name="longitude" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="elevation" name="elevation" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="lata" name="lata" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.openecomp.org.v10.CtagPools" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="street1" name="street1" required="true" type="java.lang.String" /> + <xml-element java-attribute="street2" name="street2" type="java.lang.String" /> + <xml-element java-attribute="city" name="city" required="true" type="java.lang.String" /> + <xml-element java-attribute="state" name="state" type="java.lang.String" /> + <xml-element java-attribute="postalCode" name="postal-code" required="true" type="java.lang.String" /> + <xml-element java-attribute="country" name="country" required="true" type="java.lang.String" /> + <xml-element java-attribute="region" name="region" required="true" type="java.lang.String" /> + <xml-element java-attribute="latitude" name="latitude" type="java.lang.String" /> + <xml-element java-attribute="longitude" name="longitude" type="java.lang.String" /> + <xml-element java-attribute="elevation" name="elevation" type="java.lang.String" /> + <xml-element java-attribute="lata" name="lata" type="java.lang.String" /> + <xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v10.CtagPools" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Collection of physical locations that can house cloud-regions." /> @@ -653,46 +507,43 @@ <xml-property name="namespace" value="cloud-infrastructure" /> </xml-properties> </java-type> + <java-type name="CtagPools"> <xml-root-element name="ctag-pools" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.openecomp.org.v10.CtagPool" /> + <xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v10.CtagPool" /> </java-attributes> </java-type> + <java-type name="CtagPool"> <xml-root-element name="ctag-pool" /> <java-attributes> <xml-element java-attribute="targetPe" name="target-pe" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="The Target provider edge router" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Name of the availability zone" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ctagPoolPurpose" name="ctag-pool-purpose" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Describes what the intended purpose of this pool is." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ctagValues" name="ctag-values" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Comma separated list of ctags" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose." /> @@ -701,41 +552,40 @@ <xml-property name="container" value="ctag-pools" /> </xml-properties> </java-type> + <java-type name="Tenants"> <xml-properties> <xml-property name="description" value="Collection of openstack tenants." /> </xml-properties> <xml-root-element name="tenants" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.openecomp.org.v10.Tenant" /> + <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v10.Tenant" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> </xml-properties> </java-type> + <java-type name="Tenant"> <xml-root-element name="tenant" /> <java-attributes> <xml-element java-attribute="tenantId" name="tenant-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique id relative to the cloud-region." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="tenantName" name="tenant-name" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Readable name of tenant" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="vservers" name="vservers" type="inventory.aai.openecomp.org.v10.Vservers" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="vservers" name="vservers" type="inventory.aai.onap.org.v10.Vservers" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Openstack tenant" /> @@ -746,71 +596,65 @@ <xml-property name="container" value="tenants" /> </xml-properties> </java-type> + <java-type name="Vservers"> <xml-properties> <xml-property name="description" value="Collection of virtual Servers, aka virtual machines or VMs." /> </xml-properties> <xml-root-element name="vservers" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.openecomp.org.v10.Vserver" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v10.Vserver" /> </java-attributes> </java-type> + <java-type name="Vserver"> <xml-root-element name="vserver" /> <java-attributes> <xml-element java-attribute="vserverId" name="vserver-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique identifier for this vserver relative to its tenant" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vserverName" name="vserver-name" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Name of vserver" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vserverName2" name="vserver-name2" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Alternative name of vserver" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vserverSelflink" name="vserver-selflink" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="URL to endpoint where AAI can get more details" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean"> <xml-properties> - <xml-property name="defaultValue" value="false" /> + <xml-property name="defaultValue" value="false"/> <xml-property name="description" value="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." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element default-value="false" required="true" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" type="java.lang.Boolean"> <xml-properties> - <xml-property name="defaultValue" value="false" /> + <xml-property name="defaultValue" value="false"/> <xml-property name="description" value="Used to indicate whether closed loop function is enabled on this node" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="volumes" name="volumes" type="inventory.aai.openecomp.org.v10.Volumes" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.LInterfaces" /> + <xml-element java-attribute="volumes" name="volumes" type="inventory.aai.onap.org.v10.Volumes" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="Virtual Servers, aka virtual machine or VM." /> @@ -821,98 +665,88 @@ <xml-property name="container" value="vservers" /> </xml-properties> </java-type> + <java-type name="LInterfaces"> <xml-properties> <xml-property name="description" value="Collection of logical interfaces." /> </xml-properties> <xml-root-element name="l-interfaces" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.openecomp.org.v10.LInterface" /> + <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v10.LInterface" /> </java-attributes> </java-type> + <java-type name="LInterface"> <xml-root-element name="l-interface" /> <java-attributes> <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Name given to the interface" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String"> <xml-properties> <xml-property name="description" value="E.g., CUSTOMER, UPLINK, etc." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="v6WanLinkIp" name="v6-wan-link-ip" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"> <xml-properties> <xml-property name="description" value="URL to endpoint where AAI can get more details" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="ID of interface" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="macaddr" name="macaddr" type="java.lang.String"> <xml-properties> <xml-property name="description" value="MAC address for the interface" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="networkName" name="network-name" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Name of the network" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Whether A&AI should be managing this interface of not. Could have value like CUSTOMER" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="interfaceDescription" name="interface-description" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Human friendly text regarding this interface." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="isPortMirrored" name="is-port-mirrored" required="true" type="java.lang.Boolean"> <xml-properties> - <xml-property name="defaultValue" value="false" /> + <xml-property name="defaultValue" value="false"/> <xml-property name="description" value="boolean indicatating whether or not port is a mirrored." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean"> <xml-properties> - <xml-property name="defaultValue" value="false" /> + <xml-property name="defaultValue" value="false"/> <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> - </xml-element> - <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.openecomp.org.v10.Vlans" /> - <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.openecomp.org.v10.SriovVfs" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.LInterfaces" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> - <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v10.L3InterfaceIpv4AddressList" /> - <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v10.L3InterfaceIpv6AddressList" /> + </xml-element> + <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v10.Vlans" /> + <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v10.SriovVfs" /> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v10.L3InterfaceIpv4AddressList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v10.L3InterfaceIpv6AddressList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Logical interfaces, e.g., a vnic." /> @@ -921,13 +755,14 @@ <xml-property name="container" value="l-interfaces" /> </xml-properties> </java-type> + <java-type name="SriovVfs"> <xml-properties> <xml-property name="description" value="Collection of SR-IOV Virtual Functions." /> </xml-properties> <xml-root-element name="sriov-vfs" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.openecomp.org.v10.SriovVf" /> + <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v10.SriovVf" /> </java-attributes> </java-type> <java-type name="SriovVf"> @@ -936,88 +771,74 @@ <xml-element java-attribute="pciId" name="pci-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="PCI ID used to identify the sriov-vf" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vfVlanFilter" name="vf-vlan-filter" type="java.lang.String"> <xml-properties> <xml-property name="description" value="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vfMacFilter" name="vf-mac-filter" type="java.lang.String"> <xml-properties> <xml-property name="description" value="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vfVlanStrip" name="vf-vlan-strip" type="java.lang.Boolean"> <xml-properties> <xml-property name="description" value="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vfVlanAntiSpoofCheck" name="vf-vlan-anti-spoof-check" type="java.lang.Boolean"> <xml-properties> <xml-property name="description" value="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." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vfMacAntiSpoofCheck" name="vf-mac-anti-spoof-check" type="java.lang.Boolean"> <xml-properties> <xml-property name="description" value="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." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vfMirrors" name="vf-mirrors" type="java.lang.String"> <xml-properties> <xml-property name="description" value="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vfBroadcastAllow" name="vf-broadcast-allow" type="java.lang.Boolean"> <xml-properties> <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vfUnknownMulticastAllow" name="vf-unknown-multicast-allow" type="java.lang.Boolean"> <xml-properties> <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vfUnknownUnicastAllow" name="vf-unknown-unicast-allow" type="java.lang.Boolean"> <xml-properties> <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vfInsertStag" name="vf-insert-stag" type="java.lang.Boolean"> <xml-properties> <xml-property name="description" value="This option, if set to true, instructs to insert outer tag after traffic comes out of VM." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vfLinkStatus" name="vf-link-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="This option is used to set the link status. Valid values as of 1607 are on, off, and auto." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Neutron network id of the interface" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)" /> @@ -1026,58 +847,51 @@ <xml-property name="container" value="sriov-vfs" /> </xml-properties> </java-type> + <java-type name="L3InterfaceIpv4AddressList"> <xml-root-element name="l3-interface-ipv4-address-list" /> <java-attributes> <xml-element java-attribute="l3InterfaceIpv4Address" name="l3-interface-ipv4-address" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="IP address" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="l3InterfaceIpv4PrefixLength" name="l3-interface-ipv4-prefix-length" type="java.lang.Long"> <xml-properties> <xml-property name="description" value="Prefix length, 32 for single address" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long"> <xml-properties> <xml-property name="description" value="Inner VLAN tag" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long"> <xml-properties> <xml-property name="description" value="Outer VLAN tag" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean"> <xml-properties> <xml-property name="description" value="Indicator of fixed or floating address" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Neutron network id of the interface that address belongs to" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Neutron id of subnet that address belongs to" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="IPv4 Address Range" /> @@ -1085,86 +899,76 @@ <xml-property name="dependentOn" value="vlan,l-interface" /> </xml-properties> </java-type> + <java-type name="Vlans"> <xml-root-element name="vlans" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.openecomp.org.v10.Vlan" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v10.Vlan" /> </java-attributes> </java-type> + <java-type name="Vlan"> <xml-root-element name="vlan" /> <java-attributes> <xml-element java-attribute="vlanInterface" name="vlan-interface" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="String that identifies the interface" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long"> <xml-properties> <xml-property name="description" value="Inner VLAN tag" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long"> <xml-properties> <xml-property name="description" value="Outer VLAN tag" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Captures the numeric part of the speed" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Captures the units corresponding to the speed" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vlanDescription" name="vlan-description" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used to describe (the service associated with) the vlan" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="backdoorConnection" name="backdoor-connection" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Whether customer is going to use this VLAN for backdoor connection to another customer premise device." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="vpnId" name="vpn-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="This indicates the customers VPN ID associated with this vlan" /> - <xml-property name="dbAlias" value="vpn-id-local" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Status of a vnf's vlan interface, on which the customer circuit resides, mastered by SDN-C." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean"> + <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean"> <xml-properties> - <xml-property name="defaultValue" value="false" /> + <xml-property name="defaultValue" value="false"/> <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> - <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v10.L3InterfaceIpv4AddressList" /> - <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v10.L3InterfaceIpv6AddressList" /> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v10.L3InterfaceIpv4AddressList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v10.L3InterfaceIpv6AddressList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Definition of vlan" /> @@ -1174,58 +978,51 @@ <xml-property name="container" value="vlans" /> </xml-properties> </java-type> + <java-type name="L3InterfaceIpv6AddressList"> <xml-root-element name="l3-interface-ipv6-address-list" /> <java-attributes> <xml-element java-attribute="l3InterfaceIpv6Address" name="l3-interface-ipv6-address" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="IP address" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="l3InterfaceIpv6PrefixLength" name="l3-interface-ipv6-prefix-length" type="java.lang.Long"> <xml-properties> <xml-property name="description" value="Prefix length, 128 for single address" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long"> <xml-properties> <xml-property name="description" value="Inner VLAN tag" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long"> <xml-properties> <xml-property name="description" value="Outer VLAN tag" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean"> <xml-properties> <xml-property name="description" value="Indicator of fixed or floating address" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Neutron network id of the interface that address belongs to" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Neutron id of subnet that address belongs to" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="IPv6 Address Range" /> @@ -1233,37 +1030,36 @@ <xml-property name="dependentOn" value="vlan,l-interface" /> </xml-properties> </java-type> + <java-type name="Volumes"> <xml-properties> <xml-property name="description" value="Collection of ephemeral Block storage volumes." /> </xml-properties> <xml-root-element name="volumes" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.openecomp.org.v10.Volume" /> + <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v10.Volume" /> </java-attributes> </java-type> + <java-type name="Volume"> <xml-root-element name="volume" /> <java-attributes> <xml-element java-attribute="volumeId" name="volume-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique ID of block storage volume relative to the vserver." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="volumeSelflink" name="volume-selflink" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="URL to endpoint where AAI can get more details" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Ephemeral Block storage volume." /> @@ -1272,85 +1068,76 @@ <xml-property name="container" value="volumes" /> </xml-properties> </java-type> + <java-type name="Flavors"> <xml-properties> <xml-property name="description" value="Collection of openstack flavors." /> </xml-properties> <xml-root-element name="flavors" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.openecomp.org.v10.Flavor" /> + <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v10.Flavor" /> </java-attributes> </java-type> + <java-type name="Flavor"> <xml-root-element name="flavor" /> <java-attributes> <xml-element java-attribute="flavorId" name="flavor-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Flavor id, expected to be unique across cloud-region." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="flavorName" name="flavor-name" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Flavor name" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="flavorVcpus" name="flavor-vcpus" type="java.lang.Integer"> <xml-properties> <xml-property name="description" value="Number of CPUs" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="flavorRam" name="flavor-ram" type="java.lang.Integer"> <xml-properties> <xml-property name="description" value="Amount of memory" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="flavorDisk" name="flavor-disk" type="java.lang.Integer"> <xml-properties> <xml-property name="description" value="Disk space" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="flavorEphemeral" name="flavor-ephemeral" type="java.lang.Integer"> <xml-properties> <xml-property name="description" value="Amount of ephemeral disk space" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="flavorSwap" name="flavor-swap" type="java.lang.String"> <xml-properties> <xml-property name="description" value="amount of swap space allocation" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="flavorIsPublic" name="flavor-is-public" type="java.lang.Boolean"> <xml-properties> <xml-property name="description" value="whether flavor is available to all users or private to the tenant it was created in." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="flavorSelflink" name="flavor-selflink" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="URL to endpoint where AAI can get more details" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="flavorDisabled" name="flavor-disabled" type="java.lang.Boolean"> <xml-properties> <xml-property name="description" value="Boolean as to whether this flavor is no longer enabled" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Openstack flavor." /> @@ -1360,85 +1147,76 @@ <xml-property name="container" value="flavors" /> </xml-properties> </java-type> + <java-type name="Snapshots"> <xml-properties> <xml-property name="description" value="Collection of openstack snapshots" /> </xml-properties> <xml-root-element name="snapshots" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.openecomp.org.v10.Snapshot" /> - </java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v10.Snapshot" /> + </java-attributes> </java-type> + <java-type name="Snapshot"> <xml-root-element name="snapshot" /> <java-attributes> <xml-element java-attribute="snapshotId" name="snapshot-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Snapshot id, this is the key UUID assoc associated in glance with the snapshots." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="snapshotName" name="snapshot-name" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Snapshot name" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="snapshotArchitecture" name="snapshot-architecture" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Operating system architecture" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="snapshotOsDistro" name="snapshot-os-distro" type="java.lang.String"> <xml-properties> <xml-property name="description" value="The common name of the operating system distribution in lowercase" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="snapshotOsVersion" name="snapshot-os-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="The operating system version as specified by the distributor." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="application" name="application" type="java.lang.String"> <xml-properties> <xml-property name="description" value="The application that the image instantiates." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String"> <xml-properties> <xml-property name="description" value="The vendor of the application." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="The version of the application." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="snapshotSelflink" name="snapshot-selflink" type="java.lang.String"> <xml-properties> <xml-property name="description" value="URL to endpoint where AAI can get more details" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="prevSnapshotId" name="prev-snapshot-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="This field contains the UUID of the previous snapshot (if any)." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Openstack snapshot" /> @@ -1447,51 +1225,48 @@ <xml-property name="indexedProps" value="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id" /> <xml-property name="dependentOn" value="cloud-region" /> <xml-property name="container" value="snapshots" /> - </xml-properties> + </xml-properties> </java-type> + <java-type name="GroupAssignments"> <xml-properties> <xml-property name="description" value="Collection of openstack group assignments" /> </xml-properties> <xml-root-element name="group-assignments" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.openecomp.org.v10.GroupAssignment" /> + <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v10.GroupAssignment" /> </java-attributes> </java-type> + <java-type name="GroupAssignment"> <xml-root-element name="group-assignment" /> <java-attributes> <xml-element java-attribute="groupId" name="group-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Group id, expected to be unique across cloud-region." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="groupType" name="group-type" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Group type - the type of group this instance refers to" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="groupName" name="group-name" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Group name - name assigned to the group" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="groupDescription" name="group-description" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Group description - description of the group" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)." /> @@ -1500,81 +1275,73 @@ <xml-property name="dependentOn" value="cloud-region" /> <xml-property name="container" value="group-assignments" /> </xml-properties> - </java-type> + </java-type> + <java-type name="Images"> <xml-properties> <xml-property name="description" value="Collectio of Openstack images." /> </xml-properties> <xml-root-element name="images" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.openecomp.org.v10.Image" /> + <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v10.Image" /> </java-attributes> </java-type> + <java-type name="Image"> <xml-root-element name="image" /> <java-attributes> <xml-element java-attribute="imageId" name="image-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Image id, expected to be unique across cloud region" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="imageName" name="image-name" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Image name" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="imageArchitecture" name="image-architecture" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Operating system architecture." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="imageOsDistro" name="image-os-distro" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="The common name of the operating system distribution in lowercase" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="imageOsVersion" name="image-os-version" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="The operating system version as specified by the distributor." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="application" name="application" type="java.lang.String"> <xml-properties> <xml-property name="description" value="The application that the image instantiates." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String"> <xml-properties> <xml-property name="description" value="The vendor of the application." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="The version of the application." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="imageSelflink" name="image-selflink" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="URL to endpoint where AAI can get more details" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> - <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v10.Metadata" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> + <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v10.Metadata" /> </java-attributes> <xml-properties> <xml-property name="description" value="Openstack image." /> @@ -1584,32 +1351,25 @@ <xml-property name="container" value="images" /> </xml-properties> </java-type> + <java-type name="Metadata"> <xml-properties> <xml-property name="description" value="Collection of metadatum (key/value pairs)" /> </xml-properties> <xml-root-element name="metadata" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.openecomp.org.v10.Metadatum" /> + <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v10.Metadatum" /> </java-attributes> </java-type> + <java-type name="Metadatum"> <xml-root-element name="metadatum" /> <java-attributes> - <xml-element java-attribute="metaname" name="metaname" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="metaval" name="metaval" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> + <xml-element java-attribute="metaname" name="metaname" required="true" type="java.lang.String" xml-key="true" /> + <xml-element java-attribute="metaval" name="metaval" required="true" type="java.lang.String" /> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> </java-attributes> @@ -1620,37 +1380,36 @@ <xml-property name="container" value="metadata" /> </xml-properties> </java-type> + <java-type name="DvsSwitches"> <xml-properties> <xml-property name="description" value="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs." /> </xml-properties> <xml-root-element name="dvs-switches" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.openecomp.org.v10.DvsSwitch" /> + <xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v10.DvsSwitch" /> </java-attributes> </java-type> + <java-type name="DvsSwitch"> <xml-root-element name="dvs-switch" /> <java-attributes> <xml-element java-attribute="switchName" name="switch-name" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="DVS switch name" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vcenterUrl" name="vcenter-url" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="URL used to reach the vcenter" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="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. " /> @@ -1659,37 +1418,36 @@ <xml-property name="container" value="dvs-switches" /> </xml-properties> </java-type> + <java-type name="NetworkProfiles"> <xml-properties> <xml-property name="description" value="Collection of network profiles" /> </xml-properties> <xml-root-element name="network-profiles" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.openecomp.org.v10.NetworkProfile" /> + <xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v10.NetworkProfile" /> </java-attributes> </java-type> + <java-type name="NetworkProfile"> <xml-root-element name="network-profile" /> <java-attributes> <xml-element java-attribute="nmProfileName" name="nm-profile-name" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique name of network profile." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="communityString" name="community-string" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Encrypted SNMP community string" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Network profile populated by SDN-GP for SNMP" /> @@ -1698,271 +1456,152 @@ <xml-property name="namespace" value="cloud-infrastructure" /> </xml-properties> </java-type> + <java-type name="Pservers"> <xml-properties> <xml-property name="description" value="Collection of compute hosts." /> </xml-properties> <xml-root-element name="pservers" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.openecomp.org.v10.Pserver" /> + <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v10.Pserver" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> </xml-properties> </java-type> + <java-type name="Pserver"> <xml-root-element name="pserver" /> <java-attributes> <xml-element java-attribute="hostname" name="hostname" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Value from executing hostname on the compute node." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ptniiEquipName" name="ptnii-equip-name" type="java.lang.String"> <xml-properties> <xml-property name="description" value="PTNII name" /> - <xml-property name="sourceOfTruthType" value="IDF" /> </xml-properties> </xml-element> <xml-element java-attribute="numberOfCpus" name="number-of-cpus" type="java.lang.Integer"> <xml-properties> <xml-property name="description" value="Number of cpus" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="diskInGigabytes" name="disk-in-gigabytes" type="java.lang.Integer"> <xml-properties> <xml-property name="description" value="Disk size, in GBs" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ramInMegabytes" name="ram-in-megabytes" type="java.lang.Integer"> <xml-properties> <xml-property name="description" value="RAM size, in MBs" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Equipment type. Source of truth should define valid values." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Equipment vendor. Source of truth should define valid values." /> - <xml-property name="sourceOfTruthType" value="IDF" /> </xml-properties> </xml-element> <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Equipment model. Source of truth should define valid values." /> - <xml-property name="sourceOfTruthType" value="IDF" /> </xml-properties> </xml-element> <xml-element java-attribute="fqdn" name="fqdn" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Fully-qualified domain name" /> - <xml-property name="sourceOfTruthType" value="IDF" /> </xml-properties> </xml-element> <xml-element java-attribute="pserverSelflink" name="pserver-selflink" type="java.lang.String"> <xml-properties> <xml-property name="description" value="URL to endpoint where AAI can get more details" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used to configure device, also used for troubleshooting and is IP used for traps generated by device." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Serial number, may be queried" /> - <xml-property name="sourceOfTruthType" value="IDF" /> </xml-properties> </xml-element> <xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String"> <xml-properties> <xml-property name="description" value="IPV4 Loopback 0 address" /> - <xml-property name="sourceOfTruthType" value="IDF" /> </xml-properties> </xml-element> <xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String"> <xml-properties> <xml-property name="description" value="IPV6 Loopback 0 address" /> - <xml-property name="sourceOfTruthType" value="IDF" /> </xml-properties> </xml-element> <xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String"> <xml-properties> <xml-property name="description" value="IPV4 AIM address" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String"> <xml-properties> <xml-property name="description" value="IPV6 AIM address" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String"> <xml-properties> <xml-property name="description" value="IPV6 OAM address" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="CANOPI's inventory status. Only set with values exactly as defined by CANOPI." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="pserverId" name="pserver-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="ID of Pserver" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="internetTopology" name="internet-topology" type="java.lang.String"> <xml-properties> <xml-property name="description" value="internet topology of Pserver" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean"> <xml-properties> - <xml-property name="defaultValue" value="false" /> + <xml-property name="defaultValue" value="false"/> <xml-property name="description" value="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." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="pserverName2" name="pserver-name2" type="java.lang.String"> <xml-properties> <xml-property name="description" value="alternative pserver name" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="purpose" name="purpose" type="java.lang.String"> <xml-properties> <xml-property name="description" value="purpose of pserver" /> - <xml-property name="sourceOfTruthType" value="IDF" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipaddressV4Loopback10" name="ipaddress-v4-loopback-10" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="IPV4 Loopback 10 address" /> - <xml-property name="sourceOfTruthType" value="IDF" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipaddressV6Loopback10" name="ipaddress-v6-loopback-10" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="IPV6 Loopback 10 address" /> - <xml-property name="sourceOfTruthType" value="IDF" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipaddressV4Loopback300" name="ipaddress-v4-loopback-300" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="IPV4 Loopback 300 address" /> - <xml-property name="sourceOfTruthType" value="IDF" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipaddressV6Loopback300" name="ipaddress-v6-loopback-300" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="IPV6 Loopback 300 address" /> - <xml-property name="sourceOfTruthType" value="IDF" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="createdDate" name="created-date" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Date the PServer was created (In SOT)" /> - <xml-property name="sourceOfTruthType" value="IDF" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="lastUpdatedDate" name="last-updated-date" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Date the PServer was last updated (in SOT)" /> - <xml-property name="sourceOfTruthType" value="IDF" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="lastUpdatedBy" name="last-updated-by" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="User that last updated the PServer (in SOT)" /> - <xml-property name="sourceOfTruthType" value="IDF" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="functionName" name="function-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Function name" /> - <xml-property name="sourceOfTruthType" value="IDF" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="rackName" name="rack-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The name of the rack containing the Pserver" /> - <xml-property name="sourceOfTruthType" value="IDF" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="assetTag" name="asset-tag" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The PServer asset number" /> - <xml-property name="sourceOfTruthType" value="IDF" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="deploymentPhase" name="deployment-phase" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Deployment phase" /> - <xml-property name="sourceOfTruthType" value="IDF" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="locationName" name="location-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of the PServer Location" /> - <xml-property name="sourceOfTruthType" value="IDF" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="locationId" name="location-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Id of the PServer Location" /> - <xml-property name="sourceOfTruthType" value="IDF" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="equipmentClli" name="equipment-clli" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The CLLI code for the PServer" /> - <xml-property name="sourceOfTruthType" value="IDF" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="zoneTopologyId" name="zone-topology-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Zone topology Id" /> - <xml-property name="sourceOfTruthType" value="IDF" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="zoneId" name="zone-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Zone Id" /> - <xml-property name="sourceOfTruthType" value="IDF" /> </xml-properties> </xml-element> <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> - <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v10.PInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v10.LagInterfaces" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> + <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v10.PInterfaces" /> + <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v10.LagInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver." /> @@ -1973,81 +1612,73 @@ <xml-property name="namespace" value="cloud-infrastructure" /> </xml-properties> </java-type> + <java-type name="PInterfaces"> <xml-properties> <xml-property name="description" value="Collection of physical interfaces." /> </xml-properties> <xml-root-element name="p-interfaces" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.openecomp.org.v10.PInterface" /> + <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v10.PInterface" /> </java-attributes> </java-type> + <java-type name="PInterface"> <xml-root-element name="p-interface" /> <java-attributes> <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Name that identifies the physical interface" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Captures the numeric part of the speed" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Captures the units corresponding to the speed" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="portDescription" name="port-description" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Nature of the services and connectivity on this port." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="equipmentIdentifier" name="equipment-identifier" type="java.lang.String"> <xml-properties> <xml-property name="description" value="CLEI or other specification for p-interface hardware." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Role specification for p-interface hardware." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="interfaceType" name="interface-type" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Indicates the physical properties of the interface." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean"> <xml-properties> - <xml-property name="defaultValue" value="false" /> + <xml-property name="defaultValue" value="false"/> <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.LInterfaces" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="Physical interface (e.g., nic)" /> @@ -2057,75 +1688,68 @@ <xml-property name="container" value="p-interfaces" /> </xml-properties> </java-type> + <java-type name="LagInterfaces"> <xml-properties> <xml-property name="description" value="Collection of link aggregate interfaces." /> </xml-properties> <xml-root-element name="lag-interfaces" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.openecomp.org.v10.LagInterface" /> + <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v10.LagInterface" /> </java-attributes> </java-type> + <java-type name="LagInterface"> <xml-root-element name="lag-interface" /> <java-attributes> <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Name that identifies the link aggregate interface" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="interfaceDescription" name="interface-description" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Human friendly text regarding this interface." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Captures the numeric part of the speed" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Captures the units corresponding to the speed" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="ID of interface" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean"> <xml-properties> - <xml-property name="defaultValue" value="false" /> + <xml-property name="defaultValue" value="false"/> <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.LInterfaces" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="Link aggregate interface" /> @@ -2134,55 +1758,51 @@ <xml-property name="container" value="lag-interfaces" /> </xml-properties> </java-type> + <java-type name="OamNetworks"> <xml-properties> <xml-property name="description" value="Collection of OAM networks, to be deprecated shortly. Do not use for new purposes. " /> </xml-properties> <xml-root-element name="oam-networks" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.openecomp.org.v10.OamNetwork" /> + <xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v10.OamNetwork" /> </java-attributes> </java-type> + <java-type name="OamNetwork"> <xml-root-element name="oam-network" /> <java-attributes> <xml-element java-attribute="networkUuid" name="network-uuid" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="UUID of the network. Unique across a cloud-region" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Name of the network." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long"> <xml-properties> <xml-property name="description" value="cvlan-id" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer"> <xml-properties> <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="OAM network, to be deprecated shortly. Do not use for new purposes. " /> @@ -2192,43 +1812,41 @@ <xml-property name="container" value="oam-networks" /> </xml-properties> </java-type> + <java-type name="AvailabilityZones"> <xml-properties> <xml-property name="description" value="Collection of availability zones" /> </xml-properties> <xml-root-element name="availability-zones" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.openecomp.org.v10.AvailabilityZone" /> + <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v10.AvailabilityZone" /> </java-attributes> </java-type> + <java-type name="AvailabilityZone"> <xml-root-element name="availability-zone" /> <java-attributes> <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Name of the availability zone. Unique across a cloud region" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="hypervisorType" name="hypervisor-type" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Type of hypervisor. Source of truth should define valid values." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String"> <xml-properties> <xml-property name="description" value="State that indicates whether the availability zone should be used, etc. Source of truth should define valid values." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Availability zone, a collection of compute hosts/pservers" /> @@ -2237,37 +1855,36 @@ <xml-property name="container" value="availability-zones" /> </xml-properties> </java-type> + <java-type name="VirtualDataCenters"> <xml-properties> <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" /> </xml-properties> <xml-root-element name="virtual-data-centers" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.openecomp.org.v10.VirtualDataCenter" /> + <xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v10.VirtualDataCenter" /> </java-attributes> </java-type> + <java-type name="VirtualDataCenter"> <xml-root-element name="virtual-data-center" /> <java-attributes> <xml-element java-attribute="vdcId" name="vdc-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique ID of the vdc" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vdcName" name="vdc-name" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Name of the virtual data center" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" /> @@ -2277,38 +1894,84 @@ <xml-property name="namespace" value="cloud-infrastructure" /> </xml-properties> </java-type> + + <java-type name="LicenseManagement"> + <xml-root-element name="license-management" /> + <java-attributes> + <xml-element java-attribute="licenseKeyResources" name="license-key-resources" type="inventory.aai.onap.org.v10.LicenseKeyResources" /> + </java-attributes> + </java-type> + + <java-type name="LicenseKeyResources"> + <xml-root-element name="license-key-resources" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="licenseKeyResource" name="license-key-resource" type="inventory.aai.onap.org.v10.LicenseKeyResource" /> + </java-attributes> + </java-type> + + <java-type name="LicenseKeyResource"> + <xml-root-element name="license-key-resource" /> + <java-attributes> + <xml-element java-attribute="attUuid" name="att-uuid" required="true" type="java.lang.String" xml-key="true" /> + <xml-element java-attribute="assignmentType" name="assignment-type" type="java.lang.String" /> + <xml-element java-attribute="assignmentStatus" name="assignment-status" type="java.lang.String" /> + <xml-element java-attribute="assignmentGroupUuid" name="assignment-group-uuid" required="true" type="java.lang.String" /> + <xml-element java-attribute="assignmentDate" name="assignment-date" type="java.lang.String" /> + <xml-element java-attribute="name" name="name" type="java.lang.String" /> + <xml-element java-attribute="modelUuid" name="model-uuid" type="java.lang.String" /> + <xml-element java-attribute="modelVersion" name="model-version" type="java.lang.String" /> + <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String" /> + <xml-element java-attribute="licenseKeyFileUrl" name="license-key-file-url" type="java.lang.String" /> + <xml-element container-type="java.util.ArrayList" java-attribute="supplierReleaseList" name="supplier-release-list" type="java.lang.String" /> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="OBSOLETE OBJECT: do not use" /> + <xml-property name="nameProps" value="name" /> + <xml-property name="indexedProps" value="assignment-group-uuid,att-uuid,name" /> + <xml-property name="uniqueProps" value="att-uuid" /> + <xml-property name="container" value="license-key-resources" /> + <xml-property name="namespace" value="license-management" /> + </xml-properties> + </java-type> + <java-type name="Business"> <xml-properties> <xml-property name="description" value="Namespace for business related constructs" /> </xml-properties> <xml-root-element name="business" /> <java-attributes> - <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.openecomp.org.v10.Connectors" /> - <xml-element java-attribute="customers" name="customers" type="inventory.aai.openecomp.org.v10.Customers" /> + <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v10.Connectors" /> + <xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v10.Customers" /> </java-attributes> </java-type> + <java-type name="Connectors"> <xml-properties> <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" /> </xml-properties> <xml-root-element name="connectors" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.openecomp.org.v10.Connector" /> + <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v10.Connector" /> </java-attributes> </java-type> + <java-type name="Connector"> <xml-root-element name="connector" /> <java-attributes> <xml-element java-attribute="resourceInstanceId" name="resource-instance-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique id of resource instance." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String"> @@ -2316,7 +1979,6 @@ <xml-property name="description" value="the ASDC model id for this resource or service model." /> <xml-property name="visibility" value="deployment" /> <xml-property name="dbAlias" value="model-invariant-id-local" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String"> @@ -2324,7 +1986,6 @@ <xml-property name="description" value="the ASDC model version for this resource or service model." /> <xml-property name="visibility" value="deployment" /> <xml-property name="dbAlias" value="model-version-id-local" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String"> @@ -2332,23 +1993,20 @@ <xml-property name="description" value="the ASDC model version for this resource or service model." /> <xml-property name="visibility" value="internal" /> <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&AI widget." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> - <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v10.Metadata" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> + <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v10.Metadata" /> </java-attributes> <xml-properties> <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" /> @@ -2357,48 +2015,46 @@ <xml-property name="namespace" value="business" /> </xml-properties> </java-type> + <java-type name="Customers"> <xml-properties> <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information." /> </xml-properties> <xml-root-element name="customers" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.openecomp.org.v10.Customer" /> + <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v10.Customer" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> </xml-properties> </java-type> + <java-type name="Customer"> <xml-root-element name="customer" /> <java-attributes> <xml-element java-attribute="globalCustomerId" name="global-customer-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Global customer id used across ECOMP to uniquely identify customer." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="subscriberName" name="subscriber-name" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Subscriber name, an alternate way to retrieve a customer." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="subscriberType" name="subscriber-type" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Subscriber type, a way to provide VID with only the INFRA customers." /> <xml-property name="defaultValue" value="CUST" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.openecomp.org.v10.ServiceSubscriptions" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v10.ServiceSubscriptions" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="customer identifiers to provide linkage back to BSS information." /> @@ -2410,38 +2066,38 @@ <xml-property name="namespace" value="business" /> </xml-properties> </java-type> + <java-type name="ServiceSubscriptions"> <xml-properties> <xml-property name="description" value="Collection of objects that group service instances." /> </xml-properties> <xml-root-element name="service-subscriptions" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.openecomp.org.v10.ServiceSubscription" /> + <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v10.ServiceSubscription" /> </java-attributes> </java-type> + <java-type name="ServiceSubscription"> <xml-root-element name="service-subscription" /> <java-attributes> <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Value defined by orchestration to identify this service across ECOMP." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="tempUbSubAccountId" name="temp-ub-sub-account-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="This property will be deleted from A&AI in the near future. Only stop gap solution." /> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> + <xml-properties> + <xml-property name="description" value="This property will be deleted from A&AI in the near future. Only stop gap solution." /> + </xml-properties> + </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.openecomp.org.v10.ServiceInstances" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v10.ServiceInstances"> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Object that group service instances." /> @@ -2451,28 +2107,28 @@ <xml-property name="crossEntityReference" value="service-instance,service-type" /> </xml-properties> </java-type> + <java-type name="ServiceInstances"> <xml-properties> <xml-property name="description" value="Collection of service instances" /> </xml-properties> <xml-root-element name="service-instances" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.openecomp.org.v10.ServiceInstance" /> + <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v10.ServiceInstance" /> </java-attributes> </java-type> + <java-type name="ServiceInstance"> <xml-root-element name="service-instance" /> <java-attributes> <xml-element java-attribute="serviceInstanceId" name="service-instance-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Uniquely identifies this instance of a service" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="serviceInstanceName" name="service-instance-name" type="java.lang.String"> <xml-properties> <xml-property name="description" value="This field will store a name assigned to the service-instance." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String"> @@ -2480,7 +2136,6 @@ <xml-property name="description" value="the ASDC model id for this resource or service model." /> <xml-property name="visibility" value="deployment" /> <xml-property name="dbAlias" value="model-invariant-id-local" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String"> @@ -2488,7 +2143,6 @@ <xml-property name="description" value="the ASDC model version for this resource or service model." /> <xml-property name="visibility" value="deployment" /> <xml-property name="dbAlias" value="model-version-id-local" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String"> @@ -2496,90 +2150,76 @@ <xml-property name="description" value="the ASDC model version for this resource or service model." /> <xml-property name="visibility" value="internal" /> <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&AI widget." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="bandwidthTotal" name="bandwidth-total" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Indicates the total bandwidth to be used for this service." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String"> <xml-properties> <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String"> <xml-properties> <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String"> <xml-properties> <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String"> <xml-properties> <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vhnPortalUrl" name="vhn-portal-url" type="java.lang.String"> <xml-properties> <xml-property name="description" value="URL customers will use to access the vHN Portal." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Operational status of the service-instance." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="serviceInstanceLocationId" name="service-instance-location-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="An identifier that customers assign to the location where this service is being used." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Path to the controller object." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Orchestration status of this service." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> - <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v10.Metadata" /> - <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.openecomp.org.v10.AllottedResources" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> + <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v10.Metadata" /> + <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v10.AllottedResources" /> </java-attributes> <xml-properties> <xml-property name="description" value="Instance of a service" /> @@ -2591,120 +2231,114 @@ <xml-property name="container" value="service-instances" /> </xml-properties> </java-type> + <java-type name="ServiceDesignAndCreation"> <xml-properties> <xml-property name="description" value="Namespace for objects managed by ASDC" /> </xml-properties> <xml-root-element name="service-design-and-creation" /> <java-attributes> - <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.openecomp.org.v10.VnfImages" /> - <xml-element java-attribute="services" name="services" type="inventory.aai.openecomp.org.v10.Services" /> - <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.openecomp.org.v10.ServiceCapabilities" /> - <xml-element java-attribute="models" name="models" type="inventory.aai.openecomp.org.v10.Models" /> - <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.openecomp.org.v10.NamedQueries" /> + <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v10.VnfImages" /> + <xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v10.Services" /> + <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v10.ServiceCapabilities" /> + <xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v10.Models" /> + <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v10.NamedQueries" /> </java-attributes> </java-type> + <java-type name="VnfImages"> <xml-properties> <xml-property name="description" value="Collection of image objects that pertain to a VNF that doesn't have associated vservers. This is a kludge." /> </xml-properties> <xml-root-element name="vnf-images" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.openecomp.org.v10.VnfImage" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v10.VnfImage" /> </java-attributes> </java-type> + <java-type name="VnfImage"> <xml-root-element name="vnf-image" /> <java-attributes> - <xml-element java-attribute="vnfImageUuid" name="vnf-image-uuid" required="true" type="java.lang.String" xml-key="true"> + <xml-element java-attribute="attUuid" name="att-uuid" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique ID of this asset" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="application" name="application" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="The application that the image instantiates." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="applicationVendor" name="application-vendor" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="The vendor of the application." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="The version of the application." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"> <xml-properties> <xml-property name="description" value="URL to endpoint where AAI can get more details" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers. This is a kludge." /> - <xml-property name="indexedProps" value="application,vnf-image-uuid,application-vendor,application-version" /> - <xml-property name="uniqueProps" value="vnf-image-uuid" /> + <xml-property name="indexedProps" value="application,att-uuid,application-vendor,application-version" /> + <xml-property name="uniqueProps" value="att-uuid" /> <xml-property name="container" value="vnf-images" /> <xml-property name="namespace" value="service-design-and-creation" /> </xml-properties> </java-type> + <java-type name="Services"> <xml-properties> <xml-property name="description" value="Collection of service model definitions. Likely to be deprecated in favor of models from ASDC." /> </xml-properties> <xml-root-element name="services" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.openecomp.org.v10.Service" /> + <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v10.Service" /> </java-attributes> </java-type> + <java-type name="Service"> <xml-root-element name="service" /> <java-attributes> <xml-element java-attribute="serviceId" name="service-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="serviceDescription" name="service-description" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Description of the service" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="serviceSelflink" name="service-selflink" type="java.lang.String"> <xml-properties> <xml-property name="description" value="URL to endpoint where AAI can get more details" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="serviceVersion" name="service-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="service version" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Stand-in for service model definitions. Likely to be deprecated in favor of models from ASDC. Does not strictly map to ASDC services." /> @@ -2713,37 +2347,36 @@ <xml-property name="namespace" value="service-design-and-creation" /> </xml-properties> </java-type> + <java-type name="ServiceCapabilities"> <xml-properties> <xml-property name="description" value="Collection of service capabilities." /> </xml-properties> <xml-root-element name="service-capabilities" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.openecomp.org.v10.ServiceCapability" /> + <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v10.ServiceCapability" /> </java-attributes> </java-type> + <java-type name="ServiceCapability"> <xml-root-element name="service-capability" /> <java-attributes> <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource. This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Early definition of server/resource pairings, likely to be replaced by models. No new use should be made of this." /> @@ -2752,84 +2385,82 @@ <xml-property name="namespace" value="service-design-and-creation" /> </xml-properties> </java-type> + <java-type name="Network"> <xml-properties> <xml-property name="description" value="Namespace for network inventory resources." /> </xml-properties> <xml-root-element name="network" /> <java-attributes> - <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.openecomp.org.v10.LogicalLinks" /> - <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.openecomp.org.v10.SitePairSets" /> - <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.openecomp.org.v10.VpnBindings" /> - <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.openecomp.org.v10.VplsPes" /> - <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.openecomp.org.v10.MulticastConfigurations" /> - <xml-element java-attribute="vces" name="vces" type="inventory.aai.openecomp.org.v10.Vces" /> - <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.openecomp.org.v10.Vnfcs" /> - <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.openecomp.org.v10.L3Networks" /> - <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.openecomp.org.v10.NetworkPolicies" /> - <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.openecomp.org.v10.GenericVnfs" /> - <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.openecomp.org.v10.LagLinks" /> - <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.openecomp.org.v10.Newvces" /> - <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.openecomp.org.v10.Pnfs" /> - <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.openecomp.org.v10.PhysicalLinks" /> - <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.openecomp.org.v10.IpsecConfigurations" /> - <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.openecomp.org.v10.RouteTableReferences" /> - <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.openecomp.org.v10.InstanceGroups" /> - <xml-element java-attribute="zones" name="zones" type="inventory.aai.openecomp.org.v10.Zones" /> + <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v10.LogicalLinks" /> + <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v10.SitePairSets" /> + <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v10.VpnBindings" /> + <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v10.VplsPes" /> + <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v10.MulticastConfigurations" /> + <xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v10.Vces" /> + <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v10.Vnfcs" /> + <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v10.L3Networks" /> + <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v10.NetworkPolicies" /> + <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v10.GenericVnfs" /> + <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v10.LagLinks" /> + <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v10.Newvces" /> + <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v10.Pnfs" /> + <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v10.PhysicalLinks" /> + <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v10.IpsecConfigurations" /> + <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v10.RouteTableReferences" /> + <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v10.InstanceGroups" /> + <xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v10.Zones" /> + <xml-element java-attribute="testObjects" name="test-objects" + type="inventory.aai.onap.org.v10.TestObjects" /> </java-attributes> </java-type> + <java-type name="LogicalLinks"> <xml-properties> <xml-property name="description" value="Collection of logical connections" /> </xml-properties> <xml-root-element name="logical-links" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.openecomp.org.v10.LogicalLink" /> + <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v10.LogicalLink" /> </java-attributes> </java-type> + <java-type name="LogicalLink"> <xml-root-element name="logical-link" /> <java-attributes> <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="linkType" name="link-type" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Type of logical link, e.g., evc" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Captures the numeric part of the speed" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Captures the units corresponding to the speed" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="v4, v6, or ds for dual stack" /> - <xml-property name="sourceOfTruthType" value="aai" /> + <xml-property name="description" value="v4, v6, or ds for dual stack (should be att-ip-version)" /> </xml-properties> </xml-element> <xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String"> <xml-properties> <xml-property name="description" value="For example, static or BGP" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String"> @@ -2837,7 +2468,6 @@ <xml-property name="description" value="the ASDC model id for this resource or service model." /> <xml-property name="visibility" value="deployment" /> <xml-property name="dbAlias" value="model-invariant-id-local" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String"> @@ -2845,7 +2475,6 @@ <xml-property name="description" value="the ASDC model version for this resource or service model." /> <xml-property name="visibility" value="deployment" /> <xml-property name="dbAlias" value="model-version-id-local" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String"> @@ -2853,64 +2482,54 @@ <xml-property name="description" value="the ASDC model version for this resource or service model." /> <xml-property name="visibility" value="internal" /> <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&AI widget." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Indication of operational status of the logical link." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="linkRole" name="link-role" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Indication of the network use of the logical link." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="linkName2" name="link-name2" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Alias or alternate name (CLCI or D1 name)." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="linkId" name="link-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="UUID of the logical-link, SDNC generates this." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String"> + <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Circuit id" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="purpose" name="purpose" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Reason for this entity, role it is playing" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points" /> @@ -2921,32 +2540,32 @@ <xml-property name="searchable" value="link-name" /> </xml-properties> </java-type> + <java-type name="SitePairSets"> <xml-properties> <xml-property name="description" value="Collection of sets of instances for probes related to generic-vnf" /> </xml-properties> <xml-root-element name="site-pair-sets" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.openecomp.org.v10.SitePairSet" /> + <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v10.SitePairSet" /> </java-attributes> </java-type> + <java-type name="SitePairSet"> <xml-root-element name="site-pair-set" /> <java-attributes> <xml-element java-attribute="sitePairSetId" name="site-pair-set-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique id of site pair set." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.openecomp.org.v10.RoutingInstances" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v10.RoutingInstances" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Set of instances for probes used to measure service level agreements" /> @@ -2956,38 +2575,37 @@ <xml-property name="namespace" value="network" /> </xml-properties> </java-type> + <java-type name="RoutingInstances"> <xml-properties> <xml-property name="description" value="set of probes related to generic-vnf routing instance" /> </xml-properties> <xml-root-element name="routing-instances" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.openecomp.org.v10.RoutingInstance" /> + <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v10.RoutingInstance" /> </java-attributes> </java-type> + <java-type name="RoutingInstance"> <xml-root-element name="routing-instance" /> <java-attributes> <xml-element java-attribute="routingInstanceId" name="routing-instance-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique id of routing instance" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="rpmOwner" name="rpm-owner" type="java.lang.String"> <xml-properties> <xml-property name="description" value="rpm owner" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.openecomp.org.v10.SitePairs" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v10.SitePairs" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="routing-instance-id" /> @@ -2996,62 +2614,57 @@ <xml-property name="container" value="routing-instances" /> </xml-properties> </java-type> + <java-type name="SitePairs"> <xml-properties> <xml-property name="description" value="probe within a set" /> </xml-properties> <xml-root-element name="site-pairs" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.openecomp.org.v10.SitePair" /> + <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v10.SitePair" /> </java-attributes> </java-type> + <java-type name="SitePair"> <xml-root-element name="site-pair" /> <java-attributes> <xml-element java-attribute="sitePairId" name="site-pair-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="unique identifier of probe" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="sourceIp" name="source-ip" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Prefix address" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="destinationIp" name="destination-ip" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Prefix address" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="ip version, v4, v6" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="destinationHostname" name="destination-hostname" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Hostname of the destination equipment to which SLAs are measured against." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="destinationEquipType" name="destination-equip-type" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="The type of destinatination equipment. Could be Router, etc." /> - <xml-property name="sourceOfTruthType" value="aai" /> + <xml-property name="description" value="The type of destinatination equipment. Could be Router, UCPE, etc." /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.openecomp.org.v10.ClassesOfService" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v10.ClassesOfService" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="site-pair-id" /> @@ -3060,43 +2673,41 @@ <xml-property name="container" value="site-pairs" /> </xml-properties> </java-type> + <java-type name="ClassesOfService"> <xml-properties> <xml-property name="description" value="class-of-service of probe" /> </xml-properties> <xml-root-element name="classes-of-service" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.openecomp.org.v10.ClassOfService" /> + <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v10.ClassOfService" /> </java-attributes> </java-type> + <java-type name="ClassOfService"> <xml-root-element name="class-of-service" /> <java-attributes> <xml-element java-attribute="cos" name="cos" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="unique identifier of probe" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="probeId" name="probe-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="identifier of probe" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="probeType" name="probe-type" type="java.lang.String"> <xml-properties> <xml-property name="description" value="type of probe" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="cos" /> @@ -3104,53 +2715,60 @@ <xml-property name="container" value="classes-of-service" /> </xml-properties> </java-type> + <java-type name="VpnBindings"> <xml-root-element name="vpn-bindings" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.openecomp.org.v10.VpnBinding" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v10.VpnBinding" /> </java-attributes> </java-type> + <java-type name="VpnBinding"> <xml-root-element name="vpn-binding" /> <java-attributes> <xml-element java-attribute="vpnId" name="vpn-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="VPN ID, globally unique within A&AI" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vpnName" name="vpn-name" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="VPN Name" /> - <xml-property name="sourceOfTruthType" value="aai" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="globalRouteTarget" name="global-route-target" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Number used to identify a VPN, globally unique in the network" /> </xml-properties> </xml-element> <xml-element java-attribute="vpnPlatform" name="vpn-platform" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the platform associated with the VPN example AVPN, Mobility" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vpnType" name="vpn-type" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Type of the vpn, should be taken from enumerated/valid values" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="routeDistinguisher" name="route-distinguisher" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network." /> - <xml-property name="sourceOfTruthType" value="aai" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="routeTargetRole" name="route-target-role" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Role assigned to this route target" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="routeTargets" name="route-targets" type="inventory.aai.openecomp.org.v10.RouteTargets" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList"> + <xml-element java-attribute="routeTargets" name="route-targets" type="inventory.aai.onap.org.v10.RouteTargets" /> + + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList"> <xml-properties> <xml-property name="description" value="l3-networks relate to vpn-bindings" /> </xml-properties> @@ -3159,63 +2777,90 @@ <xml-properties> <xml-property name="description" value="VPN binding" /> <xml-property name="nameProps" value="vpn-name,vpn-type" /> - <xml-property name="indexedProps" value="vpn-name,vpn-id,vpn-type" /> + <xml-property name="indexedProps" value="vpn-name,vpn-id,global-route-target,vpn-type" /> <xml-property name="searchable" value="vpn-id,vpn-name" /> <xml-property name="uniqueProps" value="vpn-id" /> <xml-property name="container" value="vpn-bindings" /> <xml-property name="namespace" value="network" /> </xml-properties> </java-type> + <java-type name="RouteTargets"> + <xml-properties> + <xml-property name="description" value="Collection of route target information" /> + </xml-properties> + <xml-root-element name="route-targets" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="routeTarget" name="route-target" type="inventory.aai.onap.org.v10.RouteTarget" /> + </java-attributes> + </java-type> + <java-type name="RouteTarget"> + <xml-root-element name="route-target" /> + <java-attributes> + <xml-element java-attribute="globalRouteTarget" name="global-route-target" required="true" xml-key="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Number used to identify an RT, globally unique in the network" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="routeTargetRole" name="route-target-role" required="true" xml-key="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Role assigned to this route target" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="Route target information" /> + <xml-property name="container" value="route-targets" /> + <xml-property name="canBeLinked" value="true" /> + </xml-properties> + </java-type> <java-type name="VplsPes"> <xml-properties> <xml-property name="description" value="Collection of VPLS Provider Edge routers" /> </xml-properties> <xml-root-element name="vpls-pes" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.openecomp.org.v10.VplsPe" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v10.VplsPe" /> </java-attributes> </java-type> + <java-type name="VplsPe"> <xml-root-element name="vpls-pe" /> <java-attributes> - <xml-element java-attribute="equipmentName" name="equipment-name" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> + <xml-element java-attribute="equipmentName" name="equipment-name" required="true" type="java.lang.String" xml-key="true" /> <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Client should send valid enumerated value, e.g., VPLS-PE." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long"> <xml-properties> <xml-property name="description" value="Temporary location for stag to get to VCE" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> - <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v10.PInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v10.LagInterfaces" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> + <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v10.PInterfaces" /> + <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v10.LagInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="VPLS Provider Edge routers." /> @@ -3224,43 +2869,41 @@ <xml-property name="namespace" value="network" /> </xml-properties> </java-type> + <java-type name="MulticastConfigurations"> <xml-properties> <xml-property name="description" value="multicast configuration of generic-vnf ip-address" /> </xml-properties> <xml-root-element name="multicast-configurations" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.openecomp.org.v10.MulticastConfiguration" /> + <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v10.MulticastConfiguration" /> </java-attributes> </java-type> + <java-type name="MulticastConfiguration"> <xml-root-element name="multicast-configuration" /> <java-attributes> <xml-element java-attribute="multicastConfigurationId" name="multicast-configuration-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique id of multicast configuration." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="multicastProtocol" name="multicast-protocol" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="protocol of multicast configuration" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="rpType" name="rp-type" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="rp type of multicast configuration" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="multicast-configuration-id" /> @@ -3269,136 +2912,119 @@ <xml-property name="namespace" value="network" /> </xml-properties> </java-type> + <java-type name="Vces"> <xml-properties> <xml-property name="description" value="Collection of Virtual Customer Edge Routers, used specifically for Gamma. This object is deprecated." /> </xml-properties> <xml-root-element name="vces" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.openecomp.org.v10.Vce" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v10.Vce" /> </java-attributes> </java-type> + <java-type name="Vce"> <xml-root-element name="vce" /> <java-attributes> <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique id of VNF. This is unique across the graph." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Name of VNF." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Alternate name of VNF." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource. This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Unique identifier of service, does not strictly map to ASDC services, SOON TO BE DEPRECATED." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Indicator for whether the resource is considered operational" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String"> <xml-properties> <xml-property name="description" value="OBSOLETE - do not use" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Network role being played by this VNF" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vpeId" name="vpe-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Unique ID of VPE connected to this VCE." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="v6VceWanAddress" name="v6-vce-wan-address" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Valid v6 IP address for the WAN Link on this router. Implied length of /64." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Loopback0 address" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String"> <xml-properties> <xml-property name="description" value="OBSOLETE - see child relationships" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.openecomp.org.v10.PortGroups" /> - <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.openecomp.org.v10.Licenses" /> - <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.openecomp.org.v10.Entitlements" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v10.PortGroups" /> + <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v10.Licenses" /> + <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v10.Entitlements" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated." /> @@ -3411,83 +3037,74 @@ <xml-property name="extends" value="vnf" /> </xml-properties> </java-type> + <java-type name="PortGroups"> <xml-root-element name="port-groups" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.openecomp.org.v10.PortGroup" /> + <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v10.PortGroup" /> </java-attributes> </java-type> + <java-type name="PortGroup"> <xml-root-element name="port-group" /> <java-attributes> <xml-element java-attribute="interfaceId" name="interface-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique ID of the interface" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Neutron network id of this Interface" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="neutronNetworkName" name="neutron-network-name" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Neutron network name of this Interface" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="portGroupId" name="port-group-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Unique ID for port group in vmware" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="portGroupName" name="port-group-name" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Likely to duplicate value of neutron network name" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="switchName" name="switch-name" type="java.lang.String"> <xml-properties> <xml-property name="description" value="DVS or standard switch name (should be non-null for port groups associated with DVS)" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.openecomp.org.v10.CvlanTags" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v10.CvlanTags" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Used to capture the network interfaces of this VCE" /> @@ -3497,28 +3114,28 @@ <xml-property name="container" value="port-groups" /> </xml-properties> </java-type> + <java-type name="CvlanTags"> <xml-root-element name="cvlan-tags" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.openecomp.org.v10.CvlanTagEntry" /> + <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v10.CvlanTagEntry" /> </java-attributes> </java-type> + <java-type name="CvlanTagEntry"> <xml-root-element name="cvlan-tag-entry" /> <java-attributes> <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long" xml-key="true"> <xml-properties> <xml-property name="description" value="See mis-na-virtualization-platform.yang" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="dependentOn" value="port-group" /> @@ -3526,81 +3143,75 @@ <xml-property name="container" value="cvlan-tags" /> </xml-properties> </java-type> + + + <java-type name="Vnfcs"> <xml-properties> <xml-property name="description" value="virtual network components associated with a vserver from application controller." /> </xml-properties> <xml-root-element name="vnfcs" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.openecomp.org.v10.Vnfc" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v10.Vnfc" /> </java-attributes> </java-type> + <java-type name="Vnfc"> <xml-root-element name="vnfc" /> <java-attributes> <xml-element java-attribute="vnfcName" name="vnfc-name" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique ID of vnfc." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vnfcFunctionCode" name="vnfc-function-code" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="function code" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vnfcType" name="vnfc-type" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="type" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="prov status of this vnfc" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Orchestration status of this VNF, mastered by APP-C" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ipaddressV4OamVip" name="ipaddress-v4-oam-vip" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Oam V4 vip address of this vnfc" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean"> <xml-properties> - <xml-property name="defaultValue" value="false" /> + <xml-property name="defaultValue" value="false"/> <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element default-value="false" required="true" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" type="java.lang.Boolean"> <xml-properties> - <xml-property name="defaultValue" value="false" /> + <xml-property name="defaultValue" value="false"/> <xml-property name="description" value="used to indicate whether closed loop function is enabled on this node" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="groupNotation" name="group-notation" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Group notation of VNFC" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation" /> @@ -3609,98 +3220,86 @@ <xml-property name="namespace" value="network" /> </xml-properties> </java-type> + <java-type name="L3Networks"> <xml-root-element name="l3-networks" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.openecomp.org.v10.L3Network" /> + <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v10.L3Network" /> </java-attributes> </java-type> + <java-type name="L3Network"> <xml-root-element name="l3-network" /> <java-attributes> <xml-element java-attribute="networkId" name="network-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Network ID, should be uuid. Unique across A&AI." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Name of the network, governed by some naming convention.." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="networkType" name="network-type" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Type of the network - who defines these values?" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="networkRole" name="network-role" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Role the network plans - who defines these values?" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="networkTechnology" name="network-technology" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Network technology - who defines these values?" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Neutron network id of this Interface" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element default-value="false" required="true" java-attribute="isBoundToVpn" name="is-bound-to-vpn" type="java.lang.Boolean"> <xml-properties> - <xml-property name="defaultValue" value="false" /> + <xml-property name="defaultValue" value="false"/> <xml-property name="description" value="Set to true if bound to VPN" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Unique identifier of service from ASDC. Does not strictly map to ASDC services. SOON TO BE DEPRECATED" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="networkRoleInstance" name="network-role-instance" type="java.lang.Long"> <xml-properties> <xml-property name="description" value="network role instance" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="contrailNetworkFqdn" name="contrail-network-fqdn" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Contrail FQDN for the network" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String"> @@ -3708,7 +3307,6 @@ <xml-property name="description" value="the ASDC model id for this resource or service model." /> <xml-property name="visibility" value="deployment" /> <xml-property name="dbAlias" value="model-invariant-id-local" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String"> @@ -3716,7 +3314,6 @@ <xml-property name="description" value="the ASDC model version for this resource or service model." /> <xml-property name="visibility" value="deployment" /> <xml-property name="dbAlias" value="model-version-id-local" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String"> @@ -3724,70 +3321,60 @@ <xml-property name="description" value="the ASDC model version for this resource or service model." /> <xml-property name="visibility" value="internal" /> <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&AI widget." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="physicalNetworkName" name="physical-network-name" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Name associated with the physical network." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="isProviderNetwork" name="is-provider-network" required="true" type="java.lang.Boolean"> <xml-properties> - <xml-property name="defaultValue" value="false" /> + <xml-property name="defaultValue" value="false"/> <xml-property name="description" value="boolean indicatating whether or not network is a provider network." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="isSharedNetwork" name="is-shared-network" required="true" type="java.lang.Boolean"> <xml-properties> - <xml-property name="defaultValue" value="false" /> + <xml-property name="defaultValue" value="false"/> <xml-property name="description" value="boolean indicatating whether or not network is a shared network." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="isExternalNetwork" name="is-external-network" required="true" type="java.lang.Boolean"> <xml-properties> - <xml-property name="defaultValue" value="false" /> + <xml-property name="defaultValue" value="false"/> <xml-property name="description" value="boolean indicatating whether or not network is an external network." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Path to the controller object." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Indicator for whether the resource is considered operational." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.openecomp.org.v10.Subnets" /> - <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.openecomp.org.v10.CtagAssignments" /> - <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.openecomp.org.v10.SegmentationAssignments" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList"> + <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v10.Subnets" /> + <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v10.CtagAssignments" /> + <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v10.SegmentationAssignments" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" > <xml-properties> <xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding" /> </xml-properties> @@ -3806,7 +3393,7 @@ <java-type name="NetworkPolicies"> <xml-root-element name="network-policies" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.openecomp.org.v10.NetworkPolicy" /> + <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v10.NetworkPolicy" /> </java-attributes> </java-type> <java-type name="NetworkPolicy"> @@ -3815,28 +3402,24 @@ <xml-element java-attribute="networkPolicyId" name="network-policy-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="UUID representing unique key to this instance" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="networkPolicyFqdn" name="network-policy-fqdn" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Contrail FQDN for the policy" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="ID for the openStack Heat instance" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="nameProps" value="network-policy-fqdn" /> @@ -3850,25 +3433,24 @@ <java-type name="CtagAssignments"> <xml-root-element name="ctag-assignments" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.openecomp.org.v10.CtagAssignment" /> + <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v10.CtagAssignment" /> </java-attributes> </java-type> + <java-type name="CtagAssignment"> <xml-root-element name="ctag-assignment" /> <java-attributes> <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" required="true" type="java.lang.Long" xml-key="true"> <xml-properties> <xml-property name="description" value="id." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="vlan-id-inner" /> @@ -3876,89 +3458,79 @@ <xml-property name="container" value="ctag-assignments" /> </xml-properties> </java-type> + <java-type name="Subnets"> <xml-root-element name="subnets" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.openecomp.org.v10.Subnet" /> + <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v10.Subnet" /> </java-attributes> </java-type> + <java-type name="Subnet"> <xml-root-element name="subnet" /> <java-attributes> <xml-element java-attribute="subnetId" name="subnet-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Subnet ID, should be UUID." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="subnetName" name="subnet-name" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Name associated with the subnet." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Neutron id of this subnet" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="gatewayAddress" name="gateway-address" type="java.lang.String"> <xml-properties> <xml-property name="description" value="gateway ip address" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="networkStartAddress" name="network-start-address" type="java.lang.String"> <xml-properties> <xml-property name="description" value="network start address" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="cidrMask" name="cidr-mask" type="java.lang.String"> <xml-properties> <xml-property name="description" value="cidr mask" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="ip version" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element default-value="false" required="true" java-attribute="dhcpEnabled" name="dhcp-enabled" type="java.lang.Boolean"> <xml-properties> - <xml-property name="defaultValue" value="false" /> + <xml-property name="defaultValue" value="false"/> <xml-property name="description" value="dhcp enabled" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="dhcpStart" name="dhcp-start" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the start address reserved for use by dhcp" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="dhcpEnd" name="dhcp-end" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the last address reserved for use by dhcp" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="subnet-id,subnet-name" /> @@ -3968,221 +3540,188 @@ <xml-property name="container" value="subnets" /> </xml-properties> </java-type> + <java-type name="GenericVnfs"> <xml-properties> <xml-property name="description" value="Collection of VNFs" /> </xml-properties> <xml-root-element name="generic-vnfs" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.openecomp.org.v10.GenericVnf" /> + <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v10.GenericVnf" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> </xml-properties> </java-type> + <java-type name="GenericVnf"> <xml-root-element name="generic-vnf" /> <java-attributes> <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique id of VNF. This is unique across the graph." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Name of VNF." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Alternate name of VNF." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource. This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Unique identifier of service, does not necessarily map to ASDC service models. SOON TO BE DEPRECATED" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." /> - <xml-property name="suggestibleOnSearch" value="true" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Indicator for whether the resource is considered operational. Valid values are in-service-path and out-of-service-path." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String"> <xml-properties> <xml-property name="description" value="OBSOLETE - do not use" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Client should send valid enumerated value" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Orchestration status of this VNF, used by MSO." /> - <xml-property name="suggestibleOnSearch" value="true" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="identifier of managed by company or customer" /> - <xml-property name="sourceOfTruthType" value="aai" /> + <xml-property name="description" value="identifier of managed by ATT or customer" /> </xml-properties> </xml-element> <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by generic-vnf." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String"> <xml-properties> <xml-property name="description" value="v4 Loopback0 address" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="nmLanV6Address" name="nm-lan-v6-address" type="java.lang.String"> <xml-properties> <xml-property name="description" value="v6 Loopback address" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="managementV6Address" name="management-v6-address" type="java.lang.String"> <xml-properties> <xml-property name="description" value="v6 management address" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vcpu" name="vcpu" type="java.lang.Long"> <xml-properties> - <xml-property name="description" value="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only in some usecases" /> - <xml-property name="sourceOfTruthType" value="aai" /> + <xml-property name="description" value="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE" /> </xml-properties> </xml-element> <xml-element java-attribute="vcpuUnits" name="vcpu-units" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="units associated with vcpu, used for VNFs with no vservers/flavors, to be used only in some usecases" /> - <xml-property name="sourceOfTruthType" value="aai" /> + <xml-property name="description" value="units associated with vcpu, used for VNFs with no vservers/flavors, to be used only by uCPE" /> </xml-properties> </xml-element> <xml-element java-attribute="vmemory" name="vmemory" type="java.lang.Long"> <xml-properties> - <xml-property name="description" value="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only in some usecases" /> - <xml-property name="sourceOfTruthType" value="aai" /> + <xml-property name="description" value="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE" /> </xml-properties> </xml-element> <xml-element java-attribute="vmemoryUnits" name="vmemory-units" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="units associated with vmemory, used for VNFs with no vservers/flavors, to be used only in some usecases" /> - <xml-property name="sourceOfTruthType" value="aai" /> + <xml-property name="description" value="units associated with vmemory, used for VNFs with no vservers/flavors, to be used only by uCPE" /> </xml-properties> </xml-element> <xml-element java-attribute="vdisk" name="vdisk" type="java.lang.Long"> <xml-properties> - <xml-property name="description" value="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only in some usecases" /> - <xml-property name="sourceOfTruthType" value="aai" /> + <xml-property name="description" value="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only uCPE" /> </xml-properties> </xml-element> <xml-element java-attribute="vdiskUnits" name="vdisk-units" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only in some usecases" /> - <xml-property name="sourceOfTruthType" value="aai" /> + <xml-property name="description" value="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only by uCPE" /> </xml-properties> </xml-element> <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean"> <xml-properties> - <xml-property name="defaultValue" value="false" /> + <xml-property name="defaultValue" value="false"/> <xml-property name="description" value="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." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element default-value="false" required="true" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" type="java.lang.Boolean"> <xml-properties> - <xml-property name="defaultValue" value="false" /> + <xml-property name="defaultValue" value="false"/> <xml-property name="description" value="used to indicate whether closed loop function is enabled on this node" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="summaryStatus" name="summary-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="details regarding the generic-vnf operation, PLEASE DISCONTINUE USE OF THIS FIELD." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="encryptedAccessFlag" name="encrypted-access-flag" type="java.lang.Boolean"> <xml-properties> <xml-property name="description" value="indicates whether generic-vnf access uses SSH" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="entitlementAssignmentGroupUuid" name="entitlement-assignment-group-uuid" type="java.lang.String"> <xml-properties> <xml-property name="description" value="UUID of the Entitlement group used for licensing VNFs, OBSOLETE - See child relationships." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String"> <xml-properties> <xml-property name="description" value="UUID of the specific entitlement resource. OBSOLETE - See child relationships." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="licenseAssignmentGroupUuid" name="license-assignment-group-uuid" type="java.lang.String"> <xml-properties> <xml-property name="description" value="UUID of the license assignment group. OBSOLETE - See child relationships." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="licenseKeyUuid" name="license-key-uuid" type="java.lang.String"> <xml-properties> <xml-property name="description" value="UUID of the actual license resource. OBSOLETE - See child relationships." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String"> @@ -4190,7 +3729,6 @@ <xml-property name="description" value="the ASDC model id for this resource or service model." /> <xml-property name="visibility" value="deployment" /> <xml-property name="dbAlias" value="model-invariant-id-local" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String"> @@ -4198,7 +3736,6 @@ <xml-property name="description" value="the ASDC model version for this resource or service model." /> <xml-property name="visibility" value="deployment" /> <xml-property name="dbAlias" value="model-version-id-local" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String"> @@ -4206,75 +3743,64 @@ <xml-property name="description" value="the ASDC model version for this resource or service model." /> <xml-property name="visibility" value="internal" /> <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&AI widget." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="asNumber" name="as-number" type="java.lang.String"> <xml-properties> <xml-property name="description" value="as-number of the VNF" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="regionalResourceSubzone" name="regional-resource-subzone" type="java.lang.String"> <xml-properties> <xml-property name="description" value="represents sub zone of the rr plane" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="nfType" name="nf-type" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Generic description of the type of NF" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="nfFunction" name="nf-function" type="java.lang.String"> <xml-properties> <xml-property name="description" value="English description of Network function that the specific VNF deployment is providing" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String"> <xml-properties> <xml-property name="description" value="role in the network that this model will be providing" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="nfNamingCode" name="nf-naming-code" type="java.lang.String"> <xml-properties> <xml-property name="description" value="string assigned to this model used for naming purposes" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Path to the controller object." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.LInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v10.LagInterfaces" /> - <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.openecomp.org.v10.VfModules" /> - <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.openecomp.org.v10.Licenses" /> - <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.openecomp.org.v10.Entitlements" /> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces" /> + <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v10.LagInterfaces" /> + <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v10.VfModules" /> + <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v10.Licenses" /> + <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v10.Entitlements" /> </java-attributes> <xml-properties> <xml-property name="description" value="General purpose VNF" /> @@ -4285,57 +3811,51 @@ <xml-property name="container" value="generic-vnfs" /> <xml-property name="namespace" value="network" /> <xml-property name="extends" value="vnf" /> - <xml-property name="containsSuggestibleProps" value="true" /> - <xml-property name="suggestionAliases" value="VNFs" /> </xml-properties> </java-type> + <java-type name="VfModules"> <xml-properties> <xml-property name="description" value="Collection of vf-modules, a deployment unit of VNFCs" /> </xml-properties> <xml-root-element name="vf-modules" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.openecomp.org.v10.VfModule" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v10.VfModule" /> </java-attributes> </java-type> + <java-type name="VfModule"> <xml-root-element name="vf-module" /> <java-attributes> <xml-element java-attribute="vfModuleId" name="vf-module-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique ID of vf-module." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vfModuleName" name="vf-module-name" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Name of vf-module" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Heat stack id corresponding to this instance." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="orchestration status of this vf-module, mastered by MSO" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element default-value="false" required="true" java-attribute="isBaseVfModule" name="is-base-vf-module" type="java.lang.Boolean"> <xml-properties> - <xml-property name="defaultValue" value="false" /> + <xml-property name="defaultValue" value="false"/> <xml-property name="description" value="used to indicate whether or not this object is base vf module" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String"> @@ -4343,7 +3863,6 @@ <xml-property name="description" value="the ASDC model id for this resource or service model." /> <xml-property name="visibility" value="deployment" /> <xml-property name="dbAlias" value="model-invariant-id-local" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String"> @@ -4351,7 +3870,6 @@ <xml-property name="description" value="the ASDC model version for this resource or service model." /> <xml-property name="visibility" value="deployment" /> <xml-property name="dbAlias" value="model-version-id-local" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String"> @@ -4359,46 +3877,39 @@ <xml-property name="description" value="the ASDC model version for this resource or service model." /> <xml-property name="visibility" value="internal" /> <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&AI widget." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="contrailServiceInstanceFqdn" name="contrail-service-instance-fqdn" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the Contrail unique ID for a service-instance" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="moduleIndex" name="module-index" type="java.lang.Integer"> <xml-properties> <xml-property name="description" value="the index will track the number of modules of a given type that have been deployed in a VNF, starting with 0, and always choosing the lowest available digit" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Path to the controller object." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="a deployment unit of VNFCs" /> @@ -4408,31 +3919,32 @@ <xml-property name="container" value="vf-modules" /> </xml-properties> </java-type> + + <java-type name="LagLinks"> <xml-properties> <xml-property name="description" value="Collection of link aggregation connections" /> </xml-properties> <xml-root-element name="lag-links" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.openecomp.org.v10.LagLink" /> + <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v10.LagLink" /> </java-attributes> </java-type> + <java-type name="LagLink"> <xml-root-element name="lag-link" /> <java-attributes> <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Alphabetical concatenation of lag-interface names" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="LAG links can connect lag-interfaces" /> @@ -4441,104 +3953,92 @@ <xml-property name="namespace" value="network" /> </xml-properties> </java-type> + <java-type name="Newvces"> <xml-properties> <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf. This object will be retired with vce." /> </xml-properties> <xml-root-element name="newvces" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.openecomp.org.v10.Newvce" /> + <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v10.Newvce" /> </java-attributes> </java-type> + <java-type name="Newvce"> <xml-root-element name="newvce" /> <java-attributes> <xml-element java-attribute="vnfId2" name="vnf-id2" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique id of VNF, can't use same attribute name right now until we promote this new object" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Name of VNF." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Alternate name of VNF." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource. This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Indicator for whether the resource is considered operational" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String"> <xml-properties> <xml-property name="description" value="OBSOLETE - do not use" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Client should send valid enumerated value." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String"> <xml-properties> <xml-property name="description" value="v4 Loopback0 address" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.LInterfaces" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf. This object will be retired with vce." /> @@ -4550,160 +4050,140 @@ <xml-property name="namespace" value="network" /> </xml-properties> </java-type> + <java-type name="Pnfs"> <xml-properties> <xml-property name="description" value="Collection of Physical Network Functions." /> </xml-properties> <xml-root-element name="pnfs" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.openecomp.org.v10.Pnf" /> + <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v10.Pnf" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> </xml-properties> </java-type> + <java-type name="Pnf"> <xml-root-element name="pnf" /> <java-attributes> <xml-element java-attribute="pnfName" name="pnf-name" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="unique name of Physical Network Function." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="pnfName2" name="pnf-name2" type="java.lang.String"> <xml-properties> <xml-property name="description" value="name of Physical Network Function." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="pnfName2Source" name="pnf-name2-source" type="java.lang.String"> <xml-properties> <xml-property name="description" value="source of name2" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="pnfId" name="pnf-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="id of pnf" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Equipment type. Source of truth should define valid values." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Equipment vendor. Source of truth should define valid values." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Equipment model. Source of truth should define valid values." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="identifier of managed by company or customer" /> - <xml-property name="sourceOfTruthType" value="aai" /> + <xml-property name="description" value="identifier of managed by ATT or customer" /> </xml-properties> </xml-element> <xml-element java-attribute="ipaddressV4Oam" name="ipaddress-v4-oam" type="java.lang.String"> <xml-properties> <xml-property name="description" value="ipv4-oam-address with new naming convention for IP addresses" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="swVersion" name="sw-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="sw-version is the version of SW for the hosted application on the PNF." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean"> <xml-properties> - <xml-property name="defaultValue" value="false" /> + <xml-property name="defaultValue" value="false"/> <xml-property name="description" value="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." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="frameId" name="frame-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="ID of the physical frame (relay rack) where pnf is installed." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Serial number of the device" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String"> <xml-properties> <xml-property name="description" value="IPV4 Loopback 0 address" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String"> <xml-properties> <xml-property name="description" value="IPV6 Loopback 0 address" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String"> <xml-properties> <xml-property name="description" value="IPV4 AIM address" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String"> <xml-properties> <xml-property name="description" value="IPV6 AIM address" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String"> <xml-properties> <xml-property name="description" value="IPV6 OAM address" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="CANOPI's inventory status. Only set with values exactly as defined by CANOPI." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Nf Role is the role performed by this instance in the network." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> - <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v10.PInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v10.LagInterfaces" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> + <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v10.PInterfaces" /> + <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v10.LagInterfaces" /> </java-attributes> <xml-properties> - <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world." /> + <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE." /> <xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status" /> <xml-property name="searchable" value="pnf-name" /> <xml-property name="uniqueProps" value="pnf-name" /> @@ -4711,70 +4191,64 @@ <xml-property name="namespace" value="network" /> </xml-properties> </java-type> + <java-type name="PhysicalLinks"> <xml-properties> <xml-property name="description" value="Collection of physical connections, typically between p-interfaces" /> </xml-properties> <xml-root-element name="physical-links" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.openecomp.org.v10.PhysicalLink" /> + <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v10.PhysicalLink" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> </xml-properties> </java-type> + <java-type name="PhysicalLink"> <xml-root-element name="physical-link" /> <java-attributes> <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Captures the numeric part of the speed" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Captures the units corresponding to the speed" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Circuit it" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="dualMode" name="dual-mode" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Dual access mode (e.g., primary, secondary" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String"> <xml-properties> <xml-property name="description" value="To provide information on who manages this circuit. A&AI or 3rd party transport provider" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="serviceProviderName" name="service-provider-name" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Name of the service Provider on this link." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Collection of physical connections, typically between p-interfaces" /> @@ -4785,40 +4259,38 @@ <xml-property name="searchable" value="link-name,circuit-id" /> </xml-properties> </java-type> + <java-type name="VigServers"> <xml-root-element name="vig-servers" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.openecomp.org.v10.VigServer" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v10.VigServer" /> </java-attributes> </java-type> + <java-type name="VigServer"> <xml-root-element name="vig-server" /> <java-attributes> <xml-element java-attribute="vigAddressType" name="vig-address-type" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="indicates whether the VIG is for AVPN or INTERNET" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV4Vig" name="ipaddress-v4-vig" type="java.lang.String"> + <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV4Vig" name="ipaddress-v4-vig" type="java.lang.String" > <xml-properties> <xml-property name="description" value="v4 IP of the vig server" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV6Vig" name="ipaddress-v6-vig" type="java.lang.String"> + <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV6Vig" name="ipaddress-v6-vig" type="java.lang.String" > <xml-properties> <xml-property name="description" value="v6 IP of the vig server" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607" /> @@ -4827,149 +4299,129 @@ <xml-property name="container" value="vig-servers" /> </xml-properties> </java-type> + <java-type name="IpsecConfigurations"> <xml-root-element name="ipsec-configurations" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.openecomp.org.v10.IpsecConfiguration" /> + <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v10.IpsecConfiguration" /> </java-attributes> </java-type> + <java-type name="IpsecConfiguration"> <xml-root-element name="ipsec-configuration" /> <java-attributes> <xml-element java-attribute="ipsecConfigurationId" name="ipsec-configuration-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="UUID of this configuration" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="requestedVigAddressType" name="requested-vig-address-type" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Indicate the type of VIG server like AVPN, INTERNET, BOTH" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="requestedEncryptionStrength" name="requested-encryption-strength" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="requestedDmzType" name="requested-dmz-type" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="can offer a shared DMZ or a DMZ specific to a customer" /> - <xml-property name="sourceOfTruthType" value="aai" /> + <xml-property name="description" value="ATT can offer a shared DMZ or a DMZ specific to a customer" /> </xml-properties> </xml-element> <xml-element java-attribute="sharedDmzNetworkAddress" name="shared-dmz-network-address" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Network address of shared DMZ" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="requestedCustomerName" name="requested-customer-name" type="java.lang.String"> <xml-properties> <xml-property name="description" value="If the DMZ is a custom DMZ, this field will indicate the customer information" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ikeVersion" name="ike-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="can be 1 or 2" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ikev1Authentication" name="ikev1-authentication" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Contains values like md5, sha1, sha256, sha384" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,? aes-192-cbc, aes-265-cbc" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ikev1AmGroupId" name="ikev1-am-group-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Group name defined in VIG for clients using aggressive mode" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ikev1AmPassword" name="ikev1-am-password" type="java.lang.String"> <xml-properties> <xml-property name="description" value="pre-shared key for the above group name " /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ikev1SaLifetime" name="ikev1-sa-lifetime" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Lifetime for IKEv1 SA" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ipsecAuthentication" name="ipsec-authentication" type="java.lang.String"> <xml-properties> <xml-property name="description" value="md5, sha1, sha256, sha384" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String"> <xml-properties> <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc,? aes-192-cbc, aes-265-cbc" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Life time for IPSec SA" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="ipsecPfs" name="ipsec-pfs" type="java.lang.String"> <xml-properties> <xml-property name="description" value="enable PFS or not" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="xauthUserId" name="xauth-userid" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="user ID for xAuth, sm-user, nmteHostName" /> - <xml-property name="sourceOfTruthType" value="aai" /> + <xml-property name="description" value="user ID for xAuth, sm-user,ucpeHostName,nmteHostName" /> </xml-properties> </xml-element> <xml-element java-attribute="xauthUserPassword" name="xauth-user-password" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Encrypted using the Juniper $9$ algorithm" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="dpdInterval" name="dpd-interval" type="java.lang.String"> <xml-properties> <xml-property name="description" value="The time between DPD probe" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="dpdFrequency" name="dpd-frequency" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Maximum number of DPD before claiming the tunnel is down" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> - <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.openecomp.org.v10.VigServers" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> + <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v10.VigServers" /> </java-attributes> <xml-properties> <xml-property name="description" value="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" /> @@ -4979,93 +4431,39 @@ <xml-property name="namespace" value="network" /> </xml-properties> </java-type> + + <java-type name="NotificationEvent"> <xml-root-element name="notification-event" /> <java-attributes> - <xml-element java-attribute="cambriaPartition" name="cambria.partition" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.openecomp.org.v10.NotificationEventHeader" /> + <xml-element java-attribute="cambriaPartition" name="cambria.partition" type="java.lang.String" /> + <xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.onap.org.v10.NotificationEventHeader" /> <xml-any-element java-attribute="entity" /> </java-attributes> </java-type> <java-type name="NotificationEventHeader"> <xml-root-element name="notification-event-header" /> <java-attributes> - <xml-element java-attribute="id" name="id" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="timestamp" name="timestamp" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="sourceName" name="source-name" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="domain" name="domain" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="severity" name="severity" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="eventType" name="event-type" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="version" name="version" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="action" name="action" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="entityType" name="entity-type" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="topEntityType" name="top-entity-type" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="entityLink" name="entity-link" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="status" name="status" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> + <xml-element java-attribute="id" name="id" type="java.lang.String" /> + <xml-element java-attribute="timestamp" name="timestamp" type="java.lang.String" /> + <xml-element java-attribute="sourceName" name="source-name" type="java.lang.String" /> + <xml-element java-attribute="domain" name="domain" type="java.lang.String" /> + <xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String" /> + <xml-element java-attribute="severity" name="severity" type="java.lang.String" /> + <xml-element java-attribute="eventType" name="event-type" type="java.lang.String" /> + <xml-element java-attribute="version" name="version" type="java.lang.String" /> + <xml-element java-attribute="action" name="action" type="java.lang.String" /> + <xml-element java-attribute="entityType" name="entity-type" type="java.lang.String" /> + <xml-element java-attribute="topEntityType" name="top-entity-type" type="java.lang.String" /> + <xml-element java-attribute="entityLink" name="entity-link" type="java.lang.String" /> + <xml-element java-attribute="status" name="status" type="java.lang.String" /> </java-attributes> </java-type> <java-type name="AaiInternal"> <xml-root-element name="aai-internal" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.openecomp.org.v10.ReservedPropNames" /> - <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.openecomp.org.v10.EdgePropNames" /> + <xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v10.ReservedPropNames" /> + <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v10.EdgePropNames" /> </java-attributes> </java-type> <java-type name="ReservedPropNames"> @@ -5076,41 +4474,13 @@ </xml-properties> <xml-root-element name="reserved-prop-names" /> <java-attributes> - <xml-element java-attribute="lastModSourceOfTruth" name="last-mod-source-of-truth" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="aaiNodeType" name="aai-node-type" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="aaiCreatedTs" name="aai-created-ts" type="java.lang.Long"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="aaiUniqueKey" name="aai-unique-key" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="aaiLastModTs" name="aai-last-mod-ts" type="java.lang.Long"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="sourceOfTruth" name="source-of-truth" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="aaiUri" name="aai-uri" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> + <xml-element java-attribute="lastModSourceOfTruth" name="last-mod-source-of-truth" type="java.lang.String" /> + <xml-element java-attribute="aaiNodeType" name="aai-node-type" type="java.lang.String" /> + <xml-element java-attribute="aaiCreatedTs" name="aai-created-ts" type="java.lang.Long" /> + <xml-element java-attribute="aaiUniqueKey" name="aai-unique-key" type="java.lang.String" /> + <xml-element java-attribute="aaiLastModTs" name="aai-last-mod-ts" type="java.lang.Long" /> + <xml-element java-attribute="sourceOfTruth" name="source-of-truth" type="java.lang.String" /> + <xml-element java-attribute="aaiUri" name="aai-uri" type="java.lang.String" /> </java-attributes> </java-type> <java-type name="EdgePropNames"> @@ -5121,57 +4491,27 @@ </xml-properties> <xml-root-element name="edge-prop-names" /> <java-attributes> - <xml-element java-attribute="edgeLabel" name="edgeLabel" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="direction" name="direction" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="multiplicityRule" name="multiplicityRule" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="isParent" name="isParent" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="usesResource" name="usesResource" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="hasDelTarget" name="hasDelTarget" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="SVC-INFRA" name="SVC-INFRA" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="SVC-INFRA-REV" name="SVC-INFRA-REV" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> + <xml-element java-attribute="edgeLabel" name="edgeLabel" type="java.lang.String" /> + <xml-element java-attribute="direction" name="direction" type="java.lang.String" /> + <xml-element java-attribute="multiplicityRule" name="multiplicityRule" type="java.lang.String" /> + <xml-element java-attribute="isParent" name="isParent" type="java.lang.Boolean" /> + <xml-element java-attribute="usesResource" name="usesResource" type="java.lang.Boolean" /> + <xml-element java-attribute="hasDelTarget" name="hasDelTarget" type="java.lang.Boolean" /> + <xml-element java-attribute="SVC-INFRA" name="SVC-INFRA" type="java.lang.String" /> + <xml-element java-attribute="SVC-INFRA-REV" name="SVC-INFRA-REV" type="java.lang.String" /> </java-attributes> </java-type> + <java-type name="Models"> <xml-properties> <xml-property name="description" value="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models" /> </xml-properties> <xml-root-element name="models" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.openecomp.org.v10.Model" /> + <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v10.Model" /> </java-attributes> </java-type> + <java-type name="Model"> <xml-root-element name="model" /> <xml-properties> @@ -5186,31 +4526,31 @@ <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.openecomp.org.v10.ModelVers" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v10.ModelVers" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> </java-type> + + <java-type name="ModelVers"> <xml-root-element name="model-vers" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.openecomp.org.v10.ModelVer" /> + <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v10.ModelVer" /> </java-attributes> </java-type> + <java-type name="ModelVer"> <xml-root-element name="model-ver" /> <xml-properties> @@ -5224,44 +4564,41 @@ <xml-element java-attribute="modelVersionId" name="model-version-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Name of the model, which can change from version to version." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Version" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Description" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.openecomp.org.v10.ModelElements" /> - <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v10.Metadata" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v10.ModelElements" /> + <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v10.Metadata" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> </java-type> + <java-type name="ModelElements"> <xml-root-element name="model-elements" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.openecomp.org.v10.ModelElement" /> + <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v10.ModelElement" /> </java-attributes> </java-type> + <java-type name="ModelElement"> <xml-properties> <xml-property name="description" value="Defines how other models combine to make up a higher-level model." /> @@ -5276,51 +4613,46 @@ <xml-element java-attribute="modelElementUuid" name="model-element-uuid" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="autoGenerateUuid" value="true" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="newDataDelFlag" name="new-data-del-flag" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Indicates whether this element was created as part of instantiation from this model" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="cardinality" name="cardinality" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="How many of this type of element are required/allowed" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element container-type="java.util.ArrayList" java-attribute="linkagePoints" name="linkage-points" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> + <xml-element container-type="java.util.ArrayList" java-attribute="linkagePoints" name="linkage-points" type="java.lang.String" > </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.openecomp.org.v10.ModelElements"> + <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v10.ModelElements"> <xml-properties> <xml-property name="description" value="Defines how other models combine to make up a higher-level model" /> </xml-properties> </xml-element> - <xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.openecomp.org.v10.ModelConstraints"> + <xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v10.ModelConstraints"> <xml-properties> <xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> </java-type> + <java-type name="ModelConstraints"> <xml-root-element name="model-constraints" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.openecomp.org.v10.ModelConstraint" /> + <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v10.ModelConstraint" /> </java-attributes> </java-type> + <java-type name="ModelConstraint"> <xml-properties> <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." /> @@ -5335,29 +4667,25 @@ <xml-element java-attribute="modelConstraintUuid" name="model-constraint-uuid" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="autoGenerateUuid" value="true" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.openecomp.org.v10.ConstrainedElementSets" /> + <xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String" /> + <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v10.ConstrainedElementSets" /> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> </java-attributes> </java-type> + <java-type name="ConstrainedElementSets"> <xml-root-element name="constrained-element-sets" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.openecomp.org.v10.ConstrainedElementSet" /> + <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v10.ConstrainedElementSet" /> </java-attributes> </java-type> + <java-type name="ConstrainedElementSet"> <xml-properties> <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." /> @@ -5372,34 +4700,23 @@ <xml-element java-attribute="constrainedElementSetUuid" name="constrained-element-set-uuid" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="autoGenerateUuid" value="true" /> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.openecomp.org.v10.ElementChoiceSets" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" /> + <xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String" /> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> + <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v10.ElementChoiceSets" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> </java-type> + <java-type name="ElementChoiceSets"> <xml-root-element name="element-choice-sets" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.openecomp.org.v10.ElementChoiceSet" /> + <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v10.ElementChoiceSet" /> </java-attributes> </java-type> + <java-type name="ElementChoiceSet"> <xml-properties> <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." /> @@ -5414,34 +4731,23 @@ <xml-element java-attribute="elementChoiceSetUuid" name="element-choice-set-uuid" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="autoGenerateUuid" value="true" /> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.openecomp.org.v10.ModelElements" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String" /> + <xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String" /> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> + <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v10.ModelElements" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> </java-type> + <java-type name="NamedQueries"> <xml-root-element name="named-queries" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.openecomp.org.v10.NamedQuery" /> + <xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v10.NamedQuery" /> </java-attributes> </java-type> + <java-type name="NamedQuery"> <xml-properties> <xml-property name="description" value="TBD" /> @@ -5453,47 +4759,26 @@ </xml-properties> <xml-root-element name="named-query" /> <java-attributes> - <xml-element java-attribute="namedQueryUuid" name="named-query-uuid" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="namedQueryName" name="named-query-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="namedQueryVersion" name="named-query-version" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element container-type="java.util.ArrayList" java-attribute="requiredInputParams" name="required-input-param" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> + <xml-element java-attribute="namedQueryUuid" name="named-query-uuid" required="true" type="java.lang.String" xml-key="true" /> + <xml-element java-attribute="namedQueryName" name="named-query-name" required="true" type="java.lang.String" /> + <xml-element java-attribute="namedQueryVersion" name="named-query-version" required="true" type="java.lang.String" /> + <xml-element container-type="java.util.ArrayList" java-attribute="requiredInputParams" name="required-input-param" type="java.lang.String" > <xml-element-wrapper name="required-input-params" /> </xml-element> - <xml-element java-attribute="description" name="description" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.openecomp.org.v10.NamedQueryElements" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="description" name="description" type="java.lang.String" /> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> + <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v10.NamedQueryElements" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> </java-type> + <java-type name="NamedQueryElements"> <xml-root-element name="named-query-elements" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.openecomp.org.v10.NamedQueryElement" /> + <xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v10.NamedQueryElement" /> </java-attributes> </java-type> + <java-type name="NamedQueryElement"> <xml-properties> <xml-property name="description" value="TBD" /> @@ -5508,41 +4793,26 @@ <xml-element java-attribute="namedQueryElementUuid" name="named-query-element-uuid" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="autoGenerateUuid" value="true" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="propertyLimitDesc" name="property-limit-desc" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="doNotOutput" name="do-not-output" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.openecomp.org.v10.NamedQueryElements" /> - <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.openecomp.org.v10.RelatedLookups" /> - <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.openecomp.org.v10.PropertyConstraints" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" /> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> + <xml-element java-attribute="propertyLimitDesc" name="property-limit-desc" type="java.lang.String" /> + <xml-element java-attribute="doNotOutput" name="do-not-output" type="java.lang.String" /> + <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v10.NamedQueryElements" /> + <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v10.RelatedLookups" /> + <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v10.PropertyConstraints" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> </java-type> + <java-type name="RelatedLookups"> <xml-root-element name="related-lookups" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.openecomp.org.v10.RelatedLookup" /> + <xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v10.RelatedLookup" /> </java-attributes> </java-type> + <java-type name="RelatedLookup"> <xml-properties> <xml-property name="description" value="TBD" /> @@ -5557,48 +4827,25 @@ <xml-element java-attribute="relatedLookupUuid" name="related-lookup-uuid" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="autoGenerateUuid" value="true" /> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="sourceNodeType" name="source-node-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="sourceNodeProperty" name="source-node-property" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="targetNodeType" name="target-node-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="sourceNodeType" name="source-node-type" required="true" type="java.lang.String" /> + <xml-element java-attribute="sourceNodeProperty" name="source-node-property" required="true" type="java.lang.String" /> + <xml-element java-attribute="targetNodeType" name="target-node-type" required="true" type="java.lang.String" /> + <xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" type="java.lang.String" /> + <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" /> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> </java-type> + <java-type name="PropertyConstraints"> <xml-root-element name="property-constraints" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.openecomp.org.v10.PropertyConstraint" /> + <xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v10.PropertyConstraint" /> </java-attributes> </java-type> + <java-type name="PropertyConstraint"> <xml-properties> <xml-property name="description" value="TBD" /> @@ -5613,62 +4860,40 @@ <xml-element java-attribute="propertyConstraintUuid" name="property-constraint-uuid" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="autoGenerateUuid" value="true" /> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="propertyName" name="property-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="propertyValue" name="property-value" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> + <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" /> + <xml-element java-attribute="propertyName" name="property-name" required="true" type="java.lang.String" /> + <xml-element java-attribute="propertyValue" name="property-value" required="true" type="java.lang.String" /> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> </java-attributes> </java-type> + <java-type name="ModelAndNamedQuerySearch"> <xml-properties> <xml-property name="description" value="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query" /> </xml-properties> <xml-root-element name="model-and-named-query-search" /> <java-attributes> - <xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.openecomp.org.v10.QueryParameters" /> - <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.openecomp.org.v10.InstanceFilters" /> - <xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.openecomp.org.v10.SecondaryFilts" /> - <xml-element java-attribute="topNodeType" name="top-node-type" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="secondaryFilterCutPoint" name="secondary-filter-cut-point" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> + <xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.onap.org.v10.QueryParameters" /> + <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v10.InstanceFilters" /> + <xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v10.SecondaryFilts" /> + <xml-element java-attribute="topNodeType" name="top-node-type" type="java.lang.String" /> + <xml-element java-attribute="secondaryFilterCutPoint" name="secondary-filter-cut-point" type="java.lang.String" /> </java-attributes> </java-type> + <java-type name="QueryParameters"> <xml-properties> <xml-property name="description" value="QueryParameters for performing a named-query or model query" /> </xml-properties> <xml-root-element name="query-parameters" /> <java-attributes> - <xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.openecomp.org.v10.NamedQuery" /> - <xml-element java-attribute="model" name="model" type="inventory.aai.openecomp.org.v10.OverloadedModel" /> + <xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v10.NamedQuery" /> + <xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v10.OverloadedModel" /> </java-attributes> </java-type> + <java-type name="OverloadedModel"> <xml-root-element name="overloaded-model" /> <xml-properties> @@ -5678,64 +4903,58 @@ <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelNameVersionId" name="model-name-version-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Name of the model, which can change from version to version." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelId" name="model-id" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Invariant unique ID which does not change from version to version" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Version" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Description" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.openecomp.org.v10.ModelVers" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v10.ModelVers" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> </java-type> + <java-type name="InstanceFilters"> <xml-properties> <xml-property name="description" value="InstanceFilters for performing a named-query or model query" /> </xml-properties> <xml-root-element name="instance-filters" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.openecomp.org.v10.InstanceFilter" /> + <xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v10.InstanceFilter" /> </java-attributes> </java-type> + <java-type name="InstanceFilter"> <xml-properties> <xml-property name="description" value="InstanceFilter for performing a named-query or model query" /> @@ -5746,15 +4965,17 @@ <xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any" /> </java-attributes> </java-type> + <java-type name="SecondaryFilts"> <xml-properties> <xml-property name="description" value="SecondaryFilts for performing a named-query or model query" /> </xml-properties> <xml-root-element name="secondary-filts" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.openecomp.org.v10.SecondaryFilt" /> + <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v10.SecondaryFilt" /> </java-attributes> </java-type> + <java-type name="SecondaryFilt"> <xml-properties> <xml-property name="description" value="SecondaryFilt for performing a named-query or model query" /> @@ -5764,33 +4985,28 @@ <xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any" /> </java-attributes> </java-type> + <java-type name="Properties"> <xml-properties> <xml-property name="description" value="Property holder for query properties or instance properties" /> </xml-properties> <xml-root-element name="properties" /> <java-attributes> - <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> + <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" /> + <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" /> </java-attributes> </java-type> + <java-type name="ResponseList"> <xml-properties> <xml-property name="description" value="Response container for the results of a named-query or model query" /> </xml-properties> <xml-root-element name="response-list" /> <java-attributes> - <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.openecomp.org.v10.InventoryResponseItems" /> + <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v10.InventoryResponseItems" /> </java-attributes> </java-type> + <java-type name="InventoryResponseItems"> <xml-properties> <xml-property name="description" value="Container for inventory items in response list" /> @@ -5798,9 +5014,10 @@ </xml-properties> <xml-root-element name="inventory-response-items" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.openecomp.org.v10.InventoryResponseItem" /> + <xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v10.InventoryResponseItem" /> </java-attributes> </java-type> + <java-type name="InventoryResponseItem"> <xml-properties> <xml-property name="description" value="Inventory item for response list" /> @@ -5808,68 +5025,62 @@ </xml-properties> <xml-root-element name="inventory-response-item" /> <java-attributes> - <xml-element java-attribute="modelName" name="model-name" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> + <xml-element java-attribute="modelName" name="model-name" type="java.lang.String" /> <xml-any-element java-attribute="item" /> - <xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.openecomp.org.v10.ExtraProperties" /> - <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.openecomp.org.v10.InventoryResponseItems" /> + <xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.onap.org.v10.ExtraProperties" /> + <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v10.InventoryResponseItems" /> </java-attributes> </java-type> + <java-type name="ExtraProperties"> <xml-properties> <xml-property name="description" value="Extra properties for inventory item for response list" /> </xml-properties> <xml-root-element name="extra-properties" /> <java-attributes> - <xml-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.openecomp.org.v10.ExtraProperty" /> + <xml-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v10.ExtraProperty" /> </java-attributes> </java-type> + <java-type name="ExtraProperty"> <xml-root-element name="extra-property" /> <java-attributes> - <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String"> - <xml-properties> - <xml-property name="sourceOfTruthType" value="aai" /> - </xml-properties> - </xml-element> + <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" /> <xml-any-element java-attribute="propertyValue" lax="true" name="property-value" /> </java-attributes> </java-type> + <java-type name="RouteTableReferences"> <xml-properties> <xml-property name="description" value="Collection of openstack route table references" /> </xml-properties> <xml-root-element name="route-table-references" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.openecomp.org.v10.RouteTableReference" /> + <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v10.RouteTableReference" /> </java-attributes> </java-type> + <java-type name="RouteTableReference"> <xml-root-element name="route-table-reference" /> <java-attributes> <xml-element java-attribute="routeTableReferenceId" name="route-table-reference-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="routeTableReferenceFqdn" name="route-table-reference-fqdn" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="FQDN entry in the route table." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Concurrency value" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> + <xml-properties> <xml-property name="description" value="Openstack route table reference." /> <xml-property name="nameProps" value="route-table-reference-fqdn" /> @@ -5879,50 +5090,48 @@ <xml-property name="namespace" value="network" /> </xml-properties> </java-type> + <java-type name="InstanceGroups"> <xml-properties> <xml-property name="description" value="Collection of openstack route table references" /> </xml-properties> <xml-root-element name="instance-groups" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.openecomp.org.v10.InstanceGroup" /> + <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v10.InstanceGroup" /> </java-attributes> </java-type> + <java-type name="InstanceGroup"> <xml-root-element name="instance-group" /> <java-attributes> <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Instance Group ID, UUID assigned to this instance." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="description" name="description" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Descriptive text to help identify the usage of this instance-group" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="type" name="type" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Only valid value today is lower case ha for high availability" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="subType" name="sub-type" type="java.lang.String"> + <xml-element java-attribute="subType" name="sub-type" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Valid values for ha type are [geo-activeactive, geo-activestandby, local-activeactive, local-activestandby]" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Concurrency value" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> + <xml-properties> <xml-property name="description" value="General mechanism for grouping instances" /> <xml-property name="nameProps" value="description" /> @@ -5932,31 +5141,32 @@ <xml-property name="namespace" value="network" /> </xml-properties> </java-type> + + <java-type name="SegmentationAssignments"> <xml-properties> <xml-property name="description" value="Collection of openstack segmentation assignments" /> </xml-properties> <xml-root-element name="segmentation-assignments" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.openecomp.org.v10.SegmentationAssignment" /> + <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v10.SegmentationAssignment" /> </java-attributes> </java-type> + <java-type name="SegmentationAssignment"> <xml-root-element name="segmentation-assignment" /> <java-attributes> <xml-element java-attribute="segmentationId" name="segmentation-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Concurrency value" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Openstack segmentation assignment." /> @@ -5965,34 +5175,33 @@ <xml-property name="container" value="segmentation-assignments" /> </xml-properties> </java-type> + <java-type name="AllottedResources"> <xml-properties> <xml-property name="description" value="This object is used to store slices of services being offered" /> </xml-properties> <xml-root-element name="allotted-resources" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.openecomp.org.v10.AllottedResource" /> + <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v10.AllottedResource" /> </java-attributes> </java-type> + <java-type name="AllottedResource"> <xml-root-element name="allotted-resource" /> <java-attributes> <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Allotted Resource id UUID assigned to this instance." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="description" name="description" type="java.lang.String"> <xml-properties> <xml-property name="description" value="The descriptive information assigned to this allotted resource instance" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Link back to more information in the controller" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String"> @@ -6000,7 +5209,6 @@ <xml-property name="description" value="the ASDC model id for this resource or service model." /> <xml-property name="visibility" value="deployment" /> <xml-property name="dbAlias" value="model-invariant-id-local" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String"> @@ -6008,7 +5216,6 @@ <xml-property name="description" value="the ASDC model version for this resource or service model." /> <xml-property name="visibility" value="deployment" /> <xml-property name="dbAlias" value="model-version-id-local" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String"> @@ -6016,42 +5223,37 @@ <xml-property name="description" value="the ASDC model version for this resource or service model." /> <xml-property name="visibility" value="internal" /> <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Concurrency value" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Orchestration status" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Indicator for whether the resource is considered operational" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="type" name="type" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Generic description of the type of allotted resource." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="role" name="role" type="java.lang.String"> <xml-properties> <xml-property name="description" value="role in the network that this resource will be providing." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.openecomp.org.v10.TunnelXconnects" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v10.TunnelXconnects" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> + <xml-properties> <xml-property name="description" value="Represents a slice or partial piece of a resource that gets separately allotted" /> <xml-property name="nameProps" value="description" /> @@ -6061,57 +5263,54 @@ <xml-property name="container" value="allotted-resources" /> <!-- <xml-property name="namespace" value="network" /> --> </xml-properties> - </java-type> + </java-type> + <java-type name="TunnelXconnects"> <xml-properties> <xml-property name="description" value="This object is used to store the specific tunnel cross connect aspects of an allotted resource" /> </xml-properties> <xml-root-element name="tunnel-xconnects" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.openecomp.org.v10.TunnelXconnect" /> + <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v10.TunnelXconnect" /> </java-attributes> </java-type> + <java-type name="TunnelXconnect"> <xml-root-element name="tunnel-xconnect" /> <java-attributes> <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Allotted Resource id UUID assigned to this instance." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="The WAN uplink bandwidth for WAN1" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="The WAN downlink bandwidth for WAN1" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="The WAN uplink bandwidth for WAN2" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="The WAN downlink bandwidth for WAN2" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Concurrency value" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> + <xml-properties> <xml-property name="description" value="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted" /> <xml-property name="uniqueProps" value="id" /> @@ -6121,37 +5320,36 @@ <!-- <xml-property name="namespace" value="network" /> --> </xml-properties> </java-type> + <java-type name="Entitlements"> <xml-properties> <xml-property name="description" value="Entitlements, keyed by group-uuid and resource-uuid, related to license management" /> </xml-properties> <xml-root-element name="entitlements" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.openecomp.org.v10.Entitlement" /> + <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v10.Entitlement" /> </java-attributes> </java-type> + <java-type name="Entitlement"> <xml-root-element name="entitlement" /> <java-attributes> <xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique ID for the entitlement group the resource comes from, should be uuid." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique ID of an entitlement resource. " /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Concurrency value" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Metadata for entitlement group." /> @@ -6160,37 +5358,37 @@ <xml-property name="container" value="entitlements" /> </xml-properties> </java-type> + + <java-type name="Licenses"> <xml-properties> <xml-property name="description" value="Licenses to be allocated across resources, keyed by group-uuid and resource-uuid, related to license management" /> </xml-properties> <xml-root-element name="licenses" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.openecomp.org.v10.License" /> + <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v10.License" /> </java-attributes> </java-type> + <java-type name="License"> <xml-root-element name="license" /> <java-attributes> <xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique ID for the license group the resource belongs to, should be uuid." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique ID of a license resource. " /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Concurrency value" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Metadata for license group." /> @@ -6199,13 +5397,13 @@ <xml-property name="container" value="licenses" /> </xml-properties> </java-type> + <java-type name="Vnf"> - <xml-root-element name="vnf" /> + <xml-root-element name="vnf"/> <java-attributes> <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique id of VNF. This is unique across the graph." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> </java-attributes> @@ -6217,55 +5415,51 @@ <xml-property name="abstract" value="true" /> </xml-properties> </java-type> + <java-type name="Zones"> <xml-properties> <xml-property name="description" value="Collection of zones" /> </xml-properties> <xml-root-element name="zones" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.openecomp.org.v10.Zone" /> + <xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.onap.org.v10.Zone" /> </java-attributes> </java-type> + <java-type name="Zone"> <xml-root-element name="zone" /> <java-attributes> <xml-element java-attribute="zoneId" name="zone-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Code assigned by AIC to the zone" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="zoneName" name="zone-name" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="English name associated with the zone" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Design of zone [Medium/Large?]" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Context of zone [production/test]" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="status" name="status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Status of a zone." /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Concurrency value" /> - <xml-property name="sourceOfTruthType" value="aai" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="A zone is a grouping of assets in a location homing to the same connections into the CBB" /> @@ -6276,42 +5470,368 @@ <xml-property name="namespace" value="network" /> </xml-properties> </java-type> - <java-type name="RouteTargets"> + <java-type name="TestObjects"> <xml-properties> - <xml-property name="description" value="Collection of route target information" /> + <xml-property name="description" value="Collection of VNFs" /> </xml-properties> - <xml-root-element name="route-targets" /> + <xml-root-element name="test-objects" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="routeTarget" name="route-target" type="inventory.aai.openecomp.org.v10.RouteTarget" /> + <xml-element container-type="java.util.ArrayList" + java-attribute="testObject" name="test-object" + type="inventory.aai.onap.org.v10.TestObject" /> </java-attributes> + <xml-properties> + <xml-property name="maximumDepth" value="0" /> + </xml-properties> </java-type> - <java-type name="RouteTarget"> - <xml-root-element name="route-target" /> + <java-type name="TestObject"> + <xml-root-element name="test-object" /> <java-attributes> - <xml-element java-attribute="globalRouteTarget" name="global-route-target" required="true" xml-key="true" type="java.lang.String"> + <xml-element java-attribute="vnfId" name="vnf-id" + required="true" type="java.lang.String" xml-key="true"> <xml-properties> - <xml-property name="description" value="Number used to identify an RT, globally unique in the network" /> - <xml-property name="sourceOfTruthType" value="aai" /> + <xml-property name="description" + value="Unique id of VNF. This is unique across the graph." /> </xml-properties> </xml-element> - <xml-element java-attribute="routeTargetRole" name="route-target-role" required="true" xml-key="true" type="java.lang.String"> + <xml-element java-attribute="vnfName" name="vnf-name" + required="true" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Role assigned to this route target" /> - <xml-property name="sourceOfTruthType" value="aai" /> + <xml-property name="description" value="Name of VNF." /> </xml-properties> </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-element java-attribute="vnfName2" name="vnf-name2" + type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - <xml-property name="sourceOfTruthType" value="aai" /> + <xml-property name="description" value="Alternate name of VNF." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vnfType" name="vnf-type" + required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="String capturing type of vnf, that was intended to identify the ASDC resource. This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="serviceId" name="service-id" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="Unique identifier of service, does not necessarily map to ASDC service models. SOON TO BE DEPRECATED" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="Regional way of organizing pservers, source of truth should define values" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="provStatus" name="prov-status" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="Trigger for operational monitoring of this resource by Service Assurance systems." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="operationalState" name="operational-state" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="Indicator for whether the resource is considered operational. Valid values are in-service-path and out-of-service-path." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="licenseKey" name="license-key" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="OBSOLETE - do not use" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="equipmentRole" name="equipment-role" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="Client should send valid enumerated value" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="orchestrationStatus" name="orchestration-status" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="Orchestration status of this VNF, used by MSO." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="heatStackId" name="heat-stack-id" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="Heat stack id corresponding to this instance, managed by MSO" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="Corresponds to the SDN-C catalog id used to configure this VCE" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="managementOption" name="management-option" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="identifier of managed by ATT or customer" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by generic-vnf." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="v4 Loopback0 address" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="nmLanV6Address" name="nm-lan-v6-address" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="v6 Loopback address" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="managementV6Address" name="management-v6-address" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="v6 management address" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vcpu" name="vcpu" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" + value="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vcpuUnits" name="vcpu-units" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="units associated with vcpu, used for VNFs with no vservers/flavors, to be used only by uCPE" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vmemory" name="vmemory" + type="java.lang.Long"> + <xml-properties> + <xml-property name="description" + value="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vmemoryUnits" name="vmemory-units" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="units associated with vmemory, used for VNFs with no vservers/flavors, to be used only by uCPE" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vdisk" name="vdisk" + type="java.lang.Long"> + <xml-properties> + <xml-property name="description" + value="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only uCPE" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vdiskUnits" name="vdisk-units" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only by uCPE" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" /> + <xml-element default-value="false" required="true" + java-attribute="inMaint" name="in-maint" type="java.lang.Boolean"> + <xml-properties> + <xml-property name="defaultValue" value="false" /> + <xml-property name="description" + value="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." /> + </xml-properties> + </xml-element> + <xml-element default-value="false" required="true" + java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" + type="java.lang.Boolean"> + <xml-properties> + <xml-property name="defaultValue" value="false" /> + <xml-property name="description" + value="used to indicate whether closed loop function is enabled on this node" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="summaryStatus" name="summary-status" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="details regarding the generic-vnf operation, PLEASE DISCONTINUE USE OF THIS FIELD." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="encryptedAccessFlag" name="encrypted-access-flag" + type="java.lang.Boolean"> + <xml-properties> + <xml-property name="description" + value="indicates whether generic-vnf access uses SSH" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="entitlementAssignmentGroupUuid" + name="entitlement-assignment-group-uuid" type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="UUID of the Entitlement group used for licensing VNFs, OBSOLETE - See child relationships." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="entitlementResourceUuid" + name="entitlement-resource-uuid" type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="UUID of the specific entitlement resource. OBSOLETE - See child relationships." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="licenseAssignmentGroupUuid" + name="license-assignment-group-uuid" type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="UUID of the license assignment group. OBSOLETE - See child relationships." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="licenseKeyUuid" name="license-key-uuid" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="UUID of the actual license resource. OBSOLETE - See child relationships." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="modelInvariantId" name="model-invariant-id" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="the ASDC model id for this resource or service model." /> + <xml-property name="visibility" value="deployment" /> + <xml-property name="dbAlias" value="model-invariant-id-local" /> + <xml-property name="requires" value="model-version-id" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="modelVersionId" name="model-version-id" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="the ASDC model version for this resource or service model." /> + <xml-property name="visibility" value="deployment" /> + <xml-property name="dbAlias" value="model-version-id-local" /> + <xml-property name="requires" value="model-invariant-id" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="personaModelVer" name="persona-model-ver" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="the ASDC model version for this resource or service model." /> + <xml-property name="visibility" value="internal" /> + <xml-property name="dataCopy" + value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="notVisibleTestElement" + name="not-visible-test-element" type="java.lang.String"> + <xml-properties> + <xml-property name="visibility" value="internal" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="modelCustomizationId" name="model-customization-id" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="captures the id of all the configuration used to customize the resource for the service." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="widgetModelId" name="widget-model-id" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="the ASDC data dictionary widget model. This maps directly to the A&AI widget." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="widgetModelVersion" name="widget-model-version" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="asNumber" name="as-number" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="as-number of the VNF" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="regionalResourceSubzone" + name="regional-resource-subzone" type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="represents sub zone of the rr plane" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="nfType" name="nf-type" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="Generic description of the type of NF" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="nfFunction" name="nf-function" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="English description of Network function that the specific VNF deployment is providing" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="nfRole" name="nf-role" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="role in the network that this model will be providing" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="nfNamingCode" name="nf-naming-code" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="string assigned to this model used for naming purposes" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="selflink" name="selflink" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Path to the controller object." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="testObjects" name="test-objects" type="inventory.aai.onap.org.v10.TestObjects" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" /> + </java-attributes> <xml-properties> - <xml-property name="description" value="Route target information" /> - <xml-property name="container" value="route-targets" /> - <xml-property name="dependentOn" value="vpn-binding" /> + <xml-property name="description" value="General purpose VNF" /> + <xml-property name="nameProps" value="vnf-name" /> + <xml-property name="indexedProps" + value="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,nf-type,nf-function,nf-naming-code,nf-role" /> + <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" /> + <xml-property name="uniqueProps" value="vnf-id" /> + <xml-property name="container" value="test-objects" /> + <xml-property name="namespace" value="network" /> + <xml-property name="extends" value="vnf" /> </xml-properties> </java-type> </java-types> diff --git a/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v11.xml b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v11.xml index 1c49cf18..3822a54b 100644 --- a/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v11.xml +++ b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v11.xml @@ -30,6 +30,7 @@ <xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v11.Search" /> <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v11.Actions" /> <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v11.CloudInfrastructure" /> + <xml-element java-attribute="licenseManagement" name="license-management" type="inventory.aai.onap.org.v11.LicenseManagement" /> <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v11.Business" /> <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v11.ServiceDesignAndCreation" /> <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v11.Network" /> @@ -254,7 +255,7 @@ <java-attributes> <xml-element java-attribute="cloudOwner" name="cloud-owner" required="true" type="java.lang.String" xml-key="true"> <xml-properties> - <xml-property name="description" value="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname" /> + <xml-property name="description" value="Identifies the vendor and cloud name, e.g., att-aic. First part of composite key should be formatted as vendor-cloudname" /> </xml-properties> </xml-element> <xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true"> @@ -309,7 +310,7 @@ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> - <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation." /> + <xml-property name="description" value="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." /> <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type" /> <xml-property name="nameProps" value="owner-defined-type" /> <xml-property name="container" value="cloud-regions" /> @@ -359,7 +360,7 @@ <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." /> </xml-properties> </xml-element> - <xml-element java-attribute="vfModulemodelCustomizationId" name="vf-module-model-customization-id" type="java.lang.String"> + <xml-element java-attribute="vfModuleModelCustomizationId" name="vf-module-model-customization-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="helps relate the volume group to the vf-module whose components will require the volume group" /> </xml-properties> @@ -717,19 +718,32 @@ <xml-properties> <xml-property name="description" value="Whether A&AI should be managing this interface of not. Could have value like CUSTOMER" /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="interfaceDescription" name="interface-description" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Human friendly text regarding this interface." /> </xml-properties> - </xml-element> + </xml-element> + <xml-element java-attribute="isPortMirrored" name="is-port-mirrored" required="true" type="java.lang.Boolean"> + <xml-properties> + <xml-property name="defaultValue" value="false"/> + <xml-property name="description" value="boolean indicatating whether or not port is a mirrored." /> + </xml-properties> + </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> + <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean"> + <xml-properties> + <xml-property name="defaultValue" value="false"/> + <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" /> + </xml-properties> + </xml-element> <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v11.Vlans" /> <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v11.SriovVfs" /> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv4AddressList" /> <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv6AddressList" /> @@ -935,7 +949,7 @@ <xml-properties> <xml-property name="description" value="Whether customer is going to use this VLAN for backdoor connection to another customer premise device." /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="vpnId" name="vpn-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="This indicates the customers VPN ID associated with this vlan" /> @@ -946,6 +960,12 @@ <xml-property name="description" value="Status of a vnf's vlan interface, on which the customer circuit resides, mastered by SDN-C." /> </xml-properties> </xml-element> + <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean"> + <xml-properties> + <xml-property name="defaultValue" value="false"/> + <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" /> + </xml-properties> + </xml-element> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv4AddressList" /> <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv6AddressList" /> @@ -1127,7 +1147,7 @@ <xml-property name="container" value="flavors" /> </xml-properties> </java-type> - + <java-type name="Snapshots"> <xml-properties> <xml-property name="description" value="Collection of openstack snapshots" /> @@ -1135,9 +1155,9 @@ <xml-root-element name="snapshots" /> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v11.Snapshot" /> - </java-attributes> + </java-attributes> </java-type> - + <java-type name="Snapshot"> <xml-root-element name="snapshot" /> <java-attributes> @@ -1205,9 +1225,9 @@ <xml-property name="indexedProps" value="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id" /> <xml-property name="dependentOn" value="cloud-region" /> <xml-property name="container" value="snapshots" /> - </xml-properties> + </xml-properties> </java-type> - + <java-type name="GroupAssignments"> <xml-properties> <xml-property name="description" value="Collection of openstack group assignments" /> @@ -1217,7 +1237,7 @@ <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v11.GroupAssignment" /> </java-attributes> </java-type> - + <java-type name="GroupAssignment"> <xml-root-element name="group-assignment" /> <java-attributes> @@ -1230,7 +1250,7 @@ <xml-properties> <xml-property name="description" value="Group type - the type of group this instance refers to" /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="groupName" name="group-name" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Group name - name assigned to the group" /> @@ -1240,12 +1260,12 @@ <xml-properties> <xml-property name="description" value="Group description - description of the group" /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> <xml-properties> @@ -1255,7 +1275,7 @@ <xml-property name="dependentOn" value="cloud-region" /> <xml-property name="container" value="group-assignments" /> </xml-properties> - </java-type> + </java-type> <java-type name="Images"> <xml-properties> @@ -1651,6 +1671,12 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> + <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean"> + <xml-properties> + <xml-property name="defaultValue" value="false"/> + <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" /> + </xml-properties> + </xml-element> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> </java-attributes> @@ -1685,7 +1711,7 @@ <xml-properties> <xml-property name="description" value="Human friendly text regarding this interface." /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> @@ -1716,13 +1742,19 @@ <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." /> </xml-properties> </xml-element> + <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean"> + <xml-properties> + <xml-property name="defaultValue" value="false"/> + <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" /> + </xml-properties> + </xml-element> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="Link aggregate interface" /> - <xml-property name="indexedProps" value="interface-name" /> - <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe" /> + <xml-property name="indexedProps" value="interface-name,interface-id,interface-role" /> + <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe,pnf" /> <xml-property name="container" value="lag-interfaces" /> </xml-properties> </java-type> @@ -1863,6 +1895,51 @@ </xml-properties> </java-type> + <java-type name="LicenseManagement"> + <xml-root-element name="license-management" /> + <java-attributes> + <xml-element java-attribute="licenseKeyResources" name="license-key-resources" type="inventory.aai.onap.org.v11.LicenseKeyResources" /> + </java-attributes> + </java-type> + + <java-type name="LicenseKeyResources"> + <xml-root-element name="license-key-resources" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="licenseKeyResource" name="license-key-resource" type="inventory.aai.onap.org.v11.LicenseKeyResource" /> + </java-attributes> + </java-type> + + <java-type name="LicenseKeyResource"> + <xml-root-element name="license-key-resource" /> + <java-attributes> + <xml-element java-attribute="attUuid" name="att-uuid" required="true" type="java.lang.String" xml-key="true" /> + <xml-element java-attribute="assignmentType" name="assignment-type" type="java.lang.String" /> + <xml-element java-attribute="assignmentStatus" name="assignment-status" type="java.lang.String" /> + <xml-element java-attribute="assignmentGroupUuid" name="assignment-group-uuid" required="true" type="java.lang.String" /> + <xml-element java-attribute="assignmentDate" name="assignment-date" type="java.lang.String" /> + <xml-element java-attribute="name" name="name" type="java.lang.String" /> + <xml-element java-attribute="modelUuid" name="model-uuid" type="java.lang.String" /> + <xml-element java-attribute="modelVersion" name="model-version" type="java.lang.String" /> + <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String" /> + <xml-element java-attribute="licenseKeyFileUrl" name="license-key-file-url" type="java.lang.String" /> + <xml-element container-type="java.util.ArrayList" java-attribute="supplierReleaseList" name="supplier-release-list" type="java.lang.String" /> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="OBSOLETE OBJECT: do not use" /> + <xml-property name="nameProps" value="name" /> + <xml-property name="indexedProps" value="assignment-group-uuid,att-uuid,name" /> + <xml-property name="uniqueProps" value="att-uuid" /> + <xml-property name="container" value="license-key-resources" /> + <xml-property name="namespace" value="license-management" /> + </xml-properties> + </java-type> + <java-type name="Business"> <xml-properties> <xml-property name="description" value="Namespace for business related constructs" /> @@ -1897,14 +1974,25 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String"> + <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the ASDC model id for this resource or service model." /> + <xml-property name="visibility" value="deployment" /> + <xml-property name="dbAlias" value="model-invariant-id-local" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="the ASDC model version for this resource or service model." /> + <xml-property name="visibility" value="deployment" /> + <xml-property name="dbAlias" value="model-version-id-local" /> </xml-properties> </xml-element> <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the ASDC model version for this resource or service model." /> + <xml-property name="visibility" value="internal" /> + <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" /> </xml-properties> </xml-element> <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String"> @@ -1922,7 +2010,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" /> - <xml-property name="indexedProps" value="resource-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version" /> + <xml-property name="indexedProps" value="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version" /> <xml-property name="container" value="connectors" /> <xml-property name="namespace" value="business" /> </xml-properties> @@ -2043,14 +2131,25 @@ <xml-property name="description" value="This field will store a name assigned to the service-instance." /> </xml-properties> </xml-element> - <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String"> + <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the ASDC model id for this resource or service model." /> + <xml-property name="visibility" value="deployment" /> + <xml-property name="dbAlias" value="model-invariant-id-local" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="the ASDC model version for this resource or service model." /> + <xml-property name="visibility" value="deployment" /> + <xml-property name="dbAlias" value="model-version-id-local" /> </xml-properties> </xml-element> <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the ASDC model version for this resource or service model." /> + <xml-property name="visibility" value="internal" /> + <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" /> </xml-properties> </xml-element> <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String"> @@ -2124,7 +2223,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Instance of a service" /> - <xml-property name="indexedProps" value="service-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status" /> + <xml-property name="indexedProps" value="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status" /> <xml-property name="nameProps" value="service-instance-name" /> <xml-property name="searchable" value="service-instance-id,service-instance-name" /> <xml-property name="uniqueProps" value="service-instance-id" /> @@ -2160,7 +2259,7 @@ <java-type name="VnfImage"> <xml-root-element name="vnf-image" /> <java-attributes> - <xml-element java-attribute="vnfImageUuid" name="vnf-image-uuid" required="true" type="java.lang.String" xml-key="true"> + <xml-element java-attribute="attUuid" name="att-uuid" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique ID of this asset" /> </xml-properties> @@ -2194,8 +2293,8 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers. This is a kludge." /> - <xml-property name="indexedProps" value="application,vnf-image-uuid,application-vendor,application-version" /> - <xml-property name="uniqueProps" value="vnf-image-uuid" /> + <xml-property name="indexedProps" value="application,att-uuid,application-vendor,application-version" /> + <xml-property name="uniqueProps" value="att-uuid" /> <xml-property name="container" value="vnf-images" /> <xml-property name="namespace" value="service-design-and-creation" /> </xml-properties> @@ -2308,6 +2407,11 @@ <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v11.Pnfs" /> <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v11.PhysicalLinks" /> <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v11.IpsecConfigurations" /> + <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v11.RouteTableReferences" /> + <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v11.InstanceGroups" /> + <xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v11.Zones" /> + <xml-element java-attribute="testObjects" name="test-objects" + type="inventory.aai.onap.org.v11.TestObjects" /> </java-attributes> </java-type> @@ -2346,7 +2450,7 @@ </xml-element> <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="v4, v6, or ds for dual stack" /> + <xml-property name="description" value="v4, v6, or ds for dual stack (should be att-ip-version)" /> </xml-properties> </xml-element> <xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String"> @@ -2359,14 +2463,25 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String"> + <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the ASDC model id for this resource or service model." /> + <xml-property name="visibility" value="deployment" /> + <xml-property name="dbAlias" value="model-invariant-id-local" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="the ASDC model version for this resource or service model." /> + <xml-property name="visibility" value="deployment" /> + <xml-property name="dbAlias" value="model-version-id-local" /> </xml-properties> </xml-element> <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the ASDC model version for this resource or service model." /> + <xml-property name="visibility" value="internal" /> + <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" /> </xml-properties> </xml-element> <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String"> @@ -2418,7 +2533,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points" /> - <xml-property name="indexedProps" value="link-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose" /> + <xml-property name="indexedProps" value="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose" /> <xml-property name="uniqueProps" value="link-id" /> <xml-property name="container" value="logical-links" /> <xml-property name="namespace" value="network" /> @@ -2542,7 +2657,7 @@ <xml-properties> <xml-property name="description" value="The type of destinatination equipment. Could be Router, UCPE, etc." /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> @@ -2651,6 +2766,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> + <xml-element java-attribute="routeTargets" name="route-targets" type="inventory.aai.onap.org.v11.RouteTargets" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"> <xml-properties> <xml-property name="description" value="l3-networks relate to vpn-bindings" /> @@ -2667,7 +2784,41 @@ <xml-property name="namespace" value="network" /> </xml-properties> </java-type> - + <java-type name="RouteTargets"> + <xml-properties> + <xml-property name="description" value="Collection of route target information" /> + </xml-properties> + <xml-root-element name="route-targets" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="routeTarget" name="route-target" type="inventory.aai.onap.org.v11.RouteTarget" /> + </java-attributes> + </java-type> + <java-type name="RouteTarget"> + <xml-root-element name="route-target" /> + <java-attributes> + <xml-element java-attribute="globalRouteTarget" name="global-route-target" required="true" xml-key="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Number used to identify an RT, globally unique in the network" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="routeTargetRole" name="route-target-role" required="true" xml-key="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Role assigned to this route target" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="Route target information" /> + <xml-property name="container" value="route-targets" /> + <xml-property name="canBeLinked" value="true" /> + </xml-properties> + </java-type> <java-type name="VplsPes"> <xml-properties> <xml-property name="description" value="Collection of VPLS Provider Edge routers" /> @@ -3151,14 +3302,25 @@ <xml-property name="description" value="Contrail FQDN for the network" /> </xml-properties> </xml-element> - <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String"> + <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the ASDC model id for this resource or service model." /> + <xml-property name="visibility" value="deployment" /> + <xml-property name="dbAlias" value="model-invariant-id-local" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="the ASDC model version for this resource or service model." /> + <xml-property name="visibility" value="deployment" /> + <xml-property name="dbAlias" value="model-version-id-local" /> </xml-properties> </xml-element> <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the ASDC model version for this resource or service model." /> + <xml-property name="visibility" value="internal" /> + <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" /> </xml-properties> </xml-element> <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String"> @@ -3221,7 +3383,7 @@ <xml-properties> <xml-property name="description" value="Generic network definition" /> <xml-property name="nameProps" value="network-name" /> - <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-network-fqdn,network-role" /> + <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role" /> <xml-property name="searchable" value="network-id,network-name" /> <xml-property name="uniqueProps" value="network-id" /> <xml-property name="container" value="l3-networks" /> @@ -3562,14 +3724,25 @@ <xml-property name="description" value="UUID of the actual license resource. OBSOLETE - See child relationships." /> </xml-properties> </xml-element> - <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String"> + <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the ASDC model id for this resource or service model." /> + <xml-property name="visibility" value="deployment" /> + <xml-property name="dbAlias" value="model-invariant-id-local" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="the ASDC model version for this resource or service model." /> + <xml-property name="visibility" value="deployment" /> + <xml-property name="dbAlias" value="model-version-id-local" /> </xml-properties> </xml-element> <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the ASDC model version for this resource or service model." /> + <xml-property name="visibility" value="internal" /> + <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" /> </xml-properties> </xml-element> <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String"> @@ -3606,22 +3779,22 @@ <xml-properties> <xml-property name="description" value="English description of Network function that the specific VNF deployment is providing" /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String"> <xml-properties> <xml-property name="description" value="role in the network that this model will be providing" /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="nfNamingCode" name="nf-naming-code" type="java.lang.String"> <xml-properties> <xml-property name="description" value="string assigned to this model used for naming purposes" /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Path to the controller object." /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" /> @@ -3632,7 +3805,7 @@ <xml-properties> <xml-property name="description" value="General purpose VNF" /> <xml-property name="nameProps" value="vnf-name" /> - <xml-property name="indexedProps" value="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,nf-type,nf-function,nf-naming-code,nf-role" /> + <xml-property name="indexedProps" value="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role" /> <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" /> <xml-property name="uniqueProps" value="vnf-id" /> <xml-property name="container" value="generic-vnfs" /> @@ -3685,14 +3858,25 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String"> + <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the ASDC model id for this resource or service model." /> + <xml-property name="visibility" value="deployment" /> + <xml-property name="dbAlias" value="model-invariant-id-local" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="the ASDC model version for this resource or service model." /> + <xml-property name="visibility" value="deployment" /> + <xml-property name="dbAlias" value="model-version-id-local" /> </xml-properties> </xml-element> <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the ASDC model version for this resource or service model." /> + <xml-property name="visibility" value="internal" /> + <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" /> </xml-properties> </xml-element> <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String"> @@ -3729,7 +3913,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="a deployment unit of VNFCs" /> - <xml-property name="indexedProps" value="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" /> + <xml-property name="indexedProps" value="vf-module-id,vf-module-name,heat-stack-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-service-instance-fqdn" /> <xml-property name="searchable" value="vf-module-id,vf-module-name" /> <xml-property name="dependentOn" value="generic-vnf" /> <xml-property name="container" value="vf-modules" /> @@ -4058,7 +4242,7 @@ <xml-properties> <xml-property name="description" value="Name of the service Provider on this link." /> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> @@ -4168,7 +4352,7 @@ </xml-element> <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" /> + <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,? aes-192-cbc, aes-265-cbc" /> </xml-properties> </xml-element> <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String"> @@ -4198,7 +4382,7 @@ </xml-element> <xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" /> + <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc,? aes-192-cbc, aes-265-cbc" /> </xml-properties> </xml-element> <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String"> @@ -4366,7 +4550,7 @@ <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v11.ModelVer" /> </java-attributes> </java-type> - + <java-type name="ModelVer"> <xml-root-element name="model-ver" /> <xml-properties> @@ -4781,7 +4965,7 @@ <xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any" /> </java-attributes> </java-type> - + <java-type name="SecondaryFilts"> <xml-properties> <xml-property name="description" value="SecondaryFilts for performing a named-query or model query" /> @@ -4791,7 +4975,7 @@ <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v11.SecondaryFilt" /> </java-attributes> </java-type> - + <java-type name="SecondaryFilt"> <xml-properties> <xml-property name="description" value="SecondaryFilt for performing a named-query or model query" /> @@ -4865,7 +5049,7 @@ <xml-any-element java-attribute="propertyValue" lax="true" name="property-value" /> </java-attributes> </java-type> - + <java-type name="RouteTableReferences"> <xml-properties> <xml-property name="description" value="Collection of openstack route table references" /> @@ -4875,7 +5059,7 @@ <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v11.RouteTableReference" /> </java-attributes> </java-type> - + <java-type name="RouteTableReference"> <xml-root-element name="route-table-reference" /> <java-attributes> @@ -4896,7 +5080,7 @@ </xml-element> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> - + <xml-properties> <xml-property name="description" value="Openstack route table reference." /> <xml-property name="nameProps" value="route-table-reference-fqdn" /> @@ -4906,7 +5090,7 @@ <xml-property name="namespace" value="network" /> </xml-properties> </java-type> - + <java-type name="InstanceGroups"> <xml-properties> <xml-property name="description" value="Collection of openstack route table references" /> @@ -4916,7 +5100,7 @@ <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v11.InstanceGroup" /> </java-attributes> </java-type> - + <java-type name="InstanceGroup"> <xml-root-element name="instance-group" /> <java-attributes> @@ -4947,7 +5131,7 @@ </xml-element> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> - + <xml-properties> <xml-property name="description" value="General mechanism for grouping instances" /> <xml-property name="nameProps" value="description" /> @@ -4957,7 +5141,7 @@ <xml-property name="namespace" value="network" /> </xml-properties> </java-type> - + <java-type name="SegmentationAssignments"> <xml-properties> @@ -4968,7 +5152,7 @@ <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v11.SegmentationAssignment" /> </java-attributes> </java-type> - + <java-type name="SegmentationAssignment"> <xml-root-element name="segmentation-assignment" /> <java-attributes> @@ -4991,7 +5175,7 @@ <xml-property name="container" value="segmentation-assignments" /> </xml-properties> </java-type> - + <java-type name="AllottedResources"> <xml-properties> <xml-property name="description" value="This object is used to store slices of services being offered" /> @@ -5001,7 +5185,7 @@ <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v11.AllottedResource" /> </java-attributes> </java-type> - + <java-type name="AllottedResource"> <xml-root-element name="allotted-resource" /> <java-attributes> @@ -5020,14 +5204,25 @@ <xml-property name="description" value="Link back to more information in the controller" /> </xml-properties> </xml-element> - <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String"> + <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the ASDC model id for this resource or service model." /> + <xml-property name="visibility" value="deployment" /> + <xml-property name="dbAlias" value="model-invariant-id-local" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="the ASDC model version for this resource or service model." /> + <xml-property name="visibility" value="deployment" /> + <xml-property name="dbAlias" value="model-version-id-local" /> </xml-properties> </xml-element> <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="the ASDC model version for this resource or service model." /> + <xml-property name="visibility" value="internal" /> + <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> @@ -5058,18 +5253,18 @@ <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v11.TunnelXconnects" /> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> - + <xml-properties> <xml-property name="description" value="Represents a slice or partial piece of a resource that gets separately allotted" /> <xml-property name="nameProps" value="description" /> <xml-property name="uniqueProps" value="id" /> - <xml-property name="indexedProps" value="id,persona-model-id,persona-model-version,type,role" /> + <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id,type,role" /> <xml-property name="dependentOn" value="service-instance" /> <xml-property name="container" value="allotted-resources" /> <!-- <xml-property name="namespace" value="network" /> --> </xml-properties> - </java-type> - + </java-type> + <java-type name="TunnelXconnects"> <xml-properties> <xml-property name="description" value="This object is used to store the specific tunnel cross connect aspects of an allotted resource" /> @@ -5079,7 +5274,7 @@ <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v11.TunnelXconnect" /> </java-attributes> </java-type> - + <java-type name="TunnelXconnect"> <xml-root-element name="tunnel-xconnect" /> <java-attributes> @@ -5115,7 +5310,7 @@ </xml-element> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> </java-attributes> - + <xml-properties> <xml-property name="description" value="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted" /> <xml-property name="uniqueProps" value="id" /> @@ -5125,7 +5320,7 @@ <!-- <xml-property name="namespace" value="network" /> --> </xml-properties> </java-type> - + <java-type name="Entitlements"> <xml-properties> <xml-property name="description" value="Entitlements, keyed by group-uuid and resource-uuid, related to license management" /> @@ -5135,7 +5330,7 @@ <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v11.Entitlement" /> </java-attributes> </java-type> - + <java-type name="Entitlement"> <xml-root-element name="entitlement" /> <java-attributes> @@ -5159,12 +5354,12 @@ <xml-properties> <xml-property name="description" value="Metadata for entitlement group." /> <xml-property name="indexedProps" value="group-uuid,resource-uuid" /> - <xml-property name="dependentOn" value="generic-vnf,vce,vpe" /> + <xml-property name="dependentOn" value="generic-vnf,vce" /> <xml-property name="container" value="entitlements" /> </xml-properties> </java-type> - - + + <java-type name="Licenses"> <xml-properties> <xml-property name="description" value="Licenses to be allocated across resources, keyed by group-uuid and resource-uuid, related to license management" /> @@ -5174,7 +5369,7 @@ <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v11.License" /> </java-attributes> </java-type> - + <java-type name="License"> <xml-root-element name="license" /> <java-attributes> @@ -5198,11 +5393,11 @@ <xml-properties> <xml-property name="description" value="Metadata for license group." /> <xml-property name="indexedProps" value="group-uuid,resource-uuid" /> - <xml-property name="dependentOn" value="generic-vnf,vce,vpe" /> + <xml-property name="dependentOn" value="generic-vnf,vce" /> <xml-property name="container" value="licenses" /> </xml-properties> </java-type> - + <java-type name="Vnf"> <xml-root-element name="vnf"/> <java-attributes> @@ -5220,7 +5415,7 @@ <xml-property name="abstract" value="true" /> </xml-properties> </java-type> - + <java-type name="Zones"> <xml-properties> <xml-property name="description" value="Collection of zones" /> @@ -5275,6 +5470,369 @@ <xml-property name="namespace" value="network" /> </xml-properties> </java-type> - + <java-type name="TestObjects"> + <xml-properties> + <xml-property name="description" value="Collection of VNFs" /> + </xml-properties> + <xml-root-element name="test-objects" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" + java-attribute="testObject" name="test-object" + type="inventory.aai.onap.org.v11.TestObject" /> + </java-attributes> + <xml-properties> + <xml-property name="maximumDepth" value="0" /> + </xml-properties> + </java-type> + <java-type name="TestObject"> + <xml-root-element name="test-object" /> + <java-attributes> + <xml-element java-attribute="vnfId" name="vnf-id" + required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" + value="Unique id of VNF. This is unique across the graph." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vnfName" name="vnf-name" + required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Name of VNF." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vnfName2" name="vnf-name2" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Alternate name of VNF." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vnfType" name="vnf-type" + required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="String capturing type of vnf, that was intended to identify the ASDC resource. This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="serviceId" name="service-id" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="Unique identifier of service, does not necessarily map to ASDC service models. SOON TO BE DEPRECATED" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="Regional way of organizing pservers, source of truth should define values" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="provStatus" name="prov-status" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="Trigger for operational monitoring of this resource by Service Assurance systems." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="operationalState" name="operational-state" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="Indicator for whether the resource is considered operational. Valid values are in-service-path and out-of-service-path." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="licenseKey" name="license-key" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="OBSOLETE - do not use" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="equipmentRole" name="equipment-role" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="Client should send valid enumerated value" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="orchestrationStatus" name="orchestration-status" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="Orchestration status of this VNF, used by MSO." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="heatStackId" name="heat-stack-id" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="Heat stack id corresponding to this instance, managed by MSO" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="Corresponds to the SDN-C catalog id used to configure this VCE" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="managementOption" name="management-option" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="identifier of managed by ATT or customer" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by generic-vnf." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="v4 Loopback0 address" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="nmLanV6Address" name="nm-lan-v6-address" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="v6 Loopback address" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="managementV6Address" name="management-v6-address" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="v6 management address" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vcpu" name="vcpu" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" + value="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vcpuUnits" name="vcpu-units" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="units associated with vcpu, used for VNFs with no vservers/flavors, to be used only by uCPE" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vmemory" name="vmemory" + type="java.lang.Long"> + <xml-properties> + <xml-property name="description" + value="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vmemoryUnits" name="vmemory-units" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="units associated with vmemory, used for VNFs with no vservers/flavors, to be used only by uCPE" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vdisk" name="vdisk" + type="java.lang.Long"> + <xml-properties> + <xml-property name="description" + value="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only uCPE" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vdiskUnits" name="vdisk-units" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only by uCPE" /> + </xml-properties> + </xml-element> + <xml-element default-value="false" required="true" + java-attribute="inMaint" name="in-maint" type="java.lang.Boolean"> + <xml-properties> + <xml-property name="defaultValue" value="false" /> + <xml-property name="description" + value="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." /> + </xml-properties> + </xml-element> + <xml-element default-value="false" required="true" + java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" + type="java.lang.Boolean"> + <xml-properties> + <xml-property name="defaultValue" value="false" /> + <xml-property name="description" + value="used to indicate whether closed loop function is enabled on this node" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="summaryStatus" name="summary-status" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="details regarding the generic-vnf operation, PLEASE DISCONTINUE USE OF THIS FIELD." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="encryptedAccessFlag" name="encrypted-access-flag" + type="java.lang.Boolean"> + <xml-properties> + <xml-property name="description" + value="indicates whether generic-vnf access uses SSH" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="entitlementAssignmentGroupUuid" + name="entitlement-assignment-group-uuid" type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="UUID of the Entitlement group used for licensing VNFs, OBSOLETE - See child relationships." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="entitlementResourceUuid" + name="entitlement-resource-uuid" type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="UUID of the specific entitlement resource. OBSOLETE - See child relationships." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="licenseAssignmentGroupUuid" + name="license-assignment-group-uuid" type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="UUID of the license assignment group. OBSOLETE - See child relationships." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="licenseKeyUuid" name="license-key-uuid" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="UUID of the actual license resource. OBSOLETE - See child relationships." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="modelInvariantId" name="model-invariant-id" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="the ASDC model id for this resource or service model." /> + <xml-property name="visibility" value="deployment" /> + <xml-property name="dbAlias" value="model-invariant-id-local" /> + <xml-property name="requires" value="model-version-id" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="modelVersionId" name="model-version-id" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="the ASDC model version for this resource or service model." /> + <xml-property name="visibility" value="deployment" /> + <xml-property name="dbAlias" value="model-version-id-local" /> + <xml-property name="requires" value="model-invariant-id" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="personaModelVer" name="persona-model-ver" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="the ASDC model version for this resource or service model." /> + <xml-property name="visibility" value="internal" /> + <xml-property name="dataCopy" + value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="notVisibleTestElement" + name="not-visible-test-element" type="java.lang.String"> + <xml-properties> + <xml-property name="visibility" value="internal" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="modelCustomizationId" name="model-customization-id" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="captures the id of all the configuration used to customize the resource for the service." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="widgetModelId" name="widget-model-id" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="the ASDC data dictionary widget model. This maps directly to the A&AI widget." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="widgetModelVersion" name="widget-model-version" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="asNumber" name="as-number" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="as-number of the VNF" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="regionalResourceSubzone" + name="regional-resource-subzone" type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="represents sub zone of the rr plane" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="nfType" name="nf-type" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="Generic description of the type of NF" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="nfFunction" name="nf-function" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="English description of Network function that the specific VNF deployment is providing" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="nfRole" name="nf-role" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="role in the network that this model will be providing" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="nfNamingCode" name="nf-naming-code" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" + value="string assigned to this model used for naming purposes" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="selflink" name="selflink" + type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Path to the controller object." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="testObjects" name="test-objects" type="inventory.aai.onap.org.v11.TestObjects" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> + + </java-attributes> + <xml-properties> + <xml-property name="description" value="General purpose VNF" /> + <xml-property name="nameProps" value="vnf-name" /> + <xml-property name="indexedProps" + value="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,nf-type,nf-function,nf-naming-code,nf-role" /> + <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" /> + <xml-property name="uniqueProps" value="vnf-id" /> + <xml-property name="container" value="test-objects" /> + <xml-property name="namespace" value="network" /> + <xml-property name="extends" value="vnf" /> + </xml-properties> + </java-type> </java-types> </xml-bindings> diff --git a/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v2.xml b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v2.xml new file mode 100644 index 00000000..c3b30b45 --- /dev/null +++ b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v2.xml @@ -0,0 +1,1726 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- + ============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========================================================= + --> + +<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org" xml-mapping-metadata-complete="true"> + <xml-schema element-form-default="QUALIFIED"> + <xml-ns namespace-uri="http://org.openecomp.aai.inventory" /> + </xml-schema> + <java-types> + <java-type name="Inventory"> + <xml-root-element name="inventory" /> + <java-attributes> + <xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.Search" /> + <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.Actions" /> + <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.CloudInfrastructure" /> + <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.Business" /> + <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.ServiceDesignAndCreation" /> + <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.Network" /> + <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.AaiInternal" /> + </java-attributes> + </java-type> + + <java-type name="Search"> + <xml-root-element name="search" /> + <java-attributes> + <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.SearchResults" /> + <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.SdnZoneResponse" /> + </java-attributes> + </java-type> + + <java-type name="SearchResults"> + <xml-root-element name="search-results" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.ResultData" /> + </java-attributes> + </java-type> + + <java-type name="ResultData"> + <xml-root-element name="result-data" /> + <java-attributes> + <xml-element java-attribute="resourceType" name="resource-type" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="The specific type of node in the A&AI graph" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceLink" name="resource-link" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="The URL to the specific resource" /> + </xml-properties> + </xml-element> + </java-attributes> + </java-type> + <java-type name="SdnZoneResponse"> + <xml-root-element name="sdn-zone-response" /> + <java-attributes> + <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.OamNetworks" /> + <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.AzAndDvsSwitches" /> + </java-attributes> + </java-type> + + <java-type name="AzAndDvsSwitches"> + <xml-root-element name="az-and-dvs-switches" /> + <java-attributes> + <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.DvsSwitches" /> + <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.AvailabilityZone" /> + </java-attributes> + </java-type> + + <java-type name="Actions"> + <xml-properties> + <xml-property name="description" value="Ignore the RESTCONF paths for this. It will be aai/{version}/actions/update only." /> + </xml-properties> + <xml-root-element name="actions" /> + <java-attributes> + <xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.Update" /> + </java-attributes> + </java-type> + + <java-type name="Update"> + <xml-root-element name="update" /> + <java-attributes> + <xml-element java-attribute="updateNodeType" name="update-node-type" required="true" type="java.lang.String" /> + <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.Action" /> + <xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.UpdateNodeKey" /> + </java-attributes> + </java-type> + + <java-type name="Action"> + <xml-root-element name="action" /> + <java-attributes> + <xml-element java-attribute="actionType" name="action-type" type="java.lang.String" /> + <xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.onap.org.ActionData" /> + </java-attributes> + </java-type> + + <java-type name="ActionData"> + <xml-root-element name="action-data" /> + <java-attributes> + <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" /> + <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" /> + </java-attributes> + </java-type> + + <java-type name="UpdateNodeKey"> + <xml-root-element name="update-node-key" /> + <java-attributes> + <xml-element java-attribute="keyName" name="key-name" type="java.lang.String" /> + <xml-element java-attribute="keyValue" name="key-value" type="java.lang.String" /> + </java-attributes> + </java-type> + + <java-type name="CloudInfrastructure"> + <xml-root-element name="cloud-infrastructure" /> + <java-attributes> + <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.Complexes" /> + <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.Tenants" /> + <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.Flavors" /> + <xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.Images" /> + <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.DvsSwitches" /> + <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.Pservers" /> + <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.OamNetworks" /> + <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.AvailabilityZones" /> + <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.VirtualDataCenters" /> + </java-attributes> + </java-type> + + <java-type name="Complexes"> + <xml-properties> + <xml-property name="description" value="Complex housing an LCP instance. In 1504, this data comes from RCT in a file processed on a schedule defined in crontab. A&AI has code to parse the file and take action on the graph using our REST APIs." /> + </xml-properties> + <xml-root-element name="complexes" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.Complex" /> + </java-attributes> + </java-type> + + <java-type name="Complex"> + <xml-root-element name="complex" /> + <java-attributes> + <xml-element java-attribute="physicalLocationId" name="physical-location-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Unique identifier for physical location, e.g., CLLI" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="dataCenterCode" name="data-center-code" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Data center code which can be an alternate way to identify a complex" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Gamma complex name for LCP instance." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="physicalLocationType" name="physical-location-type" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Type, e.g., central office, data center." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="street1" name="street1" required="true" type="java.lang.String" /> + <xml-element java-attribute="street2" name="street2" type="java.lang.String" /> + <xml-element java-attribute="city" name="city" required="true" type="java.lang.String" /> + <xml-element java-attribute="state" name="state" required="true" type="java.lang.String" /> + <xml-element java-attribute="postalCode" name="postal-code" required="true" type="java.lang.String" /> + <xml-element java-attribute="country" name="country" required="true" type="java.lang.String" /> + <xml-element java-attribute="region" name="region" required="true" type="java.lang.String" /> + <xml-element java-attribute="latitude" name="latitude" type="java.lang.String" /> + <xml-element java-attribute="longitude" name="longitude" type="java.lang.String" /> + <xml-element java-attribute="elevation" name="elevation" type="java.lang.String" /> + <xml-element java-attribute="lata" name="lata" type="java.lang.String" /> + <xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.CtagPools" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="indexedProps" value="data-center-code,complex-name,physical-location-id" /> + <xml-property name="uniqueProps" value="physical-location-id" /> + <xml-property name="container" value="complexes" /> + <xml-property name="namespace" value="cloud-infrastructure" /> + </xml-properties> + </java-type> + + <java-type name="RelationshipList"> + <xml-root-element name="relationship-list" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.Relationship" /> + </java-attributes> + </java-type> + + <java-type name="Relationship"> + <xml-root-element name="relationship" /> + <java-attributes> + <xml-element java-attribute="relatedTo" name="related-to" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="A keyword provided by A&AI to indicate type of node." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relatedLink" name="related-link" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="URL to the object in A&AI." /> + </xml-properties> + </xml-element> + <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.RelationshipData" /> + </java-attributes> + </java-type> + + <java-type name="RelationshipData"> + <xml-root-element name="relationship-data" /> + <java-attributes> + <xml-element java-attribute="relationshipKey" name="relationship-key" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="A keyword provided by A&AI to indicate an attribute." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipValue" name="relationship-value" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Value of the attribute." /> + </xml-properties> + </xml-element> + </java-attributes> + </java-type> + + <java-type name="CtagPools"> + <xml-root-element name="ctag-pools" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.CtagPool" /> + </java-attributes> + </java-type> + + <java-type name="CtagPool"> + <xml-root-element name="ctag-pool" /> + <java-attributes> + <xml-element java-attribute="targetPe" name="target-pe" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="The Target provider edge router" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Name of the availability zone" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="ctagPoolPurpose" name="ctag-pool-purpose" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="ctagValues" name="ctag-values" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Comma separated list of ctags" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="indexedProps" value="availability-zone-name" /> + <xml-property name="dependentOn" value="complex" /> + <xml-property name="container" value="ctag-pools" /> + </xml-properties> + </java-type> + + <java-type name="Tenants"> + <xml-properties> + <xml-property name="description" value="OpenStack tenant. In 1504, RO will PUT the tenant to A&AI. Relationship list is used to link to service-subscription." /> + </xml-properties> + <xml-root-element name="tenants" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.Tenant" /> + </java-attributes> + </java-type> + + <java-type name="Tenant"> + <xml-root-element name="tenant" /> + <java-attributes> + <xml-element java-attribute="tenantId" name="tenant-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Unique id relative to the platform, assuming unique across AT&T for now" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="tenantName" name="tenant-name" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Readable name of tenant" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vservers" name="vservers" type="inventory.aai.onap.org.Vservers" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="Relationship-list must include related to of service-subscription and keys for global-customer-id and service-type." /> + <xml-property name="nameProps" value="tenant-name" /> + <xml-property name="indexedProps" value="tenant-id" /> + <xml-property name="uniqueProps" value="tenant-id" /> + <xml-property name="container" value="tenants" /> + <xml-property name="namespace" value="cloud-infrastructure" /> + </xml-properties> + </java-type> + + <java-type name="Vservers"> + <xml-properties> + <xml-property name="description" value="Virtual Server, with its ipaddresses and block storage volumes. In 1504, this REST interface is unused. Instead, the hand coded vserver REST API from Trinity was modified to take the relationship list structure. In 1507, we hope to negotiate with RO to change to use our Yang-driven vserver, image, flavor, etc. Relationship list is used to link to VNF (vce and generic-vnf, etc.)." /> + </xml-properties> + <xml-root-element name="vservers" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.Vserver" /> + </java-attributes> + </java-type> + + <java-type name="Vserver"> + <xml-root-element name="vserver" /> + <java-attributes> + <xml-element java-attribute="vserverId" name="vserver-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Unique identifier for this vserver relative to its tenant" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vserverName" name="vserver-name" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Name of vserver" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vserverName2" name="vserver-name2" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Alternative name of vserver" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." /> + <xml-property name="readOnly" value="legacy-v2" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vserverSelflink" name="vserver-selflink" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="URL that points to source of truth for this resource" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="volumes" name="volumes" type="inventory.aai.onap.org.Volumes" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" /> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.LInterfaces" /> + </java-attributes> + <xml-properties> + <xml-property name="nameProps" value="vserver-name" /> + <xml-property name="indexedProps" value="vserver-name,vserver-id,vserver-name2" /> + <xml-property name="uniqueProps" value="vserver-id" /> + <xml-property name="dependentOn" value="tenant" /> + <xml-property name="container" value="vservers" /> + </xml-properties> + </java-type> + + <java-type name="LInterfaces"> + <xml-root-element name="l-interfaces" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.LInterface" /> + </java-attributes> + </java-type> + + <java-type name="LInterface"> + <xml-root-element name="l-interface" /> + <java-attributes> + <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true" /> + <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String" /> + <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="E.g., CUSTOMER, UPLINK, etc." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="v6WanLinkIp" name="v6-wan-link-ip" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.Vlans" /> + <xml-element java-attribute="networkName" name="network-name" type="java.lang.String" /> + <xml-element java-attribute="selflink" name="selflink" type="java.lang.String" /> + + <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.L3InterfaceIpv4AddressList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.L3InterfaceIpv6AddressList" /> + </java-attributes> + <xml-properties> + <xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver" /> + <xml-property name="container" value="l-interfaces" /> + </xml-properties> + </java-type> + + <java-type name="Vlans"> + <xml-root-element name="vlans" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.Vlan" /> + </java-attributes> + </java-type> + + <java-type name="Vlan"> + <xml-root-element name="vlan" /> + <java-attributes> + <xml-element java-attribute="vlanInterface" name="vlan-interface" required="true" type="java.lang.String" xml-key="true" /> + <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long" /> + <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long" /> + <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.L3InterfaceIpv4AddressList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.L3InterfaceIpv6AddressList" /> + </java-attributes> + <xml-properties> + <xml-property name="indexedProps" value="vlan-interface" /> + <xml-property name="dependentOn" value="l-interface" /> + <xml-property name="container" value="vlans" /> + </xml-properties> + </java-type> + + <java-type name="L3InterfaceIpv4AddressList"> + <xml-root-element name="l3-interface-ipv4-address-list" /> + <java-attributes> + <xml-element java-attribute="l3InterfaceIpv4Address" name="l3-interface-ipv4-address" required="true" type="java.lang.String" xml-key="true" /> + <xml-element java-attribute="l3InterfaceIpv4PrefixLength" name="l3-interface-ipv4-prefix-length" type="java.lang.Long" /> + <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean"> + <xml-properties> + <xml-property name="description" value="Indicator of fixed or floating address" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="indexedProps" value="l3-interface-ipv4-address" /> + <xml-property name="dependentOn" value="vlan" /> + </xml-properties> + </java-type> + + <java-type name="L3InterfaceIpv6AddressList"> + <xml-root-element name="l3-interface-ipv6-address-list" /> + <java-attributes> + <xml-element java-attribute="l3InterfaceIpv6Address" name="l3-interface-ipv6-address" required="true" type="java.lang.String" xml-key="true" /> + <xml-element java-attribute="l3InterfaceIpv6PrefixLength" name="l3-interface-ipv6-prefix-length" type="java.lang.Long" /> + <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean"> + <xml-properties> + <xml-property name="description" value="Indicator of fixed or floating address" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="indexedProps" value="l3-interface-ipv6-address" /> + <xml-property name="dependentOn" value="vlan" /> + </xml-properties> + </java-type> + + <java-type name="Volumes"> + <xml-properties> + <xml-property name="description" value="Block storage volume. In 1504, RO is expected to send this to A&AI." /> + </xml-properties> + <xml-root-element name="volumes" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.Volume" /> + </java-attributes> + </java-type> + + <java-type name="Volume"> + <xml-root-element name="volume" /> + <java-attributes> + <xml-element java-attribute="volumeId" name="volume-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Unique ID of block storage volume relative to the vserver." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="volumeSelflink" name="volume-selflink" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="URL to block storage volume in source of truth" /> + </xml-properties> + </xml-element> + </java-attributes> + <xml-properties> + <xml-property name="indexedProps" value="volume-id" /> + <xml-property name="dependentOn" value="vserver" /> + <xml-property name="container" value="volumes" /> + </xml-properties> + </java-type> + + <java-type name="Flavors"> + <xml-properties> + <xml-property name="description" value="Openstack flavor. In 1504, this REST interface is unused. The data is populated by RO through the hand-coded vserver interface rather than through its own REST API. Expect this to change when we can negotiate with RO to PUT this data or we change our code to trigger a dispatcher job to go get flavor if it is missing when RO PUTs a vserver." /> + </xml-properties> + <xml-root-element name="flavors" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.Flavor" /> + </java-attributes> + </java-type> + + <java-type name="Flavor"> + <xml-root-element name="flavor" /> + <java-attributes> + <xml-element java-attribute="flavorId" name="flavor-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Flavor id, expected to be unique across A&AI." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="flavorName" name="flavor-name" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Flavor name" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="flavorVcpus" name="flavor-vcpus" type="java.lang.Integer"> + <xml-properties> + <xml-property name="description" value="Number of CPUs" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="flavorRam" name="flavor-ram" type="java.lang.Integer"> + <xml-properties> + <xml-property name="description" value="Amount of memory" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="flavorDisk" name="flavor-disk" type="java.lang.Integer"> + <xml-properties> + <xml-property name="description" value="Disk space" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="flavorEphemeral" name="flavor-ephemeral" type="java.lang.Integer"> + <xml-properties> + <xml-property name="description" value="Amount of ephemeral disk space" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="flavorSwap" name="flavor-swap" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="amount of swap space allocation" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="flavorIsPublic" name="flavor-is-public" type="java.lang.Boolean"> + <xml-properties> + <xml-property name="description" value="whether flavor is available to all users or private to the tenant it was created in." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="flavorSelflink" name="flavor-selflink" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Link provided by source of truth to get more details." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="flavorDisabled" name="flavor-disabled" type="java.lang.Boolean"> + <xml-properties> + <xml-property name="description" value="Boolean as to whether this flavor is no longer enabled" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="nameProps" value="flavor-name" /> + <xml-property name="indexedProps" value="flavor-name,flavor-id" /> + <xml-property name="uniqueProps" value="flavor-id" /> + <xml-property name="container" value="flavors" /> + <xml-property name="namespace" value="cloud-infrastructure" /> + </xml-properties> + </java-type> + + <java-type name="Images"> + <xml-properties> + <xml-property name="description" value="Openstack image. In 1504, this REST interface is unused. The image data is populated by RO through the hand-coded vserver interface rather than through its own REST API. Expect this to change when we can negotiate with RO to PUT this data or we change our code to trigger a dispatcher job to go get image if it is missing when RO PUTs a vserver." /> + </xml-properties> + <xml-root-element name="images" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.Image" /> + </java-attributes> + </java-type> + + <java-type name="Image"> + <xml-root-element name="image" /> + <java-attributes> + <xml-element java-attribute="imageId" name="image-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Image id, expected to be unique across A&AI" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="imageName" name="image-name" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Image name" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="imageArchitecture" name="image-architecture" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Operating system architecture." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="imageOsDistro" name="image-os-distro" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="The common name of the operating system distribution in lowercase" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="imageOsVersion" name="image-os-version" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="The operating system version as specified by the distributor." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="application" name="application" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="The application that the image instantiates." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="The vendor of the application." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="The version of the application." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="imageSelflink" name="image-selflink" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Link provided by source of truth to get more details." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="Metadata must include application, application-vendor, and application-version" /> + <xml-property name="nameProps" value="image-name" /> + <xml-property name="indexedProps" value="image-name,image-id" /> + <xml-property name="uniqueProps" value="image-id" /> + <xml-property name="container" value="images" /> + <xml-property name="namespace" value="cloud-infrastructure" /> + </xml-properties> + </java-type> + + <java-type name="DvsSwitches"> + <xml-properties> + <xml-property name="description" value="Digital Virtual Switch/Virtual Digital Switch container for switch name and vcenter URL, used by SDN-C to configure VCEs. In 1504, A&AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&AI. Relationship list is used to link to availability-zone." /> + </xml-properties> + <xml-root-element name="dvs-switches" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.DvsSwitch" /> + </java-attributes> + </java-type> + + <java-type name="DvsSwitch"> + <xml-root-element name="dvs-switch" /> + <java-attributes> + <xml-element java-attribute="switchName" name="switch-name" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="DVS switch name" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vcenterUrl" name="vcenter-url" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="URL used to reach the vcenter" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="indexedProps" value="vcenter-url,switch-name" /> + <xml-property name="container" value="dvs-switches" /> + <xml-property name="namespace" value="cloud-infrastructure" /> + </xml-properties> + </java-type> + + <java-type name="Pservers"> + <xml-properties> + <xml-property name="description" value="Compute node. In 1504, this data comes from RCT in a file processed on a schedule defined in crontab. A&AI has code to parse the file and take action on the graph using our REST APIs. Relationship-list is used to link to complex." /> + </xml-properties> + <xml-root-element name="pservers" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.Pserver" /> + </java-attributes> + </java-type> + + <java-type name="Pserver"> + <xml-root-element name="pserver" /> + <java-attributes> + <xml-element java-attribute="hostname" name="hostname" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Value from executing hostname on the compute node." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="ptniiEquipName" name="ptnii-equip-name" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="PTNII name" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="numberOfCpus" name="number-of-cpus" type="java.lang.Integer"> + <xml-properties> + <xml-property name="description" value="Number of cpus" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="diskInGigabytes" name="disk-in-gigabytes" type="java.lang.Integer"> + <xml-properties> + <xml-property name="description" value="Disk size, in GBs" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="ramInMegabytes" name="ram-in-megabytes" type="java.lang.Integer"> + <xml-properties> + <xml-property name="description" value="RAM size, in MBs" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Equipment type. Source of truth should define valid values." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Equipment vendor. Source of truth should define valid values." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Equipment model. Source of truth should define valid values." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="fqdn" name="fqdn" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Fully-qualified domain name" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="pserverSelflink" name="pserver-selflink" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Link provided by source of truth to get more details." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used to configure device, also used for troubleshooting and is IP used for traps generated by device." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" /> + <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.PInterfaces" /> + <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.LagInterfaces" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="Relationship list must contain related-to of complex with key data of physical-location-id" /> + <xml-property name="indexedProps" value="hostname" /> + <xml-property name="container" value="pservers" /> + <xml-property name="namespace" value="cloud-infrastructure" /> + </xml-properties> + </java-type> + + <java-type name="PInterfaces"> + <xml-root-element name="p-interfaces" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.PInterface" /> + </java-attributes> + </java-type> + + <java-type name="PInterface"> + <xml-root-element name="p-interface" /> + <java-attributes> + <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true" /> + <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Captures the numeric part of the speed" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Captures the units corresponding to the speed" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.LInterfaces" /> + </java-attributes> + <xml-properties> + <xml-property name="dependentOn" value="vpls-pe,pserver" /> + <xml-property name="container" value="p-interfaces" /> + </xml-properties> + </java-type> + + <java-type name="LagInterfaces"> + <xml-root-element name="lag-interfaces" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.LagInterface" /> + </java-attributes> + </java-type> + + <java-type name="LagInterface"> + <xml-root-element name="lag-interface" /> + <java-attributes> + <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true" /> + </java-attributes> + <xml-properties> + <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe" /> + <xml-property name="container" value="lag-interfaces" /> + </xml-properties> + </java-type> + + <java-type name="OamNetworks"> + <xml-properties> + <xml-property name="description" value="Defines the OAM network. In 1504, A&AI expects RO to put all attributes but the ones related to ipv4-oam-gateway-address and prefix. Those need to be hand administered by A&AI through the provisioningTool.sh. Relationship list is used to link to service-capability and complex." /> + </xml-properties> + <xml-root-element name="oam-networks" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.OamNetwork" /> + </java-attributes> + </java-type> + + <java-type name="OamNetwork"> + <xml-root-element name="oam-network" /> + <java-attributes> + <xml-element java-attribute="networkUuid" name="network-uuid" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="UUID of the network. Unique across A&AI." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Name of the network." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="cvlan-id" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer"> + <xml-properties> + <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="Relationship list must contain related-to of service-capability with key data service-type and vnf-type and related-to of complex with key data of physical-location-id" /> + <xml-property name="nameProps" value="network-name" /> + <xml-property name="indexedProps" value="network-uuid" /> + <xml-property name="container" value="oam-networks" /> + <xml-property name="namespace" value="cloud-infrastructure" /> + </xml-properties> + </java-type> + + <java-type name="AvailabilityZones"> + <xml-properties> + <xml-property name="description" value="Availability zones group physical servers. In 1504, A&AI expects to receive all attributes from RO through REST. Relationship list is used to link to service-capability and complex." /> + </xml-properties> + <xml-root-element name="availability-zones" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.AvailabilityZone" /> + </java-attributes> + </java-type> + + <java-type name="AvailabilityZone"> + <xml-root-element name="availability-zone" /> + <java-attributes> + <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Name of the availability zone. Unique across A&AI for all services." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="hypervisorType" name="hypervisor-type" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Type of hypervisor. Source of truth should define valid values." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="State that indicates whether the availability zone should be used, etc. Source of truth should define valid values." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="Relationship list must contain related-to of service-capability with key data service-type and vnf-type and related-to of complex with key data of physical-location-id" /> + <xml-property name="indexedProps" value="availability-zone-name" /> + <xml-property name="container" value="availability-zones" /> + <xml-property name="namespace" value="cloud-infrastructure" /> + </xml-properties> + </java-type> + + <java-type name="VirtualDataCenters"> + <xml-properties> + <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" /> + </xml-properties> + <xml-root-element name="virtual-data-centers" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.VirtualDataCenter" /> + </java-attributes> + </java-type> + + <java-type name="VirtualDataCenter"> + <xml-root-element name="virtual-data-center" /> + <java-attributes> + <xml-element java-attribute="vdcId" name="vdc-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Unique ID of the vdc" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vdcName" name="vdc-name" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Name of the virtual data center" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" /> + <xml-property name="nameProps" value="vdc-name" /> + <xml-property name="indexedProps" value="vdc-id" /> + <xml-property name="container" value="virtual-data-centers" /> + <xml-property name="namespace" value="cloud-infrastructure" /> + </xml-properties> + </java-type> + + <java-type name="Business"> + <xml-root-element name="business" /> + <java-attributes> + <xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.Customers" /> + </java-attributes> + </java-type> + + <java-type name="Customers"> + <xml-root-element name="customers" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.Customer" /> + </java-attributes> + </java-type> + + <java-type name="Customer"> + <xml-root-element name="customer" /> + <java-attributes> + <xml-element java-attribute="globalCustomerId" name="global-customer-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Global customer id used across ECOMP to uniquely identify customer." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="subscriberName" name="subscriber-name" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Subscriber name, an alternate way to retrieve a customer." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.ServiceSubscriptions" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="nameProps" value="subscriber-name" /> + <xml-property name="indexedProps" value="subscriber-name,global-customer-id" /> + <xml-property name="uniqueProps" value="global-customer-id" /> + <xml-property name="container" value="customers" /> + <xml-property name="namespace" value="business" /> + </xml-properties> + </java-type> + + <java-type name="ServiceSubscriptions"> + <xml-root-element name="service-subscriptions" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.ServiceSubscription" /> + </java-attributes> + </java-type> + + <java-type name="ServiceSubscription"> + <xml-root-element name="service-subscription" /> + <java-attributes> + <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Value defined by orchestration to identify this service across ECOMP." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.onap.org.ServiceInstances"> + <xml-properties> + <xml-property name="description" value="Relationship-list used to link to cvlantag and vce." /> + </xml-properties> + </xml-element> + </java-attributes> + <xml-properties> + <xml-property name="indexedProps" value="service-type" /> + <xml-property name="dependentOn" value="customer" /> + <xml-property name="container" value="service-subscriptions" /> + </xml-properties> + </java-type> + + <java-type name="ServiceInstances"> + <xml-root-element name="service-instances" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.ServiceInstance" /> + </java-attributes> + </java-type> + + <java-type name="ServiceInstance"> + <xml-root-element name="service-instance" /> + <java-attributes> + <xml-element java-attribute="serviceInstanceId" name="service-instance-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Corresponds to a customer endpoint for the parent service-subscription." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="indexedProps" value="service-instance-id" /> + <xml-property name="uniqueProps" value="service-instance-id" /> + <xml-property name="dependentOn" value="service-subscription" /> + <xml-property name="container" value="service-instances" /> + </xml-properties> + </java-type> + + <java-type name="ServiceDesignAndCreation"> + <xml-root-element name="service-design-and-creation" /> + <java-attributes> + <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.ServiceCapabilities" /> + </java-attributes> + </java-type> + + <java-type name="ServiceCapabilities"> + <xml-root-element name="service-capabilities" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.ServiceCapability" /> + </java-attributes> + </java-type> + + <java-type name="ServiceCapability"> + <xml-root-element name="service-capability" /> + <java-attributes> + <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="This gets defined by others to provide a unique ID for the VNF type, we accept what is sent." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="indexedProps" value="service-type" /> + <xml-property name="container" value="service-capabilities" /> + <xml-property name="namespace" value="service-design-and-creation" /> + </xml-properties> + </java-type> + + <java-type name="Network"> + <xml-root-element name="network" /> + <java-attributes> + <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.LogicalLinks" /> + <xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.Vces" /> + <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.L3Networks" /> + <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.GenericVnfs" /> + <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.LagLinks" /> + <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.Newvces" /> + <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.VplsPes" /> + <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.PhysicalLinks" /> + </java-attributes> + </java-type> + + <java-type name="LogicalLinks"> + <xml-root-element name="logical-links" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.LogicalLink" /> + </java-attributes> + </java-type> + + <java-type name="LogicalLink"> + <xml-root-element name="logical-link" /> + <java-attributes> + <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="linkType" name="link-type" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Type of logical link, e.g., evc" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Captures the numeric part of the speed" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Captures the units corresponding to the speed" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="v4, v6, or ds for dual stack (should be att-ip-version)" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="For example, static or BGP" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="Logical links can connect l-interfaces" /> + <xml-property name="indexedProps" value="link-name" /> + <xml-property name="container" value="logical-links" /> + <xml-property name="namespace" value="network" /> + </xml-properties> + </java-type> + + <java-type name="Vces"> + <xml-properties> + <xml-property name="description" value="The 1504 global definition of a vce as from MSO/SDN-C. In 1504, SDN-C will PUT this data and MSO will update it. In addition, A&AI will populate interface-name, v6-vce-wan-address, and ipv4-oam-address based on a RESTCONF call? In 1507, we hope to move to the newvce object, which may need a few more attributes. We need a discussion with MSO about orchestration vs. inventory. " /> + </xml-properties> + <xml-root-element name="vces" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.Vce" /> + </java-attributes> + </java-type> + + <java-type name="Vce"> + <xml-root-element name="vce" /> + <java-attributes> + <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Unique id of VNF. This is unique across the graph." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Name of VNF." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Alternate name of VNF." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Type of VNF. Source of truth should define and socialize values. Becomes part of the key to service capability" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Indicator for whether the resource is considered operational" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="License key" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Client should send valid enumerated value" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Orchestration status of this VNF, used by MSO." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vpeId" name="vpe-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Unique ID of VPE connected to this VCE." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="interfaceName" name="interface-name" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="e.g., Vce-0/0.0.57" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="v6VceWanAddress" name="v6-vce-wan-address" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Valid v6 IP address for the WAN Link on this router. Implied length of /64." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.PortGroups" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="nameProps" value="vnf-name" /> + <xml-property name="indexedProps" value="vnf-name2,vnf-name,heat-stack-id,vnf-id,vpe-id" /> + <xml-property name="uniqueProps" value="vnf-id" /> + <xml-property name="container" value="vces" /> + <xml-property name="namespace" value="network" /> + <xml-property name="extends" value="vnf" /> + </xml-properties> + </java-type> + + <java-type name="PortGroups"> + <xml-root-element name="port-groups" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.PortGroup" /> + </java-attributes> + </java-type> + + <java-type name="PortGroup"> + <xml-root-element name="port-group" /> + <java-attributes> + <xml-element java-attribute="interfaceId" name="interface-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Unique ID of the interface" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Neutron network id of this Interface" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="neutronNetworkName" name="neutron-network-name" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Neutron network name of this Interface" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="portGroupId" name="port-group-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Unique ID for port group in vmware" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="portGroupName" name="port-group-name" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Likely to duplicate value of neutron network name" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="switchName" name="switch-name" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="DVS or standard switch name (should be non-null for port groups associated with DVS)" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Orchestration status of this VNF, used by MSO." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.CvlanTags" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="Used to capture the network interfaces of this VCE" /> + <xml-property name="nameProps" value="port-group-name" /> + <xml-property name="indexedProps" value="heat-stack-id,port-group-id,interface-id,switch-name" /> + <xml-property name="dependentOn" value="vce" /> + <xml-property name="container" value="port-groups" /> + </xml-properties> + </java-type> + + <java-type name="CvlanTags"> + <xml-root-element name="cvlan-tags" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.CvlanTagEntry" /> + </java-attributes> + </java-type> + + <java-type name="CvlanTagEntry"> + <xml-root-element name="cvlan-tag-entry" /> + <java-attributes> + <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long" xml-key="true"> + <xml-properties> + <xml-property name="description" value="See mis-na-virtualization-platform.yang" /> + </xml-properties> + </xml-element> + </java-attributes> + <xml-properties> + <xml-property name="dependentOn" value="port-group" /> + <xml-property name="indexedProps" value="cvlan-tag" /> + <xml-property name="container" value="cvlan-tags" /> + </xml-properties> + </java-type> + + + + <java-type name="L3Networks"> + <xml-root-element name="l3-networks" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.L3Network" /> + </java-attributes> + </java-type> + + <java-type name="L3Network"> + <xml-root-element name="l3-network" /> + <java-attributes> + <xml-element java-attribute="networkId" name="network-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Network ID, governed by some naming convention. Unique across A&AI." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="networkUuid" name="network-uuid" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="UUID of the network. Unique across A&AI." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Name of the network, governed by some naming convention.." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="networkType" name="network-type" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Type of the network - who defines these values?" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="ipv4GatewayAddress" name="ipv4-gateway-address" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="IPV4 gateway address" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="ipv4Prefix" name="ipv4-prefix" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="IPV4 prefix" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="ipv6GatewayAddress" name="ipv6-gateway-address" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="IPV6 gateway address" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="ipv6Prefix" name="ipv6-prefix" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="IPV6 prefix" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="Generic network definition" /> + <xml-property name="nameProps" value="network-name" /> + <xml-property name="indexedProps" value="network-uuid,network-id" /> + <xml-property name="uniqueProps" value="network-id" /> + <xml-property name="container" value="l3-networks" /> + <xml-property name="namespace" value="network" /> + </xml-properties> + </java-type> + + <java-type name="GenericVnfs"> + <xml-properties> + <xml-property name="description" value="VNF with no special attributes" /> + </xml-properties> + <xml-root-element name="generic-vnfs" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.GenericVnf" /> + </java-attributes> + </java-type> + + <java-type name="GenericVnf"> + <xml-root-element name="generic-vnf" /> + <java-attributes> + <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Unique id of VNF. This is unique across the graph." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Name of VNF." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Alternate name of VNF." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Type of VNF. Source of truth should define and socialize values. Becomes part of the key to service capability" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Indicator for whether the resource is considered operational" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="License key" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Client should send valid enumerated value" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Orchestration status of this VNF, used by MSO." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" /> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.LInterfaces" /> + <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.LagInterfaces" /> + </java-attributes> + <xml-properties> + <xml-property name="nameProps" value="vnf-name" /> + <xml-property name="indexedProps" value="vnf-name2,vnf-name,heat-stack-id,vnf-id" /> + <xml-property name="uniqueProps" value="vnf-id" /> + <xml-property name="container" value="generic-vnfs" /> + <xml-property name="namespace" value="network" /> + <xml-property name="extends" value="vnf" /> + </xml-properties> + </java-type> + + <java-type name="LagLinks"> + <xml-root-element name="lag-links" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.LagLink" /> + </java-attributes> + </java-type> + + <java-type name="LagLink"> + <xml-root-element name="lag-link" /> + <java-attributes> + <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Alphabetical concatenation of lag-interface names" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="LAG links can connect lag-interfaces" /> + <xml-property name="indexedProps" value="link-name" /> + <xml-property name="container" value="lag-links" /> + <xml-property name="namespace" value="network" /> + </xml-properties> + </java-type> + + <java-type name="Newvces"> + <xml-properties> + <xml-property name="description" value="This is the skeleton of the new VCE object we hope to migrate to in 1507. In 1504, we will use it to store network data gathered from RESTCONF calls to SDN-C. The vnf-id2 leaf needs to be populated with the value of the vce's vnf-id." /> + </xml-properties> + <xml-root-element name="newvces" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.Newvce" /> + </java-attributes> + </java-type> + + <java-type name="Newvce"> + <xml-root-element name="newvce" /> + <java-attributes> + <xml-element java-attribute="vnfId2" name="vnf-id2" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Unique id of VNF, can't use same attribute name right now until we promote this new object" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Name of VNF." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Alternate name of VNF." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Type of VNF. Source of truth should define and socialize values. Becomes part of the key to service capability" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Indicator for whether the resource is considered operational" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="License key" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Client should send valid enumerated value." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Orchestration status of this VNF, used by MSO." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" /> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.LInterfaces" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="Aspirational VCE object which we'll use to capture additional interface details regarding topology." /> + <xml-property name="nameProps" value="vnf-name" /> + <xml-property name="indexedProps" value="vnf-name2,vnf-name,heat-stack-id,vnf-id2" /> + <xml-property name="uniqueProps" value="vnf-id2" /> + <xml-property name="container" value="newvces" /> + <xml-property name="namespace" value="network" /> + </xml-properties> + </java-type> + + <java-type name="VplsPes"> + <xml-root-element name="vpls-pes" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.VplsPe" /> + </java-attributes> + </java-type> + + <java-type name="VplsPe"> + <xml-root-element name="vpls-pe" /> + <java-attributes> + <xml-element java-attribute="equipmentName" name="equipment-name" required="true" type="java.lang.String" xml-key="true" /> + <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Client should send valid enumerated value, e.g., VPLS-PE." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="Temporary location for stag to get to VCE" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" /> + <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.PInterfaces" /> + <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.LagInterfaces" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="Relationship-list must include related to info for complex." /> + <xml-property name="indexedProps" value="equipment-name" /> + <xml-property name="container" value="vpls-pes" /> + <xml-property name="namespace" value="network" /> + </xml-properties> + </java-type> + + <java-type name="PhysicalLinks"> + <xml-root-element name="physical-links" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.PhysicalLink" /> + </java-attributes> + </java-type> + + <java-type name="PhysicalLink"> + <xml-root-element name="physical-link" /> + <java-attributes> + <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Captures the numeric part of the speed" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Captures the units corresponding to the speed" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Circuit it" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="Physical links can connect p-interfaces" /> + <xml-property name="indexedProps" value="circuit-id,link-name" /> + <xml-property name="alternateKeys1" value="circuit-id" /> + <xml-property name="container" value="physical-links" /> + <xml-property name="namespace" value="network" /> + </xml-properties> + </java-type> + + <java-type name="NotificationEvent"> + <xml-root-element name="notification-event" /> + <java-attributes> + <xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.onap.org.NotificationEventHeader" /> + <xml-any-element java-attribute="entity" /> + </java-attributes> + </java-type> + <java-type name="NotificationEventHeader"> + <xml-root-element name="notification-event-header" /> + <java-attributes> + <xml-element java-attribute="id" name="id" type="java.lang.String" /> + <xml-element java-attribute="timestamp" name="timestamp" type="java.lang.String" /> + <xml-element java-attribute="sourceName" name="source-name" type="java.lang.String" /> + <xml-element java-attribute="domain" name="domain" type="java.lang.String" /> + <xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String" /> + <xml-element java-attribute="severity" name="severity" type="java.lang.String" /> + <xml-element java-attribute="eventType" name="event-type" type="java.lang.String" /> + <xml-element java-attribute="version" name="version" type="java.lang.String" /> + <xml-element java-attribute="action" name="action" type="java.lang.String" /> + <xml-element java-attribute="entityType" name="entity-type" type="java.lang.String" /> + <xml-element java-attribute="topEntityType" name="top-entity-type" type="java.lang.String" /> + <xml-element java-attribute="entityLink" name="entity-link" type="java.lang.String" /> + <xml-element java-attribute="status" name="status" type="java.lang.String" /> + </java-attributes> + </java-type> + <java-type name="AaiInternal"> + <xml-root-element name="aai-internal" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.ReservedPropNames" /> + <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.EdgePropNames" /> + </java-attributes> + </java-type> + <java-type name="ReservedPropNames"> + <xml-properties> + <xml-property name="description" value="Internal map to define some reserved properties of a vertex" /> + <xml-property name="uniqueProps" value="aai-unique-key" /> + <xml-property name="indexedProps" value="aai-unique-key" /> + </xml-properties> + <xml-root-element name="reserved-prop-names" /> + <java-attributes> + <xml-element java-attribute="lastModSourceOfTruth" name="last-mod-source-of-truth" type="java.lang.String" /> + <xml-element java-attribute="aaiCreatedTs" name="aai-created-ts" type="java.lang.Long" /> + <xml-element java-attribute="aaiUniqueKey" name="aai-unique-key" type="java.lang.String" /> + <xml-element java-attribute="aaiLastModTs" name="aai-last-mod-ts" type="java.lang.Long" /> + <xml-element java-attribute="sourceOfTruth" name="source-of-truth" type="java.lang.String" /> + </java-attributes> + </java-type> + <java-type name="EdgePropNames"> + <!-- NOTE that the names of these properties are not consistent and are in mixed case and hyphen case for now --> + <xml-properties> + <xml-property name="description" value="Internal map to define the properties of an edge and interpret the map EdgeRules" /> + <xml-property name="edgeInfo" value="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV" /> + </xml-properties> + <xml-root-element name="edge-prop-names" /> + <java-attributes> + <xml-element java-attribute="edgeLabel" name="edgeLabel" type="java.lang.String" /> + <xml-element java-attribute="direction" name="direction" type="java.lang.String" /> + <xml-element java-attribute="multiplicityRule" name="multiplicityRule" type="java.lang.String" /> + <xml-element java-attribute="isParent" name="isParent" type="java.lang.Boolean" /> + <xml-element java-attribute="usesResource" name="usesResource" type="java.lang.Boolean" /> + <xml-element java-attribute="hasDelTarget" name="hasDelTarget" type="java.lang.Boolean" /> + <xml-element java-attribute="SVC-INFRA" name="SVC-INFRA" type="java.lang.String" /> + <xml-element java-attribute="SVC-INFRA-REV" name="SVC-INFRA-REV" type="java.lang.String" /> + </java-attributes> + </java-type> + <java-type name="Vnf"> + <xml-root-element name="vnf"/> + <java-attributes> + <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Unique id of VNF. This is unique across the graph." /> + </xml-properties> + </xml-element> + </java-attributes> + <xml-properties> + <xml-property name="description" value="Abstract vnf class" /> + <xml-property name="indexedProps" value="vnf-id" /> + <xml-property name="uniqueProps" value="vnf-id" /> + <xml-property name="inheritors" value="vce,generic-vnf" /> + <xml-property name="abstract" value="true" /> + </xml-properties> + </java-type> + </java-types> +</xml-bindings> diff --git a/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v8.xml b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v8.xml index d8f81533..b5a64c87 100644 --- a/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v8.xml +++ b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v8.xml @@ -19,312 +19,51 @@ ============LICENSE_END========================================================= --> -<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.openecomp.org.v8" xml-mapping-metadata-complete="true"> +<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v8" xml-mapping-metadata-complete="true"> <xml-schema element-form-default="QUALIFIED"> - <xml-ns namespace-uri="http://org.openecomp.aai.inventory/v8" /> + <xml-ns namespace-uri="http://com.att.aai.inventory/v8" /> </xml-schema> <java-types> - <java-type name="Inventory"> - <xml-root-element name="inventory" /> + <java-type name="LicenseKeyResources"> + <xml-root-element name="license-key-resources" /> <java-attributes> - <xml-element java-attribute="search" name="search" type="inventory.aai.openecomp.org.v8.Search" /> - <xml-element java-attribute="actions" name="actions" type="inventory.aai.openecomp.org.v8.Actions" /> - <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.openecomp.org.v8.CloudInfrastructure" /> - <xml-element java-attribute="business" name="business" type="inventory.aai.openecomp.org.v8.Business" /> - <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.openecomp.org.v8.ServiceDesignAndCreation" /> - <xml-element java-attribute="network" name="network" type="inventory.aai.openecomp.org.v8.Network" /> - <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.openecomp.org.v8.AaiInternal" /> + <xml-element container-type="java.util.ArrayList" java-attribute="licenseKeyResource" name="license-key-resource" type="inventory.aai.onap.org.v8.LicenseKeyResource" /> </java-attributes> </java-type> - <java-type name="Search"> - <xml-root-element name="search" /> + <java-type name="LicenseKeyResource"> + <xml-root-element name="license-key-resource" /> <java-attributes> - <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.openecomp.org.v8.SearchResults" /> - </java-attributes> - </java-type> - - - <java-type name="TaggedInventoryItemList"> - <xml-root-element name="tagged-inventory-item-list" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.openecomp.org.v8.InventoryItem" /> - </java-attributes> - </java-type> - - <java-type name="InventoryItem"> - <xml-root-element name="inventory-item" /> - <java-attributes> - <xml-element java-attribute="inventoryItemType" name="inventory-item-type" type="java.lang.String" /> - <xml-element java-attribute="inventoryItemLink" name="inventory-item-link" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.openecomp.org.v8.InventoryItemData" /> - <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.openecomp.org.v8.TaggedInventoryItemList" /> - </java-attributes> - </java-type> - - <java-type name="InventoryItemData"> - <xml-root-element name="inventory-item-data" /> - <java-attributes> - <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" /> - <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" /> - </java-attributes> - </java-type> - - - <java-type name="StartNodeFilter"> - <xml-root-element name="start-node-filter" /> - <java-attributes> - <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" /> - <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" /> - </java-attributes> - </java-type> - - <java-type name="IncludeNodeFilter"> - <xml-root-element name="include-node-filter" /> - <java-attributes> - <xml-element java-attribute="includeNodeType" name="include-node-type" type="java.lang.String" /> - </java-attributes> - </java-type> - - <java-type name="SecondaryFilter"> - <xml-root-element name="secondary-filter" /> - <java-attributes> - <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" /> - <xml-element java-attribute="filterType" name="filter-type" type="java.lang.String" /> - <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" /> - </java-attributes> - </java-type> - - <java-type name="SearchResults"> - <xml-root-element name="search-results" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.openecomp.org.v8.ResultData" /> - </java-attributes> - </java-type> - - <java-type name="ResultData"> - <xml-root-element name="result-data" /> - <java-attributes> - <xml-element java-attribute="resourceType" name="resource-type" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The specific type of node in the AAI graph" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceLink" name="resource-link" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The URL to the specific resource" /> - </xml-properties> - </xml-element> - </java-attributes> - </java-type> - - <java-type name="Actions"> - <xml-properties> - <xml-property name="description" value="APIs that are more action related than REST (e.g., notify, update)." /> - </xml-properties> - <xml-root-element name="actions" /> - <java-attributes> - <xml-element java-attribute="update" name="update" type="inventory.aai.openecomp.org.v8.Update" /> - <xml-element java-attribute="notify" name="notify" type="inventory.aai.openecomp.org.v8.Notify" /> - </java-attributes> - </java-type> - - <java-type name="Update"> - <xml-properties> - <xml-property name="description" value="Serves a PATCH like function. Does not enforce concurrency control." /> - </xml-properties> - <xml-root-element name="update" /> - <java-attributes> - <xml-element java-attribute="updateNodeType" name="update-node-type" required="true" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.openecomp.org.v8.UpdateNodeKey" /> - <xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.openecomp.org.v8.Action" /> - </java-attributes> - </java-type> - - <java-type name="Action"> - <xml-root-element name="action" /> - <java-attributes> - <xml-element java-attribute="actionType" name="action-type" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.openecomp.org.v8.ActionData" /> - </java-attributes> - </java-type> - - <java-type name="ActionData"> - <xml-root-element name="action-data" /> - <java-attributes> - <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" /> - <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" /> - </java-attributes> - </java-type> - - <java-type name="UpdateNodeKey"> - <xml-root-element name="update-node-key" /> - <java-attributes> - <xml-element java-attribute="keyName" name="key-name" type="java.lang.String" /> - <xml-element java-attribute="keyValue" name="key-value" type="java.lang.String" /> - </java-attributes> - </java-type> - - <java-type name="Notify"> - <xml-root-element name="notify" /> - <java-attributes> - <xml-element java-attribute="eventId" name="event-id" required="true" type="java.lang.String" /> - <xml-element java-attribute="nodeType" name="node-type" type="java.lang.String" /> - <xml-element java-attribute="eventTrigger" name="event-trigger" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.openecomp.org.v8.KeyData" /> - <xml-element java-attribute="selflink" name="selflink" type="java.lang.String" /> - </java-attributes> - </java-type> - - <java-type name="KeyData"> - <xml-root-element name="key-data" /> - <java-attributes> - <xml-element java-attribute="keyName" name="key-name" type="java.lang.String" /> - <xml-element java-attribute="keyValue" name="key-value" type="java.lang.String" /> - </java-attributes> - </java-type> - - <java-type name="CloudInfrastructure"> - <xml-properties> - <xml-property name="description" value="Namespace for cloud infrastructure." /> - </xml-properties> - <xml-root-element name="cloud-infrastructure" /> - <java-attributes> - <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.openecomp.org.v8.CloudRegions" /> - <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.openecomp.org.v8.Pservers" /> - </java-attributes> - </java-type> - - <java-type name="CloudRegions"> - <xml-root-element name="cloud-regions" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.openecomp.org.v8.CloudRegion" /> - </java-attributes> - </java-type> - - <java-type name="CloudRegion"> - <xml-root-element name="cloud-region" /> - <java-attributes> - <xml-element java-attribute="cloudOwner" name="cloud-owner" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Identifier used by the vendor for the region. Second part of composite key" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="cloudType" name="cloud-type" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Type of the cloud (e.g., openstack)" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ownerDefinedType" name="owner-defined-type" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Cloud-owner defined type indicator" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="cloudRegionVersion" name="cloud-region-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Software version employed at the site" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="URL of the keystone identity service" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="cloudZone" name="cloud-zone" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Zone where the cloud is homed" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="complex name for cloud-region instance" /> - </xml-properties> - </xml-element> + <xml-element java-attribute="attUuid" name="att-uuid" required="true" type="java.lang.String" xml-key="true" /> + <xml-element java-attribute="assignmentType" name="assignment-type" type="java.lang.String" /> + <xml-element java-attribute="assignmentStatus" name="assignment-status" type="java.lang.String" /> + <xml-element java-attribute="assignmentGroupUuid" name="assignment-group-uuid" required="true" type="java.lang.String" /> + <xml-element java-attribute="assignmentDate" name="assignment-date" type="java.lang.String" /> + <xml-element java-attribute="name" name="name" type="java.lang.String" /> + <xml-element java-attribute="modelUuid" name="model-uuid" type="java.lang.String" /> + <xml-element java-attribute="modelVersion" name="model-version" type="java.lang.String" /> + <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String" /> + <xml-element java-attribute="licenseKeyFileUrl" name="license-key-file-url" type="java.lang.String" /> + <xml-element container-type="java.util.ArrayList" java-attribute="supplierReleaseList" name="supplier-release-list" type="java.lang.String" /> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.openecomp.org.v8.VolumeGroups" /> - <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.openecomp.org.v8.Tenants" /> - <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.openecomp.org.v8.Flavors" /> - <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.openecomp.org.v8.GroupAssignments" /> - <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.openecomp.org.v8.Snapshots" /> - <xml-element java-attribute="images" name="images" type="inventory.aai.openecomp.org.v8.Images" /> - <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.openecomp.org.v8.AvailabilityZones" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" /> </java-attributes> <xml-properties> - <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname." /> - <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type" /> - <xml-property name="nameProps" value="owner-defined-type" /> - <xml-property name="container" value="cloud-regions" /> - <xml-property name="namespace" value="cloud-infrastructure" /> - </xml-properties> - </java-type> - <java-type name="VolumeGroups"> - <xml-properties> - <xml-property name="description" value="Collection of persistent block-level storage." /> + <xml-property name="nameProps" value="name" /> + <xml-property name="indexedProps" value="assignment-group-uuid,att-uuid,name" /> + <xml-property name="uniqueProps" value="att-uuid" /> + <xml-property name="container" value="license-key-resources" /> + <xml-property name="namespace" value="license-management" /> </xml-properties> - <xml-root-element name="volume-groups" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.openecomp.org.v8.VolumeGroup" /> - </java-attributes> </java-type> - - <java-type name="VolumeGroup"> - <xml-root-element name="volume-group" /> - <java-attributes> - <xml-element java-attribute="volumeGroupId" name="volume-group-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique ID of volume-group." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="volumeGroupName" name="volume-group-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of the volume group." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Heat stack id corresponding to this volume-group" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="String capturing type of vnf, that was intended to identify the SDC resource. This field has been overloaded and clients should expect changes to occur in the future to this field as SDC matures." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Orchestration status of this volume-group" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Persistent block-level storage." /> - <xml-property name="indexedProps" value="volume-group-name,vnf-type,heat-stack-id,volume-group-id" /> - <xml-property name="dependentOn" value="cloud-region" /> - <xml-property name="container" value="volume-groups" /> - </xml-properties> - </java-type> - <java-type name="RelationshipList"> <xml-root-element name="relationship-list" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.openecomp.org.v8.Relationship" /> + <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v8.Relationship" /> </java-attributes> </java-type> @@ -333,16 +72,16 @@ <java-attributes> <xml-element java-attribute="relatedTo" name="related-to" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="A keyword provided by AAI to indicate type of node." /> + <xml-property name="description" value="A keyword provided by A&AI to indicate type of node." /> </xml-properties> </xml-element> <xml-element java-attribute="relatedLink" name="related-link" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="URL to the object in AAI." /> + <xml-property name="description" value="URL to the object in A&AI." /> </xml-properties> </xml-element> - <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.openecomp.org.v8.RelationshipData" /> - <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.openecomp.org.v8.RelatedToProperty" /> + <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v8.RelationshipData" /> + <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v8.RelatedToProperty" /> </java-attributes> </java-type> @@ -367,7 +106,7 @@ <java-attributes> <xml-element java-attribute="relationshipKey" name="relationship-key" required="true" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="A keyword provided by AAI to indicate an attribute." /> + <xml-property name="description" value="A keyword provided by A&AI to indicate an attribute." /> </xml-properties> </xml-element> <xml-element java-attribute="relationshipValue" name="relationship-value" required="true" type="java.lang.String"> @@ -377,2700 +116,5 @@ </xml-element> </java-attributes> </java-type> - - <java-type name="Tenants"> - <xml-properties> - <xml-property name="description" value="Collection of openstack tenants." /> - </xml-properties> - <xml-root-element name="tenants" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.openecomp.org.v8.Tenant" /> - </java-attributes> - </java-type> - - <java-type name="Tenant"> - <xml-root-element name="tenant" /> - <java-attributes> - <xml-element java-attribute="tenantId" name="tenant-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique id relative to the cloud-region." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="tenantName" name="tenant-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Readable name of tenant" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vservers" name="vservers" type="inventory.aai.openecomp.org.v8.Vservers" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Openstack tenant" /> - <xml-property name="nameProps" value="tenant-name" /> - <xml-property name="indexedProps" value="tenant-name,tenant-id" /> - <xml-property name="dependentOn" value="cloud-region" /> - <xml-property name="container" value="tenants" /> - </xml-properties> - </java-type> - - <java-type name="Vservers"> - <xml-properties> - <xml-property name="description" value="Collection of virtual Servers, aka virtual machines or VMs." /> - </xml-properties> - <xml-root-element name="vservers" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.openecomp.org.v8.Vserver" /> - </java-attributes> - </java-type> - - <java-type name="Vserver"> - <xml-root-element name="vserver" /> - <java-attributes> - <xml-element java-attribute="vserverId" name="vserver-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique identifier for this vserver relative to its tenant" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vserverName" name="vserver-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of vserver" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vserverName2" name="vserver-name2" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Alternative name of vserver" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vserverSelflink" name="vserver-selflink" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="URL to endpoint where AAI can get more details" /> - </xml-properties> - </xml-element> - <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="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." /> - </xml-properties> - </xml-element> - <xml-element default-value="false" required="true" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="Used to indicate whether closed loop function is enabled on this node" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="volumes" name="volumes" type="inventory.aai.openecomp.org.v8.Volumes" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v8.LInterfaces" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Virtual Servers, aka virtual machine or VM." /> - <xml-property name="nameProps" value="vserver-name" /> - <xml-property name="indexedProps" value="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2" /> - <xml-property name="searchable" value="vserver-name,vserver-id,vserver-name2" /> - <xml-property name="dependentOn" value="tenant" /> - <xml-property name="container" value="vservers" /> - </xml-properties> - </java-type> - - <java-type name="LInterfaces"> - <xml-properties> - <xml-property name="description" value="Collection of logical interfaces." /> - </xml-properties> - <xml-root-element name="l-interfaces" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.openecomp.org.v8.LInterface" /> - </java-attributes> - </java-type> - - <java-type name="LInterface"> - <xml-root-element name="l-interface" /> - <java-attributes> - <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Name given to the interface" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="E.g., CUSTOMER, UPLINK, etc." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="v6WanLinkIp" name="v6-wan-link-ip" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="URL to endpoint where AAI can get more details" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="ID of interface" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="macaddr" name="macaddr" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="MAC address for the interface" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="networkName" name="network-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of the network" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Whether AAI should be managing this interface of not. Could have value like CUSTOMER" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.openecomp.org.v8.Vlans" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v8.L3InterfaceIpv4AddressList" /> - <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v8.L3InterfaceIpv6AddressList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Logical interfaces, e.g., a vnic." /> - <xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name" /> - <xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver,lag-interface" /> - <xml-property name="container" value="l-interfaces" /> - </xml-properties> - </java-type> - - <java-type name="L3InterfaceIpv4AddressList"> - <xml-root-element name="l3-interface-ipv4-address-list" /> - <java-attributes> - <xml-element java-attribute="l3InterfaceIpv4Address" name="l3-interface-ipv4-address" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="IP address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="l3InterfaceIpv4PrefixLength" name="l3-interface-ipv4-prefix-length" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="Prefix length, 32 for single address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="Inner VLAN tag" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="Outer VLAN tag" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="description" value="Indicator of fixed or floating address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Neutron network id of the interface that address belongs to" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Neutron id of subnet that address belongs to" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="IPv4 Address Range" /> - <xml-property name="indexedProps" value="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" /> - <xml-property name="dependentOn" value="vlan,l-interface" /> - </xml-properties> - </java-type> - - <java-type name="Vlans"> - <xml-root-element name="vlans" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.openecomp.org.v8.Vlan" /> - </java-attributes> - </java-type> - - <java-type name="Vlan"> - <xml-root-element name="vlan" /> - <java-attributes> - <xml-element java-attribute="vlanInterface" name="vlan-interface" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="String that identifies the interface" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="Inner VLAN tag" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="Outer VLAN tag" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Captures the numeric part of the speed" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Captures the units corresponding to the speed" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vlanDescription" name="vlan-description" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used to describe (the service associated with) the vlan" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="backdoorConnection" name="backdoor-connection" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Whether customer is going to use this VLAN for backdoor connection to another customer premise device." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vpnId" name="vpn-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="This indicates the customers VPN ID associated with this vlan" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v8.L3InterfaceIpv4AddressList" /> - <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v8.L3InterfaceIpv6AddressList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Definition of vlan" /> - <xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-id" /> - <xml-property name="uniqueProps" value="vpn-id" /> - <xml-property name="dependentOn" value="l-interface" /> - <xml-property name="container" value="vlans" /> - </xml-properties> - </java-type> - - <java-type name="L3InterfaceIpv6AddressList"> - <xml-root-element name="l3-interface-ipv6-address-list" /> - <java-attributes> - <xml-element java-attribute="l3InterfaceIpv6Address" name="l3-interface-ipv6-address" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="IP address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="l3InterfaceIpv6PrefixLength" name="l3-interface-ipv6-prefix-length" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="Prefix length, 128 for single address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="Inner VLAN tag" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="Outer VLAN tag" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="description" value="Indicator of fixed or floating address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Neutron network id of the interface that address belongs to" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Neutron id of subnet that address belongs to" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="IPv6 Address Range" /> - <xml-property name="indexedProps" value="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" /> - <xml-property name="dependentOn" value="vlan,l-interface" /> - </xml-properties> - </java-type> - - <java-type name="Volumes"> - <xml-properties> - <xml-property name="description" value="Collection of ephemeral Block storage volumes." /> - </xml-properties> - <xml-root-element name="volumes" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.openecomp.org.v8.Volume" /> - </java-attributes> - </java-type> - - <java-type name="Volume"> - <xml-root-element name="volume" /> - <java-attributes> - <xml-element java-attribute="volumeId" name="volume-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique ID of block storage volume relative to the vserver." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="volumeSelflink" name="volume-selflink" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="URL to endpoint where AAI can get more details" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Ephemeral Block storage volume." /> - <xml-property name="indexedProps" value="volume-id" /> - <xml-property name="dependentOn" value="vserver" /> - <xml-property name="container" value="volumes" /> - </xml-properties> - </java-type> - - <java-type name="Flavors"> - <xml-properties> - <xml-property name="description" value="Collection of openstack flavors." /> - </xml-properties> - <xml-root-element name="flavors" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.openecomp.org.v8.Flavor" /> - </java-attributes> - </java-type> - - <java-type name="Flavor"> - <xml-root-element name="flavor" /> - <java-attributes> - <xml-element java-attribute="flavorId" name="flavor-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Flavor id, expected to be unique across cloud-region." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="flavorName" name="flavor-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Flavor name" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="flavorVcpus" name="flavor-vcpus" type="java.lang.Integer"> - <xml-properties> - <xml-property name="description" value="Number of CPUs" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="flavorRam" name="flavor-ram" type="java.lang.Integer"> - <xml-properties> - <xml-property name="description" value="Amount of memory" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="flavorDisk" name="flavor-disk" type="java.lang.Integer"> - <xml-properties> - <xml-property name="description" value="Disk space" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="flavorEphemeral" name="flavor-ephemeral" type="java.lang.Integer"> - <xml-properties> - <xml-property name="description" value="Amount of ephemeral disk space" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="flavorSwap" name="flavor-swap" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="amount of swap space allocation" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="flavorIsPublic" name="flavor-is-public" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="description" value="whether flavor is available to all users or private to the tenant it was created in." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="flavorSelflink" name="flavor-selflink" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="URL to endpoint where AAI can get more details" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="flavorDisabled" name="flavor-disabled" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="description" value="Boolean as to whether this flavor is no longer enabled" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Openstack flavor." /> - <xml-property name="nameProps" value="flavor-name" /> - <xml-property name="indexedProps" value="flavor-name,flavor-id" /> - <xml-property name="dependentOn" value="cloud-region" /> - <xml-property name="container" value="flavors" /> - </xml-properties> - </java-type> - - <java-type name="Snapshots"> - <xml-properties> - <xml-property name="description" value="Collection of openstack snapshots" /> - </xml-properties> - <xml-root-element name="snapshots" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.openecomp.org.v8.Snapshot" /> - </java-attributes> - </java-type> - - <java-type name="Snapshot"> - <xml-root-element name="snapshot" /> - <java-attributes> - <xml-element java-attribute="snapshotId" name="snapshot-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Snapshot id, this is the key UUID assoc associated in glance with the snapshots." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="snapshotName" name="snapshot-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Snapshot name" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="snapshotArchitecture" name="snapshot-architecture" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Operating system architecture" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="snapshotOsDistro" name="snapshot-os-distro" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The common name of the operating system distribution in lowercase" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="snapshotOsVersion" name="snapshot-os-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The operating system version as specified by the distributor." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="application" name="application" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The application that the image instantiates." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The vendor of the application." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The version of the application." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="snapshotSelflink" name="snapshot-selflink" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="URL to endpoint where AAI can get more details" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="prevSnapshotId" name="prev-snapshot-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="This field contains the UUID of the previous snapshot (if any)." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Openstack snapshot" /> - <xml-property name="nameProps" value="snapshot-name" /> - <xml-property name="uniqueProps" value="snapshot-id" /> - <xml-property name="indexedProps" value="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id" /> - <xml-property name="dependentOn" value="cloud-region" /> - <xml-property name="container" value="snapshots" /> - </xml-properties> - </java-type> - - <java-type name="GroupAssignments"> - <xml-properties> - <xml-property name="description" value="Collection of openstack group assignments" /> - </xml-properties> - <xml-root-element name="group-assignments" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.openecomp.org.v8.GroupAssignment" /> - </java-attributes> - </java-type> - - <java-type name="GroupAssignment"> - <xml-root-element name="group-assignment" /> - <java-attributes> - <xml-element java-attribute="groupId" name="group-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Group id, expected to be unique across cloud-region." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="groupType" name="group-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Group type - the type of group this instance refers to" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="groupName" name="group-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Group name - name assigned to the group" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="groupDescription" name="group-description" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Group description - description of the group" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)." /> - <xml-property name="nameProps" value="group-name" /> - <xml-property name="indexedProps" value="group-id,group-type,group-name" /> - <xml-property name="dependentOn" value="cloud-region" /> - <xml-property name="container" value="group-assignments" /> - </xml-properties> - </java-type> - - <java-type name="Images"> - <xml-properties> - <xml-property name="description" value="Collectio of Openstack images." /> - </xml-properties> - <xml-root-element name="images" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.openecomp.org.v8.Image" /> - </java-attributes> - </java-type> - - <java-type name="Image"> - <xml-root-element name="image" /> - <java-attributes> - <xml-element java-attribute="imageId" name="image-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Image id, expected to be unique across cloud region" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="imageName" name="image-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Image name" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="imageArchitecture" name="image-architecture" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Operating system architecture." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="imageOsDistro" name="image-os-distro" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The common name of the operating system distribution in lowercase" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="imageOsVersion" name="image-os-version" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The operating system version as specified by the distributor." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="application" name="application" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The application that the image instantiates." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The vendor of the application." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The version of the application." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="imageSelflink" name="image-selflink" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="URL to endpoint where AAI can get more details" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v8.Metadata" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Openstack image." /> - <xml-property name="nameProps" value="image-name" /> - <xml-property name="indexedProps" value="application,image-name,application-vendor,image-id,application-version" /> - <xml-property name="dependentOn" value="cloud-region" /> - <xml-property name="container" value="images" /> - </xml-properties> - </java-type> - - <java-type name="Metadata"> - <xml-properties> - <xml-property name="description" value="Collection of metadatum (key/value pairs)" /> - </xml-properties> - <xml-root-element name="metadata" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.openecomp.org.v8.Metadatum" /> - </java-attributes> - </java-type> - - <java-type name="Metadatum"> - <xml-root-element name="metadatum" /> - <java-attributes> - <xml-element java-attribute="metaname" name="metaname" required="true" type="java.lang.String" xml-key="true" /> - <xml-element java-attribute="metaval" name="metaval" required="true" type="java.lang.String" /> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Key/value pairs" /> - <xml-property name="indexedProps" value="metaname" /> - <xml-property name="dependentOn" value="tenant,image,service-instance,model" /> - <xml-property name="container" value="metadata" /> - </xml-properties> - </java-type> - - <java-type name="Pservers"> - <xml-properties> - <xml-property name="description" value="Collection of compute hosts." /> - </xml-properties> - <xml-root-element name="pservers" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.openecomp.org.v8.Pserver" /> - </java-attributes> - </java-type> - - <java-type name="Pserver"> - <xml-root-element name="pserver" /> - <java-attributes> - <xml-element java-attribute="hostname" name="hostname" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Value from executing hostname on the compute node." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ptniiEquipName" name="ptnii-equip-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="PTNII name" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="numberOfCpus" name="number-of-cpus" type="java.lang.Integer"> - <xml-properties> - <xml-property name="description" value="Number of cpus" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="diskInGigabytes" name="disk-in-gigabytes" type="java.lang.Integer"> - <xml-properties> - <xml-property name="description" value="Disk size, in GBs" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ramInMegabytes" name="ram-in-megabytes" type="java.lang.Integer"> - <xml-properties> - <xml-property name="description" value="RAM size, in MBs" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Equipment type. Source of truth should define valid values." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Equipment vendor. Source of truth should define valid values." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Equipment model. Source of truth should define valid values." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="fqdn" name="fqdn" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Fully-qualified domain name" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="pserverSelflink" name="pserver-selflink" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="URL to endpoint where AAI can get more details" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used to configure device, also used for troubleshooting and is IP used for traps generated by device." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Serial number, may be queried" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="pserverId" name="pserver-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="ID of Pserver" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="internetTopology" name="internet-topology" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="internet topology of Pserver" /> - </xml-properties> - </xml-element> - <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="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." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="pserverName2" name="pserver-name2" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="alternative pserver name" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="purpose" name="purpose" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="purpose of pserver" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v8.PInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v8.LagInterfaces" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver." /> - <xml-property name="nameProps" value="pserver-name2" /> - <xml-property name="indexedProps" value="hostname,in-maint,pserver-id,pserver-name2" /> - <xml-property name="searchable" value="hostname,pserver-name2,pserver-id,ipv4-oam-address" /> - <xml-property name="container" value="pservers" /> - <xml-property name="namespace" value="cloud-infrastructure" /> - </xml-properties> - </java-type> - - <java-type name="PInterfaces"> - <xml-properties> - <xml-property name="description" value="Collection of physical interfaces." /> - </xml-properties> - <xml-root-element name="p-interfaces" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.openecomp.org.v8.PInterface" /> - </java-attributes> - </java-type> - - <java-type name="PInterface"> - <xml-root-element name="p-interface" /> - <java-attributes> - <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Name that identifies the physical interface" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Captures the numeric part of the speed" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Captures the units corresponding to the speed" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="portDescription" name="port-description" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Nature of the services and connectivity on this port." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="equipmentIdentifier" name="equipment-identifier" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="CLEI or other specification for p-interface hardware." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Role specification for p-interface hardware." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="interfaceType" name="interface-type" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Indicates the physical properties of the interface." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v8.LInterfaces" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Physical interface (e.g., nic)" /> - <xml-property name="indexedProps" value="interface-name" /> - <xml-property name="dependentOn" value="pserver,pnf" /> - <xml-property name="container" value="p-interfaces" /> - </xml-properties> - </java-type> - - <java-type name="LagInterfaces"> - <xml-properties> - <xml-property name="description" value="Collection of link aggregate interfaces." /> - </xml-properties> - <xml-root-element name="lag-interfaces" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.openecomp.org.v8.LagInterface" /> - </java-attributes> - </java-type> - - <java-type name="LagInterface"> - <xml-root-element name="lag-interface" /> - <java-attributes> - <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Name that identifies the link aggregate interface" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Captures the numeric part of the speed" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Captures the units corresponding to the speed" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v8.LInterfaces" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Link aggregate interface" /> - <xml-property name="indexedProps" value="interface-name" /> - <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe,pnf" /> - <xml-property name="container" value="lag-interfaces" /> - </xml-properties> - </java-type> - - <java-type name="AvailabilityZones"> - <xml-properties> - <xml-property name="description" value="Collection of availability zones" /> - </xml-properties> - <xml-root-element name="availability-zones" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.openecomp.org.v8.AvailabilityZone" /> - </java-attributes> - </java-type> - - <java-type name="AvailabilityZone"> - <xml-root-element name="availability-zone" /> - <java-attributes> - <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Name of the availability zone. Unique across a cloud region" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="hypervisorType" name="hypervisor-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Type of hypervisor. Source of truth should define valid values." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="State that indicates whether the availability zone should be used, etc. Source of truth should define valid values." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Availability zone, a collection of compute hosts/pservers" /> - <xml-property name="indexedProps" value="availability-zone-name" /> - <xml-property name="dependentOn" value="cloud-region" /> - <xml-property name="container" value="availability-zones" /> - </xml-properties> - </java-type> - - <java-type name="Business"> - <xml-properties> - <xml-property name="description" value="Namespace for business related constructs" /> - </xml-properties> - <xml-root-element name="business" /> - <java-attributes> - <xml-element java-attribute="customers" name="customers" type="inventory.aai.openecomp.org.v8.Customers" /> - </java-attributes> - </java-type> - - <java-type name="Customers"> - <xml-properties> - <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information." /> - </xml-properties> - <xml-root-element name="customers" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.openecomp.org.v8.Customer" /> - </java-attributes> - </java-type> - - <java-type name="Customer"> - <xml-root-element name="customer" /> - <java-attributes> - <xml-element java-attribute="globalCustomerId" name="global-customer-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Global customer id used across OpenECOMP to uniquely identify customer." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="subscriberName" name="subscriber-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Subscriber name, an alternate way to retrieve a customer." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="subscriberType" name="subscriber-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Subscriber type, a way to provide VID with only the INFRA customers." /> - <xml-property name="defaultValue" value="CUST" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.openecomp.org.v8.ServiceSubscriptions" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="customer identifiers to provide linkage back to BSS information." /> - <xml-property name="nameProps" value="subscriber-name" /> - <xml-property name="indexedProps" value="subscriber-name,global-customer-id,subscriber-type" /> - <xml-property name="searchable" value="subscriber-name,global-customer-id" /> - <xml-property name="uniqueProps" value="global-customer-id,subscriber-name" /> - <xml-property name="alternateKeys1" value="subscriber-name" /> - <xml-property name="container" value="customers" /> - <xml-property name="namespace" value="business" /> - </xml-properties> - </java-type> - - <java-type name="ServiceSubscriptions"> - <xml-properties> - <xml-property name="description" value="Collection of objects that group service instances." /> - </xml-properties> - <xml-root-element name="service-subscriptions" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.openecomp.org.v8.ServiceSubscription" /> - </java-attributes> - </java-type> - - <java-type name="ServiceSubscription"> - <xml-root-element name="service-subscription" /> - <java-attributes> - <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Value defined by orchestration to identify this service across OpenECOMP." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="tempUbSubAccountId" name="temp-ub-sub-account-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="This property will be deleted from AAI in the near future. Only stop gap solution." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.openecomp.org.v8.ServiceInstances"> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Object that group service instances." /> - <xml-property name="indexedProps" value="service-type" /> - <xml-property name="dependentOn" value="customer" /> - <xml-property name="container" value="service-subscriptions" /> - </xml-properties> - </java-type> - - <java-type name="ServiceInstances"> - <xml-properties> - <xml-property name="description" value="Collection of service instances" /> - </xml-properties> - <xml-root-element name="service-instances" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.openecomp.org.v8.ServiceInstance" /> - </java-attributes> - </java-type> - - <java-type name="ServiceInstance"> - <xml-root-element name="service-instance" /> - <java-attributes> - <xml-element java-attribute="serviceInstanceId" name="service-instance-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Uniquely identifies this instance of a service" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serviceInstanceName" name="service-instance-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="This field will store a name assigned to the service-instance." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the SDC model id for this resource or service model." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the SDC model version for this resource or service model." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the SDC data dictionary widget model. This maps directly to the AAI widget." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the SDC data dictionary version of the widget model.This maps directly to the AAI version of the widget." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="bandwidthTotal" name="bandwidth-total" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Indicates the total bandwidth to be used for this service." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vhnPortalUrl" name="vhn-portal-url" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="URL customers will use to access the vHN Portal." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Operational status of the service-instance." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serviceInstanceLocationId" name="service-instance-location-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="An identifier that customers assign to the location where this service is being used." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v8.Metadata" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Instance of a service" /> - <xml-property name="indexedProps" value="service-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id" /> - <xml-property name="nameProps" value="service-instance-name" /> - <xml-property name="searchable" value="service-instance-id" /> - <xml-property name="uniqueProps" value="service-instance-id" /> - <xml-property name="dependentOn" value="service-subscription" /> - <xml-property name="container" value="service-instances" /> - </xml-properties> - </java-type> - - <java-type name="ServiceDesignAndCreation"> - <xml-properties> - <xml-property name="description" value="Namespace for objects managed by SDC" /> - </xml-properties> - <xml-root-element name="service-design-and-creation" /> - <java-attributes> - <xml-element java-attribute="services" name="services" type="inventory.aai.openecomp.org.v8.Services" /> - <xml-element java-attribute="models" name="models" type="inventory.aai.openecomp.org.v8.Models" /> - <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.openecomp.org.v8.NamedQueries" /> - </java-attributes> - </java-type> - - <java-type name="Network"> - <xml-properties> - <xml-property name="description" value="Namespace for network inventory resources." /> - </xml-properties> - <xml-root-element name="network" /> - <java-attributes> - <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.openecomp.org.v8.LogicalLinks" /> - <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.openecomp.org.v8.Vnfcs" /> - <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.openecomp.org.v8.L3Networks" /> - <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.openecomp.org.v8.GenericVnfs" /> - <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.openecomp.org.v8.Pnfs" /> - <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.openecomp.org.v8.PhysicalLinks" /> - </java-attributes> - </java-type> - - <java-type name="LogicalLinks"> - <xml-properties> - <xml-property name="description" value="Collection of logical connections" /> - </xml-properties> - <xml-root-element name="logical-links" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.openecomp.org.v8.LogicalLink" /> - </java-attributes> - </java-type> - - <java-type name="LogicalLink"> - <xml-root-element name="logical-link" /> - <java-attributes> - <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="linkType" name="link-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Type of logical link, e.g., evc" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Captures the numeric part of the speed" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Captures the units corresponding to the speed" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="v4, v6, or ds for dual stack (should be ip-version)" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="For example, static or BGP" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the SDC model id for this resource or service model." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the SDC model version for this resource or service model." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the SDC data dictionary widget model. This maps directly to the AAI widget." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the SDC data dictionary version of the widget model.This maps directly to the AAI version of the widget." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Indication of operational status of the logical link." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="linkRole" name="link-role" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Indication of the network use of the logical link." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="linkName2" name="link-name2" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Alias or alternate name (CLCI or D1 name)." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="linkId" name="link-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="UUID of the logical-link, SDNC generates this." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points" /> - <xml-property name="indexedProps" value="link-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,link-id" /> - <xml-property name="uniqueProps" value="link-id" /> - <xml-property name="container" value="logical-links" /> - <xml-property name="namespace" value="network" /> - </xml-properties> - </java-type> - - <java-type name="Vnfcs"> - <xml-properties> - <xml-property name="description" value="virtual network components associated with a vserver from application controller." /> - </xml-properties> - <xml-root-element name="vnfcs" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.openecomp.org.v8.Vnfc" /> - </java-attributes> - </java-type> - - <java-type name="Vnfc"> - <xml-root-element name="vnfc" /> - <java-attributes> - <xml-element java-attribute="vnfcName" name="vnfc-name" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique ID of vnfc." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfcFunctionCode" name="vnfc-function-code" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="function code" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfcType" name="vnfc-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="type" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="prov status of this vnfc" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Orchestration status of this VNF, mastered by APP-C" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipaddressV4OamVip" name="ipaddress-v4-oam-vip" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Oam V4 vip address of this vnfc" /> - </xml-properties> - </xml-element> - <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" /> - </xml-properties> - </xml-element> - <xml-element default-value="false" required="true" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="used to indicate whether closed loop function is enabled on this node" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="groupNotation" name="group-notation" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Group notation of VNFC" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation" /> - <xml-property name="container" value="vnfcs" /> - <xml-property name="namespace" value="network" /> - </xml-properties> - </java-type> - - <java-type name="L3Networks"> - <xml-root-element name="l3-networks" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.openecomp.org.v8.L3Network" /> - </java-attributes> - </java-type> - - <java-type name="L3Network"> - <xml-root-element name="l3-network" /> - <java-attributes> - <xml-element java-attribute="networkId" name="network-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Network ID, should be uuid. Unique across AAI." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of the network, governed by some naming convention.." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="networkType" name="network-type" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Type of the network - who defines these values?" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="networkRole" name="network-role" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Role the network plans - who defines these values?" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="networkTechnology" name="network-technology" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Network technology - who defines these values?" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Neutron network id of this Interface" /> - </xml-properties> - </xml-element> - <xml-element default-value="false" required="true" java-attribute="isBoundToVpn" name="is-bound-to-vpn" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="Set to true if bound to VPN" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Unique identifier of service from SDC" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="networkRoleInstance" name="network-role-instance" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="network role instance" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="contrailNetworkFqdn" name="contrail-network-fqdn" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Contrail FQDN for the network" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the SDC model id for this resource or service model." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the SDC model version for this resource or service model." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the SDC data dictionary widget model. This maps directly to the AAI widget." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the SDC data dictionary version of the widget model.This maps directly to the AAI version of the widget." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="physicalNetworkName" name="physical-network-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name associated with the physical network." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="isProviderNetwork" name="is-provider-network" required="true" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="boolean indicatating whether or not network is a provider network." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="isSharedNetwork" name="is-shared-network" required="true" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="boolean indicatating whether or not network is a shared network." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="isExternalNetwork" name="is-external-network" required="true" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="boolean indicatating whether or not network is an external network." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.openecomp.org.v8.Subnets" /> - <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.openecomp.org.v8.CtagAssignments" /> - <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.openecomp.org.v8.SegmentationAssignments" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" > - <xml-properties> - <xml-property name="description" value="Relates to tenant (or is it a child of tenant)" /> - </xml-properties> - </xml-element> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Generic network definition" /> - <xml-property name="nameProps" value="network-name" /> - <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-network-fqdn" /> - <xml-property name="uniqueProps" value="network-id" /> - <xml-property name="container" value="l3-networks" /> - <xml-property name="namespace" value="network" /> - </xml-properties> - </java-type> - - <java-type name="CtagAssignments"> - <xml-root-element name="ctag-assignments" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.openecomp.org.v8.CtagAssignment" /> - </java-attributes> - </java-type> - - <java-type name="CtagAssignment"> - <xml-root-element name="ctag-assignment" /> - <java-attributes> - <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" required="true" type="java.lang.Long" xml-key="true"> - <xml-properties> - <xml-property name="description" value="id." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="indexedProps" value="vlan-id-inner" /> - <xml-property name="dependentOn" value="l3-network" /> - <xml-property name="container" value="ctag-assignments" /> - </xml-properties> - </java-type> - - <java-type name="Subnets"> - <xml-root-element name="subnets" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.openecomp.org.v8.Subnet" /> - </java-attributes> - </java-type> - - <java-type name="Subnet"> - <xml-root-element name="subnet" /> - <java-attributes> - <xml-element java-attribute="subnetId" name="subnet-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Subnet ID, should be UUID." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="subnetName" name="subnet-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name associated with the subnet." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Neutron id of this subnet" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="gatewayAddress" name="gateway-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="gateway ip address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="networkStartAddress" name="network-start-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="network start address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="cidrMask" name="cidr-mask" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="cidr mask" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="ip version" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" /> - </xml-properties> - </xml-element> - <xml-element default-value="false" required="true" java-attribute="dhcpEnabled" name="dhcp-enabled" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="dhcp enabled" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="dhcpStart" name="dhcp-start" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the start address reserved for use by dhcp" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="dhcpEnd" name="dhcp-end" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the last address reserved for use by dhcp" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="indexedProps" value="subnet-id,subnet-name" /> - <xml-property name="nameProps" value="subnet-name" /> - <xml-property name="uniqueProps" value="subnet-id" /> - <xml-property name="dependentOn" value="l3-network" /> - <xml-property name="container" value="subnets" /> - </xml-properties> - </java-type> - - <java-type name="GenericVnfs"> - <xml-properties> - <xml-property name="description" value="Collection of VNFs" /> - </xml-properties> - <xml-root-element name="generic-vnfs" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.openecomp.org.v8.GenericVnf" /> - </java-attributes> - </java-type> - - <java-type name="GenericVnf"> - <xml-root-element name="generic-vnf" /> - <java-attributes> - <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique id of VNF. This is unique across the graph." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of VNF." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Alternate name of VNF." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="String capturing type of vnf, that was intended to identify the SDC resource. This field has been overloaded and clients should expect changes to occur in the future to this field as SDC matures." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Unique identifier of service from SDC" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Indicator for whether the resource is considered operational" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="License key" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Client should send valid enumerated value" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Orchestration status of this VNF, used by MSO." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="identifier of managed by customer" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by generic-vnf." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="v4 Loopback0 address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="nmLanV6Address" name="nm-lan-v6-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="v6 Loopback address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="managementV6Address" name="management-v6-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="v6 management address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vcpu" name="vcpu" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vcpuUnits" name="vcpu-units" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="units associated with vcpu, used for VNFs with no vservers/flavors" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vmemory" name="vmemory" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vmemoryUnits" name="vmemory-units" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="units associated with vmemory, used for VNFs with no vservers/flavors" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vdisk" name="vdisk" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vdiskUnits" name="vdisk-units" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="units associated with vdisk, used for VNFs with no vservers/flavors" /> - </xml-properties> - </xml-element> - <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="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." /> - </xml-properties> - </xml-element> - <xml-element default-value="false" required="true" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="used to indicate whether closed loop function is enabled on this node" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="summaryStatus" name="summary-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="details regarding the generic-vnf operation" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="encryptedAccessFlag" name="encrypted-access-flag" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="description" value="indicates whether generic-vnf access uses SSH" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="entitlementAssignmentGroupUuid" name="entitlement-assignment-group-uuid" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="UUID of the Entitlement group used for licensing VNFs" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="UUID of the specific entitlement resource" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="licenseAssignmentGroupUuid" name="license-assignment-group-uuid" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="UUID of the license assignment group" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="licenseKeyUuid" name="license-key-uuid" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="UUID of the actual license resource" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the SDC model id for this resource or service model." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the SDC model version for this resource or service model." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="personaModelCustomizationId" name="persona-model-customization-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the SDC data dictionary widget model. This maps directly to the AAI widget." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the SDC data dictionary version of the widget model.This maps directly to the AAI version of the widget." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="asNumber" name="as-number" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="as-number of the VNF" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="regionalResourceSubzone" name="regional-resource-subzone" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="represents sub zone of the rr plane" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v8.LInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v8.LagInterfaces" /> - <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.openecomp.org.v8.VfModules" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="General purpose VNF" /> - <xml-property name="nameProps" value="vnf-name" /> - <xml-property name="indexedProps" value="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" /> - <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" /> - <xml-property name="uniqueProps" value="vnf-id" /> - <xml-property name="container" value="generic-vnfs" /> - <xml-property name="namespace" value="network" /> - <xml-property name="extends" value="vnf" /> - </xml-properties> - </java-type> - - <java-type name="VfModules"> - <xml-properties> - <xml-property name="description" value="Collection of vf-modules, a deployment unit of VNFCs" /> - </xml-properties> - <xml-root-element name="vf-modules" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.openecomp.org.v8.VfModule" /> - </java-attributes> - </java-type> - - <java-type name="VfModule"> - <xml-root-element name="vf-module" /> - <java-attributes> - <xml-element java-attribute="vfModuleId" name="vf-module-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique ID of vf-module." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vfModuleName" name="vf-module-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of vf-module" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Heat stack id corresponding to this instance." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="orchestration status of this vf-module, mastered by MSO" /> - </xml-properties> - </xml-element> - <xml-element default-value="false" required="true" java-attribute="isBaseVfModule" name="is-base-vf-module" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="used to indicate whether or not this object is base vf module" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the SDC model id for this resource or service model." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the SDC model version for this resource or service model." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the SDC data dictionary widget model. This maps directly to the AAI widget." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the SDC data dictionary version of the widget model.This maps directly to the AAI version of the widget." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="contrailServiceInstanceFqdn" name="contrail-service-instance-fqdn" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the Contrail unique ID for a service-instance" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="a deployment unit of VNFCs" /> - <xml-property name="indexedProps" value="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" /> - <xml-property name="dependentOn" value="generic-vnf" /> - <xml-property name="container" value="vf-modules" /> - </xml-properties> - </java-type> - - <java-type name="Pnfs"> - <xml-properties> - <xml-property name="description" value="Collection of Physical Network Functions." /> - </xml-properties> - <xml-root-element name="pnfs" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.openecomp.org.v8.Pnf" /> - </java-attributes> - </java-type> - - <java-type name="Pnf"> - <xml-root-element name="pnf" /> - <java-attributes> - <xml-element java-attribute="pnfName" name="pnf-name" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="unique name of Physical Network Function." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="pnfName2" name="pnf-name2" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="name of Physical Network Function." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="pnfName2Source" name="pnf-name2-source" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="source of name2" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="pnfId" name="pnf-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="id of pnf" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Equipment type. Source of truth should define valid values." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Equipment vendor. Source of truth should define valid values." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Equipment model. Source of truth should define valid values." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="identifier of managed by customer" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipaddressV4Oam" name="ipaddress-v4-oam" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="ipv4-oam-address with new naming convention for IP addresses" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="swVersion" name="sw-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="sw-version is the version of SW for the hosted application on the PNF." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="orchestration-status is the status of orchestration on the PNF." /> - </xml-properties> - </xml-element> - <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="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." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="frameId" name="frame-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="ID of the physical frame (relay rack) where pnf is installed." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v8.PInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v8.LagInterfaces" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="PNF represents a physical network function." /> - <xml-property name="indexedProps" value="pnf-name,orchestration-status" /> - <xml-property name="uniqueProps" value="pnf-name" /> - <xml-property name="container" value="pnfs" /> - <xml-property name="namespace" value="network" /> - </xml-properties> - </java-type> - - <java-type name="PhysicalLinks"> - <xml-properties> - <xml-property name="description" value="Collection of physical connections, typically between p-interfaces" /> - </xml-properties> - <xml-root-element name="physical-links" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.openecomp.org.v8.PhysicalLink" /> - </java-attributes> - </java-type> - - <java-type name="PhysicalLink"> - <xml-root-element name="physical-link" /> - <java-attributes> - <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Captures the numeric part of the speed" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Captures the units corresponding to the speed" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Circuit it" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="dualMode" name="dual-mode" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Dual access mode (e.g., primary, secondary" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="To provide information on who manages this circuit. AAI or 3rd party transport provider" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serviceProviderName" name="service-provider-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of the service Provider on this link." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Collection of physical connections, typically between p-interfaces" /> - <xml-property name="indexedProps" value="circuit-id,link-name" /> - <xml-property name="alternateKeys1" value="circuit-id" /> - <xml-property name="container" value="physical-links" /> - <xml-property name="namespace" value="network" /> - </xml-properties> - </java-type> - - <java-type name="NotificationEvent"> - <xml-root-element name="notification-event" /> - <java-attributes> - <xml-element java-attribute="cambriaPartition" name="cambria.partition" type="java.lang.String" /> - <xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.openecomp.org.v8.NotificationEventHeader" /> - <xml-any-element java-attribute="entity" /> - </java-attributes> - </java-type> - <java-type name="NotificationEventHeader"> - <xml-root-element name="notification-event-header" /> - <java-attributes> - <xml-element java-attribute="id" name="id" type="java.lang.String" /> - <xml-element java-attribute="timestamp" name="timestamp" type="java.lang.String" /> - <xml-element java-attribute="sourceName" name="source-name" type="java.lang.String" /> - <xml-element java-attribute="domain" name="domain" type="java.lang.String" /> - <xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String" /> - <xml-element java-attribute="severity" name="severity" type="java.lang.String" /> - <xml-element java-attribute="eventType" name="event-type" type="java.lang.String" /> - <xml-element java-attribute="version" name="version" type="java.lang.String" /> - <xml-element java-attribute="action" name="action" type="java.lang.String" /> - <xml-element java-attribute="entityType" name="entity-type" type="java.lang.String" /> - <xml-element java-attribute="topEntityType" name="top-entity-type" type="java.lang.String" /> - <xml-element java-attribute="entityLink" name="entity-link" type="java.lang.String" /> - <xml-element java-attribute="status" name="status" type="java.lang.String" /> - </java-attributes> - </java-type> - - <java-type name="AaiInternal"> - <xml-root-element name="aai-internal" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.openecomp.org.v8.ReservedPropNames" /> - <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.openecomp.org.v8.EdgePropNames" /> - </java-attributes> - </java-type> - - <java-type name="ReservedPropNames"> - <xml-properties> - <xml-property name="description" value="Internal map to define some reserved properties of a vertex" /> - <xml-property name="uniqueProps" value="aai-unique-key" /> - <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type" /> - </xml-properties> - <xml-root-element name="reserved-prop-names" /> - <java-attributes> - <xml-element java-attribute="lastModSourceOfTruth" name="last-mod-source-of-truth" type="java.lang.String" /> - <xml-element java-attribute="aaiNodeType" name="aai-node-type" type="java.lang.String" /> - <xml-element java-attribute="aaiCreatedTs" name="aai-created-ts" type="java.lang.Long" /> - <xml-element java-attribute="aaiUniqueKey" name="aai-unique-key" type="java.lang.String" /> - <xml-element java-attribute="aaiLastModTs" name="aai-last-mod-ts" type="java.lang.Long" /> - <xml-element java-attribute="sourceOfTruth" name="source-of-truth" type="java.lang.String" /> - </java-attributes> - </java-type> - - <java-type name="EdgePropNames"> - <!-- NOTE that the names of these properties are not consistent and are in mixed case and hyphen case for now --> - <xml-properties> - <xml-property name="description" value="Internal map to define the properties of an edge and interpret the map EdgeRules" /> - <xml-property name="edgeInfo" value="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV" /> - </xml-properties> - <xml-root-element name="edge-prop-names" /> - <java-attributes> - <xml-element java-attribute="edgeLabel" name="edgeLabel" type="java.lang.String" /> - <xml-element java-attribute="direction" name="direction" type="java.lang.String" /> - <xml-element java-attribute="multiplicityRule" name="multiplicityRule" type="java.lang.String" /> - <xml-element java-attribute="isParent" name="isParent" type="java.lang.Boolean" /> - <xml-element java-attribute="usesResource" name="usesResource" type="java.lang.Boolean" /> - <xml-element java-attribute="hasDelTarget" name="hasDelTarget" type="java.lang.Boolean" /> - <xml-element java-attribute="SVC-INFRA" name="SVC-INFRA" type="java.lang.String" /> - <xml-element java-attribute="SVC-INFRA-REV" name="SVC-INFRA-REV" type="java.lang.String" /> - </java-attributes> - </java-type> - - <java-type name="Services"> - <xml-properties> - <xml-property name="description" value="Collection of service model definitions. Likely to be deprecated in favor of models from SDC."/> - </xml-properties> - <xml-root-element name="services" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.openecomp.org.v8.Service" /> - </java-attributes> - </java-type> - - <java-type name="Service"> - <xml-root-element name="service" /> - <java-attributes> - <xml-element java-attribute="serviceId" name="service-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serviceDescription" name="service-description" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Description of the service" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serviceSelflink" name="service-selflink" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="URL to endpoint where AAI can get more details" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serviceVersion" name="service-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="service version" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Stand-in for service model definitions. Likely to be deprecated in favor of models from SDC." /> - <xml-property name="indexedProps" value="service-description,service-id" /> - <xml-property name="container" value="services" /> - <xml-property name="namespace" value="service-design-and-creation" /> - </xml-properties> - </java-type> - - <java-type name="Models"> - <xml-properties> - <xml-property name="description" value="Collection of subgraph definitions provided by SDC to describe the inventory assets and their connections related to SDC models" /> - </xml-properties> - <xml-root-element name="models" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.openecomp.org.v8.Model" /> - </java-attributes> - </java-type> - - <java-type name="Model"> - <xml-properties> - <xml-property name="description" value="Subgraph definition provided by SDC to describe an inventory asset and its connections related to SDC models" /> - <xml-property name="nameProps" value="model-name,model-type" /> - <xml-property name="indexedProps" value="model-name-version-id,model-type,model-name,model-id,model-version" /> - <xml-property name="alternateKeys1" value="model-id,model-version" /> - <xml-property name="uniqueProps" value="model-name-version-id" /> - <xml-property name="container" value="models" /> - <xml-property name="namespace" value="service-design-and-creation" /> - </xml-properties> - <xml-root-element name="model" /> - <java-attributes> - <xml-element java-attribute="modelNameVersionId" name="model-name-version-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique identifier corresponding to one version of a model in SDC" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of the model, which can change from version to version." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelId" name="model-id" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Invariant unique ID which does not change from version to version" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Version" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Description" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.openecomp.org.v8.ModelElements" /> - <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v8.Metadata" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - </java-attributes> - </java-type> - - <java-type name="ModelElements"> - <xml-root-element name="model-elements" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.openecomp.org.v8.ModelElement" /> - </java-attributes> - </java-type> - - <java-type name="ModelElement"> - <xml-properties> - <xml-property name="description" value="Defines how other models combine to make up a higher-level model." /> - <xml-property name="uniqueProps" value="model-element-uuid" /> - <xml-property name="indexedProps" value="model-element-uuid" /> - <xml-property name="allowDirectRead" value="true" /> - <xml-property name="allowDirectWrite" value="false" /> - <xml-property name="container" value="model-elements" /> - </xml-properties> - <xml-root-element name="model-element" /> - <java-attributes> - <xml-element java-attribute="modelElementUuid" name="model-element-uuid" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="autoGenerateUuid" value="true" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="newDataDelFlag" name="new-data-del-flag" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Indicates whether this element was created as part of instantiation from this model" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="cardinality" name="cardinality" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="How many of this type of element are required/allowed" /> - </xml-properties> - </xml-element> - <xml-element container-type="java.util.ArrayList" java-attribute="linkagePoints" name="linkage-point" type="java.lang.String"> - <xml-element-wrapper name="linkage-points" /> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.openecomp.org.v8.ModelElements"> - <xml-properties> - <xml-property name="description" value="Defines how other models combine to make up a higher-level model" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.openecomp.org.v8.ModelConstraints"> - <xml-properties> - <xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - </java-attributes> - </java-type> - - <java-type name="ModelConstraints"> - <xml-root-element name="model-constraints" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.openecomp.org.v8.ModelConstraint" /> - </java-attributes> - </java-type> - - <java-type name="ModelConstraint"> - <xml-properties> - <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." /> - <xml-property name="uniqueProps" value="model-constraint-uuid" /> - <xml-property name="indexedProps" value="model-constraint-uuid" /> - <xml-property name="allowDirectRead" value="true" /> - <xml-property name="allowDirectWrite" value="false" /> - <xml-property name="container" value="model-constraints" /> - </xml-properties> - <xml-root-element name="model-constraint" /> - <java-attributes> - <xml-element java-attribute="modelConstraintUuid" name="model-constraint-uuid" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="autoGenerateUuid" value="true" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String" /> - <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.openecomp.org.v8.ConstrainedElementSets" /> - </java-attributes> - </java-type> - - <java-type name="ConstrainedElementSets"> - <xml-root-element name="constrained-element-sets" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.openecomp.org.v8.ConstrainedElementSet" /> - </java-attributes> - </java-type> - - <java-type name="ConstrainedElementSet"> - <xml-properties> - <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." /> - <xml-property name="uniqueProps" value="constrained-element-set-uuid" /> - <xml-property name="indexedProps" value="constrained-element-set-uuid" /> - <xml-property name="allowDirectRead" value="true" /> - <xml-property name="allowDirectWrite" value="false" /> - <xml-property name="container" value="constrained-element-sets" /> - </xml-properties> - <xml-root-element name="constrained-element-set" /> - <java-attributes> - <xml-element java-attribute="constrainedElementSetUuid" name="constrained-element-set-uuid" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="autoGenerateUuid" value="true" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" /> - <xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String" /> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> - <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.openecomp.org.v8.ElementChoiceSets" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - </java-attributes> - </java-type> - - <java-type name="ElementChoiceSets"> - <xml-root-element name="element-choice-sets" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.openecomp.org.v8.ElementChoiceSet" /> - </java-attributes> - </java-type> - - <java-type name="ElementChoiceSet"> - <xml-properties> - <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." /> - <xml-property name="uniqueProps" value="element-choice-set-uuid" /> - <xml-property name="indexedProps" value="element-choice-set-uuid" /> - <xml-property name="allowDirectRead" value="true" /> - <xml-property name="allowDirectWrite" value="false" /> - <xml-property name="container" value="element-choice-sets" /> - </xml-properties> - <xml-root-element name="element-choice-set" /> - <java-attributes> - <xml-element java-attribute="elementChoiceSetUuid" name="element-choice-set-uuid" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="autoGenerateUuid" value="true" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String" /> - <xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String" /> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> - <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.openecomp.org.v8.ModelElements" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - </java-attributes> - </java-type> - - <java-type name="NamedQueries"> - <xml-root-element name="named-queries" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.openecomp.org.v8.NamedQuery" /> - </java-attributes> - </java-type> - - <java-type name="NamedQuery"> - <xml-properties> - <xml-property name="description" value="TBD" /> - <xml-property name="nameProps" value="named-query-name" /> - <xml-property name="uniqueProps" value="named-query-uuid" /> - <xml-property name="indexedProps" value="named-query-uuid,named-query-name" /> - <xml-property name="container" value="named-queries" /> - <xml-property name="namespace" value="service-design-and-creation" /> - </xml-properties> - <xml-root-element name="named-query" /> - <java-attributes> - <xml-element java-attribute="namedQueryUuid" name="named-query-uuid" required="true" type="java.lang.String" xml-key="true" /> - <xml-element java-attribute="namedQueryName" name="named-query-name" required="true" type="java.lang.String" /> - <xml-element java-attribute="namedQueryVersion" name="named-query-version" required="true" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="requiredInputParams" name="required-input-param" type="java.lang.String"> - <xml-element-wrapper name="required-input-params" /> - </xml-element> - <xml-element java-attribute="description" name="description" type="java.lang.String" /> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> - <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.openecomp.org.v8.NamedQueryElements" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - </java-attributes> - </java-type> - - <java-type name="NamedQueryElements"> - <xml-root-element name="named-query-elements" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.openecomp.org.v8.NamedQueryElement" /> - </java-attributes> - </java-type> - - <java-type name="NamedQueryElement"> - <xml-properties> - <xml-property name="description" value="TBD" /> - <xml-property name="uniqueProps" value="named-query-element-uuid" /> - <xml-property name="indexedProps" value="named-query-element-uuid" /> - <xml-property name="allowDirectRead" value="true" /> - <xml-property name="allowDirectWrite" value="false" /> - <xml-property name="container" value="named-query-elements" /> - </xml-properties> - <xml-root-element name="named-query-element" /> - <java-attributes> - <xml-element java-attribute="namedQueryElementUuid" name="named-query-element-uuid" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="autoGenerateUuid" value="true" /> - </xml-properties> - </xml-element> - <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" /> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> - <xml-element java-attribute="propertyLimitDesc" name="property-limit-desc" type="java.lang.String" /> - <xml-element java-attribute="doNotOutput" name="do-not-output" type="java.lang.String" /> - <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.openecomp.org.v8.NamedQueryElements" /> - <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.openecomp.org.v8.RelatedLookups" /> - <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.openecomp.org.v8.PropertyConstraints" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - </java-attributes> - </java-type> - - <java-type name="RelatedLookups"> - <xml-root-element name="related-lookups" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.openecomp.org.v8.RelatedLookup" /> - </java-attributes> - </java-type> - - <java-type name="RelatedLookup"> - <xml-properties> - <xml-property name="description" value="TBD" /> - <xml-property name="uniqueProps" value="related-lookup-uuid" /> - <xml-property name="indexedProps" value="related-lookup-uuid" /> - <xml-property name="allowDirectRead" value="true" /> - <xml-property name="allowDirectWrite" value="false" /> - <xml-property name="container" value="related-lookups" /> - </xml-properties> - <xml-root-element name="related-lookup" /> - <java-attributes> - <xml-element java-attribute="relatedLookupUuid" name="related-lookup-uuid" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="autoGenerateUuid" value="true" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="sourceNodeType" name="source-node-type" required="true" type="java.lang.String" /> - <xml-element java-attribute="sourceNodeProperty" name="source-node-property" required="true" type="java.lang.String" /> - <xml-element java-attribute="targetNodeType" name="target-node-type" required="true" type="java.lang.String" /> - <xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" /> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - </java-attributes> - </java-type> - - <java-type name="PropertyConstraints"> - <xml-root-element name="property-constraints" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.openecomp.org.v8.PropertyConstraint" /> - </java-attributes> - </java-type> - - <java-type name="PropertyConstraint"> - <xml-properties> - <xml-property name="description" value="TBD" /> - <xml-property name="uniqueProps" value="property-constraint-uuid" /> - <xml-property name="indexedProps" value="property-constraint-uuid" /> - <xml-property name="allowDirectRead" value="true" /> - <xml-property name="allowDirectWrite" value="false" /> - <xml-property name="container" value="property-constraints" /> - </xml-properties> - <xml-root-element name="property-constraint" /> - <java-attributes> - <xml-element java-attribute="propertyConstraintUuid" name="property-constraint-uuid" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="autoGenerateUuid" value="true" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" /> - <xml-element java-attribute="property-name" name="property-name" required="true" type="java.lang.String" /> - <xml-element java-attribute="property-value" name="property-value" required="true" type="java.lang.String" /> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> - </java-attributes> - </java-type> - - <java-type name="ModelAndNamedQuerySearch"> - <xml-properties> - <xml-property name="description" value="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query" /> - </xml-properties> - <xml-root-element name="model-and-named-query-search" /> - <java-attributes> - <xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.openecomp.org.v8.QueryParameters" /> - <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.openecomp.org.v8.InstanceFilters" /> - <xml-element java-attribute="topNodeType" name="top-node-type" type="java.lang.String" /> - </java-attributes> - </java-type> - - <java-type name="QueryParameters"> - <xml-properties> - <xml-property name="description" value="QueryParameters for performing a named-query or model query" /> - </xml-properties> - <xml-root-element name="query-parameters" /> - <java-attributes> - <xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.openecomp.org.v8.NamedQuery" /> - <xml-element java-attribute="model" name="model" type="inventory.aai.openecomp.org.v8.Model" /> - </java-attributes> - </java-type> - - <java-type name="InstanceFilters"> - <xml-properties> - <xml-property name="description" value="InstanceFilters for performing a named-query or model query" /> - </xml-properties> - <xml-root-element name="instance-filters" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.openecomp.org.v8.InstanceFilter" /> - </java-attributes> - </java-type> - - <java-type name="InstanceFilter"> - <xml-properties> - <xml-property name="description" value="InstanceFilter for performing a named-query or model query" /> - <xml-property name="container" value="instance-filters" /> - </xml-properties> - <xml-root-element name="instance-filter" /> - <java-attributes> - <xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any" /> - </java-attributes> - </java-type> - - <java-type name="Properties"> - <xml-properties> - <xml-property name="description" value="Property holder for query properties or instance properties" /> - </xml-properties> - <xml-root-element name="properties" /> - <java-attributes> - <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" /> - <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" /> - </java-attributes> - </java-type> - - <java-type name="ResponseList"> - <xml-properties> - <xml-property name="description" value="Response container for the results of a named-query or model query" /> - </xml-properties> - <xml-root-element name="response-list" /> - <java-attributes> - <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.openecomp.org.v8.InventoryResponseItems" /> - </java-attributes> - </java-type> - - <java-type name="InventoryResponseItems"> - <xml-properties> - <xml-property name="description" value="Container for inventory items in response list" /> - <xml-property name="container" value="response-list" /> - </xml-properties> - <xml-root-element name="inventory-response-items" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.openecomp.org.v8.InventoryResponseItem" /> - </java-attributes> - </java-type> - - <java-type name="InventoryResponseItem"> - <xml-properties> - <xml-property name="description" value="Inventory item for response list" /> - <xml-property name="container" value="inventory-response-items" /> - </xml-properties> - <xml-root-element name="inventory-response-item" /> - <java-attributes> - <xml-element java-attribute="modelName" name="model-name" type="java.lang.String" /> - <xml-any-element java-attribute="item" /> - <xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.openecomp.org.v8.ExtraProperties" /> - <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.openecomp.org.v8.InventoryResponseItems" /> - </java-attributes> - </java-type> - - <java-type name="ExtraProperties"> - <xml-properties> - <xml-property name="description" value="Extra properties for inventory item for response list" /> - </xml-properties> - <xml-root-element name="extra-properties" /> - <java-attributes> - <xml-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.openecomp.org.v8.ExtraProperty" /> - </java-attributes> - </java-type> - - <java-type name="ExtraProperty"> - <xml-root-element name="extra-property" /> - <java-attributes> - <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" /> - <xml-any-element java-attribute="propertyValue" lax="true" name="property-value" /> - </java-attributes> - </java-type> - - <java-type name="SegmentationAssignments"> - <xml-properties> - <xml-property name="description" value="Collection of openstack segmentation assignments" /> - </xml-properties> - <xml-root-element name="segmentation-assignments" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.openecomp.org.v8.SegmentationAssignment" /> - </java-attributes> - </java-type> - - <java-type name="SegmentationAssignment"> - <xml-root-element name="segmentation-assignment" /> - <java-attributes> - <xml-element java-attribute="segmentationId" name="segmentation-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Concurrency value" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Openstack segmentation assignment." /> - <xml-property name="indexedProps" value="segmentation-id" /> - <xml-property name="dependentOn" value="l3-network" /> - <xml-property name="container" value="segmentation-assignments" /> - </xml-properties> - </java-type> - - </java-types> + </java-types> </xml-bindings> diff --git a/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v9.xml b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v9.xml index 22c0d4ae..f53bd860 100644 --- a/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v9.xml +++ b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v9.xml @@ -8,7 +8,9 @@ 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 + + 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. @@ -17,7 +19,7 @@ ============LICENSE_END========================================================= --> -<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.openecomp.org.v9" xml-mapping-metadata-complete="true"> +<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v9" xml-mapping-metadata-complete="true"> <xml-schema element-form-default="QUALIFIED"> <xml-ns namespace-uri="http://org.openecomp.aai.inventory/v9" /> </xml-schema> @@ -25,14 +27,15 @@ <java-type name="Inventory"> <xml-root-element name="inventory" /> <java-attributes> - <xml-element java-attribute="search" name="search" type="inventory.aai.openecomp.org.v9.Search" /> - <xml-element java-attribute="actions" name="actions" type="inventory.aai.openecomp.org.v9.Actions" /> - <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.openecomp.org.v9.CloudInfrastructure" /> - <xml-element java-attribute="business" name="business" type="inventory.aai.openecomp.org.v9.Business" /> - <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.openecomp.org.v9.ServiceDesignAndCreation" /> - <xml-element java-attribute="network" name="network" type="inventory.aai.openecomp.org.v9.Network" /> - <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.openecomp.org.v9.AaiInternal" /> - <xml-element java-attribute="nodes" name="nodes" type="inventory.aai.openecomp.org.v9.Nodes"/> + <xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v9.Search" /> + <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v9.Actions" /> + <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v9.CloudInfrastructure" /> + <xml-element java-attribute="licenseManagement" name="license-management" type="inventory.aai.onap.org.v9.LicenseManagement" /> + <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v9.Business" /> + <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v9.ServiceDesignAndCreation" /> + <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v9.Network" /> + <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v9.AaiInternal" /> + <xml-element java-attribute="nodes" name="nodes" type="inventory.aai.onap.org.v9.Nodes"/> </java-attributes> </java-type> @@ -42,24 +45,24 @@ <java-type name="Search"> <xml-root-element name="search" /> <java-attributes> - <xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.openecomp.org.v9.EdgeTagQueryResult" /> - <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.openecomp.org.v9.EdgeTagQueryRequest" /> - <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.openecomp.org.v9.SearchResults" /> - <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.openecomp.org.v9.SdnZoneResponse" /> + <xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v9.EdgeTagQueryResult" /> + <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v9.EdgeTagQueryRequest" /> + <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v9.SearchResults" /> + <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v9.SdnZoneResponse" /> </java-attributes> </java-type> <java-type name="EdgeTagQueryResult"> <xml-root-element name="edge-tag-query-result" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.openecomp.org.v9.TaggedInventoryItemList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v9.TaggedInventoryItemList" /> </java-attributes> </java-type> <java-type name="TaggedInventoryItemList"> <xml-root-element name="tagged-inventory-item-list" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.openecomp.org.v9.InventoryItem" /> + <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v9.InventoryItem" /> </java-attributes> </java-type> @@ -68,8 +71,8 @@ <java-attributes> <xml-element java-attribute="inventoryItemType" name="inventory-item-type" type="java.lang.String" /> <xml-element java-attribute="inventoryItemLink" name="inventory-item-link" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.openecomp.org.v9.InventoryItemData" /> - <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.openecomp.org.v9.TaggedInventoryItemList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.onap.org.v9.InventoryItemData" /> + <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v9.TaggedInventoryItemList" /> </java-attributes> </java-type> @@ -87,9 +90,9 @@ <xml-element java-attribute="edgeTag" name="edge-tag" type="java.lang.String" /> <xml-element java-attribute="resultDetail" name="result-detail" type="java.lang.String" /> <xml-element java-attribute="startNodeType" name="start-node-type" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.openecomp.org.v9.StartNodeFilter" /> - <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.openecomp.org.v9.IncludeNodeFilter" /> - <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.openecomp.org.v9.SecondaryFilter" /> + <xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.onap.org.v9.StartNodeFilter" /> + <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v9.IncludeNodeFilter" /> + <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v9.SecondaryFilter" /> </java-attributes> </java-type> @@ -120,7 +123,7 @@ <java-type name="SearchResults"> <xml-root-element name="search-results" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.openecomp.org.v9.ResultData" /> + <xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v9.ResultData" /> </java-attributes> </java-type> @@ -143,16 +146,16 @@ <java-type name="SdnZoneResponse"> <xml-root-element name="sdn-zone-response" /> <java-attributes> - <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.openecomp.org.v9.OamNetworks" /> - <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.openecomp.org.v9.AzAndDvsSwitches" /> + <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v9.OamNetworks" /> + <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v9.AzAndDvsSwitches" /> </java-attributes> </java-type> <java-type name="AzAndDvsSwitches"> <xml-root-element name="az-and-dvs-switches" /> <java-attributes> - <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.openecomp.org.v9.DvsSwitches" /> - <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.openecomp.org.v9.AvailabilityZone" /> + <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v9.DvsSwitches" /> + <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v9.AvailabilityZone" /> </java-attributes> </java-type> @@ -162,8 +165,8 @@ </xml-properties> <xml-root-element name="actions" /> <java-attributes> - <xml-element java-attribute="update" name="update" type="inventory.aai.openecomp.org.v9.Update" /> - <xml-element java-attribute="notify" name="notify" type="inventory.aai.openecomp.org.v9.Notify" /> + <xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v9.Update" /> + <xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v9.Notify" /> </java-attributes> </java-type> @@ -174,9 +177,9 @@ <xml-root-element name="update" /> <java-attributes> <xml-element java-attribute="updateNodeType" name="update-node-type" required="true" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.openecomp.org.v9.UpdateNodeKey" /> + <xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.v9.UpdateNodeKey" /> <xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.openecomp.org.v9.Action" /> + <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v9.Action" /> </java-attributes> </java-type> @@ -184,7 +187,7 @@ <xml-root-element name="action" /> <java-attributes> <xml-element java-attribute="actionType" name="action-type" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.openecomp.org.v9.ActionData" /> + <xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.onap.org.v9.ActionData" /> </java-attributes> </java-type> @@ -210,7 +213,7 @@ <xml-element java-attribute="eventId" name="event-id" required="true" type="java.lang.String" /> <xml-element java-attribute="nodeType" name="node-type" type="java.lang.String" /> <xml-element java-attribute="eventTrigger" name="event-trigger" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.openecomp.org.v9.KeyData" /> + <xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.onap.org.v9.KeyData" /> <xml-element java-attribute="selflink" name="selflink" type="java.lang.String" /> </java-attributes> </java-type> @@ -229,18 +232,18 @@ </xml-properties> <xml-root-element name="cloud-infrastructure" /> <java-attributes> - <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.openecomp.org.v9.Complexes" /> - <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.openecomp.org.v9.CloudRegions" /> - <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.openecomp.org.v9.NetworkProfiles" /> - <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.openecomp.org.v9.Pservers" /> - <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.openecomp.org.v9.VirtualDataCenters" /> + <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v9.Complexes" /> + <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v9.CloudRegions" /> + <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v9.NetworkProfiles" /> + <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v9.Pservers" /> + <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v9.VirtualDataCenters" /> </java-attributes> </java-type> <java-type name="CloudRegions"> <xml-root-element name="cloud-regions" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.openecomp.org.v9.CloudRegion" /> + <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v9.CloudRegion" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> @@ -252,7 +255,7 @@ <java-attributes> <xml-element java-attribute="cloudOwner" name="cloud-owner" required="true" type="java.lang.String" xml-key="true"> <xml-properties> - <xml-property name="description" value="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname" /> + <xml-property name="description" value="Identifies the vendor and cloud name, e.g., att-aic. First part of composite key should be formatted as vendor-cloudname" /> </xml-properties> </xml-element> <xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true"> @@ -295,19 +298,19 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.openecomp.org.v9.VolumeGroups" /> - <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.openecomp.org.v9.Tenants" /> - <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.openecomp.org.v9.Flavors" /> - <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.openecomp.org.v9.GroupAssignments" /> - <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.openecomp.org.v9.Snapshots" /> - <xml-element java-attribute="images" name="images" type="inventory.aai.openecomp.org.v9.Images" /> - <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.openecomp.org.v9.DvsSwitches" /> - <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.openecomp.org.v9.OamNetworks" /> - <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.openecomp.org.v9.AvailabilityZones" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v9.VolumeGroups" /> + <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v9.Tenants" /> + <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v9.Flavors" /> + <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v9.GroupAssignments" /> + <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v9.Snapshots" /> + <xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v9.Images" /> + <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v9.DvsSwitches" /> + <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v9.OamNetworks" /> + <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v9.AvailabilityZones" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> - <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation." /> + <xml-property name="description" value="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." /> <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type" /> <xml-property name="nameProps" value="owner-defined-type" /> <xml-property name="container" value="cloud-regions" /> @@ -320,7 +323,7 @@ </xml-properties> <xml-root-element name="volume-groups" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.openecomp.org.v9.VolumeGroup" /> + <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v9.VolumeGroup" /> </java-attributes> </java-type> @@ -369,7 +372,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Persistent block-level storage." /> @@ -383,7 +386,7 @@ <java-type name="RelationshipList"> <xml-root-element name="relationship-list" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.openecomp.org.v9.Relationship" /> + <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v9.Relationship" /> </java-attributes> </java-type> @@ -400,8 +403,8 @@ <xml-property name="description" value="URL to the object in A&AI." /> </xml-properties> </xml-element> - <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.openecomp.org.v9.RelationshipData" /> - <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.openecomp.org.v9.RelatedToProperty" /> + <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v9.RelationshipData" /> + <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v9.RelatedToProperty" /> </java-attributes> </java-type> @@ -443,7 +446,7 @@ </xml-properties> <xml-root-element name="complexes" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.openecomp.org.v9.Complex" /> + <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v9.Complex" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> @@ -494,8 +497,8 @@ <xml-element java-attribute="longitude" name="longitude" type="java.lang.String" /> <xml-element java-attribute="elevation" name="elevation" type="java.lang.String" /> <xml-element java-attribute="lata" name="lata" type="java.lang.String" /> - <xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.openecomp.org.v9.CtagPools" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v9.CtagPools" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Collection of physical locations that can house cloud-regions." /> @@ -510,7 +513,7 @@ <java-type name="CtagPools"> <xml-root-element name="ctag-pools" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.openecomp.org.v9.CtagPool" /> + <xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v9.CtagPool" /> </java-attributes> </java-type> @@ -542,7 +545,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose." /> @@ -558,7 +561,7 @@ </xml-properties> <xml-root-element name="tenants" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.openecomp.org.v9.Tenant" /> + <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v9.Tenant" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> @@ -583,8 +586,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="vservers" name="vservers" type="inventory.aai.openecomp.org.v9.Vservers" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="vservers" name="vservers" type="inventory.aai.onap.org.v9.Vservers" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Openstack tenant" /> @@ -602,7 +605,7 @@ </xml-properties> <xml-root-element name="vservers" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.openecomp.org.v9.Vserver" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v9.Vserver" /> </java-attributes> </java-type> @@ -651,9 +654,9 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="volumes" name="volumes" type="inventory.aai.openecomp.org.v9.Volumes" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v9.LInterfaces" /> + <xml-element java-attribute="volumes" name="volumes" type="inventory.aai.onap.org.v9.Volumes" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v9.LInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="Virtual Servers, aka virtual machine or VM." /> @@ -671,7 +674,7 @@ </xml-properties> <xml-root-element name="l-interfaces" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.openecomp.org.v9.LInterface" /> + <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v9.LInterface" /> </java-attributes> </java-type> @@ -728,11 +731,11 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.openecomp.org.v9.Vlans" /> - <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.openecomp.org.v9.SriovVfs" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> - <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v9.L3InterfaceIpv4AddressList" /> - <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v9.L3InterfaceIpv6AddressList" /> + <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v9.Vlans" /> + <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v9.SriovVfs" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v9.L3InterfaceIpv4AddressList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v9.L3InterfaceIpv6AddressList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Logical interfaces, e.g., a vnic." /> @@ -748,7 +751,7 @@ </xml-properties> <xml-root-element name="sriov-vfs" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.openecomp.org.v9.SriovVf" /> + <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v9.SriovVf" /> </java-attributes> </java-type> <java-type name="SriovVf"> @@ -824,7 +827,7 @@ <xml-property name="description" value="Neutron network id of the interface" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)" /> @@ -877,7 +880,7 @@ <xml-property name="description" value="Neutron id of subnet that address belongs to" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="IPv4 Address Range" /> @@ -889,7 +892,7 @@ <java-type name="Vlans"> <xml-root-element name="vlans" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.openecomp.org.v9.Vlan" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v9.Vlan" /> </java-attributes> </java-type> @@ -947,9 +950,9 @@ <xml-property name="description" value="Status of a vnf's vlan interface, on which the customer circuit resides, mastered by SDN-C." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> - <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v9.L3InterfaceIpv4AddressList" /> - <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v9.L3InterfaceIpv6AddressList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v9.L3InterfaceIpv4AddressList" /> + <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v9.L3InterfaceIpv6AddressList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Definition of vlan" /> @@ -1003,7 +1006,7 @@ <xml-property name="description" value="Neutron id of subnet that address belongs to" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="IPv6 Address Range" /> @@ -1018,7 +1021,7 @@ </xml-properties> <xml-root-element name="volumes" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.openecomp.org.v9.Volume" /> + <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v9.Volume" /> </java-attributes> </java-type> @@ -1040,7 +1043,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Ephemeral Block storage volume." /> @@ -1056,7 +1059,7 @@ </xml-properties> <xml-root-element name="flavors" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.openecomp.org.v9.Flavor" /> + <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v9.Flavor" /> </java-attributes> </java-type> @@ -1118,7 +1121,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Openstack flavor." /> @@ -1135,7 +1138,7 @@ </xml-properties> <xml-root-element name="snapshots" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.openecomp.org.v9.Snapshot" /> + <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v9.Snapshot" /> </java-attributes> </java-type> @@ -1197,7 +1200,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Openstack snapshot" /> @@ -1215,7 +1218,7 @@ </xml-properties> <xml-root-element name="group-assignments" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.openecomp.org.v9.GroupAssignment" /> + <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v9.GroupAssignment" /> </java-attributes> </java-type> @@ -1247,7 +1250,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)." /> @@ -1264,7 +1267,7 @@ </xml-properties> <xml-root-element name="images" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.openecomp.org.v9.Image" /> + <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v9.Image" /> </java-attributes> </java-type> @@ -1321,8 +1324,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> - <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v9.Metadata" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> + <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v9.Metadata" /> </java-attributes> <xml-properties> <xml-property name="description" value="Openstack image." /> @@ -1339,7 +1342,7 @@ </xml-properties> <xml-root-element name="metadata" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.openecomp.org.v9.Metadatum" /> + <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v9.Metadatum" /> </java-attributes> </java-type> @@ -1368,7 +1371,7 @@ </xml-properties> <xml-root-element name="dvs-switches" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.openecomp.org.v9.DvsSwitch" /> + <xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v9.DvsSwitch" /> </java-attributes> </java-type> @@ -1390,7 +1393,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="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. " /> @@ -1406,7 +1409,7 @@ </xml-properties> <xml-root-element name="network-profiles" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.openecomp.org.v9.NetworkProfile" /> + <xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v9.NetworkProfile" /> </java-attributes> </java-type> @@ -1428,7 +1431,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Network profile populated by SDN-GP for SNMP" /> @@ -1444,7 +1447,7 @@ </xml-properties> <xml-root-element name="pservers" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.openecomp.org.v9.Pserver" /> + <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v9.Pserver" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> @@ -1580,9 +1583,9 @@ <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> - <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v9.PInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v9.LagInterfaces" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> + <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v9.PInterfaces" /> + <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v9.LagInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver." /> @@ -1600,7 +1603,7 @@ </xml-properties> <xml-root-element name="p-interfaces" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.openecomp.org.v9.PInterface" /> + <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v9.PInterface" /> </java-attributes> </java-type> @@ -1652,8 +1655,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v9.LInterfaces" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v9.LInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="Physical interface (e.g., nic)" /> @@ -1670,7 +1673,7 @@ </xml-properties> <xml-root-element name="lag-interfaces" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.openecomp.org.v9.LagInterface" /> + <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v9.LagInterface" /> </java-attributes> </java-type> @@ -1717,8 +1720,8 @@ <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v9.LInterfaces" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v9.LInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="Link aggregate interface" /> @@ -1734,7 +1737,7 @@ </xml-properties> <xml-root-element name="oam-networks" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.openecomp.org.v9.OamNetwork" /> + <xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v9.OamNetwork" /> </java-attributes> </java-type> @@ -1771,7 +1774,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="OAM network, to be deprecated shortly. Do not use for new purposes. " /> @@ -1788,7 +1791,7 @@ </xml-properties> <xml-root-element name="availability-zones" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.openecomp.org.v9.AvailabilityZone" /> + <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v9.AvailabilityZone" /> </java-attributes> </java-type> @@ -1808,6 +1811,7 @@ <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String"> <xml-properties> <xml-property name="description" value="State that indicates whether the availability zone should be used, etc. Source of truth should define valid values." /> + <xml-property name="dbAlias" value="operational-status" /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> @@ -1815,7 +1819,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Availability zone, a collection of compute hosts/pservers" /> @@ -1831,7 +1835,7 @@ </xml-properties> <xml-root-element name="virtual-data-centers" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.openecomp.org.v9.VirtualDataCenter" /> + <xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v9.VirtualDataCenter" /> </java-attributes> </java-type> @@ -1853,7 +1857,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" /> @@ -1864,8 +1868,50 @@ </xml-properties> </java-type> + <java-type name="LicenseManagement"> + <xml-root-element name="license-management" /> + <java-attributes> + <xml-element java-attribute="licenseKeyResources" name="license-key-resources" type="inventory.aai.onap.org.v9.LicenseKeyResources" /> + </java-attributes> + </java-type> + <java-type name="LicenseKeyResources"> + <xml-root-element name="license-key-resources" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="licenseKeyResource" name="license-key-resource" type="inventory.aai.onap.org.v9.LicenseKeyResource" /> + </java-attributes> + </java-type> + <java-type name="LicenseKeyResource"> + <xml-root-element name="license-key-resource" /> + <java-attributes> + <xml-element java-attribute="attUuid" name="att-uuid" required="true" type="java.lang.String" xml-key="true" /> + <xml-element java-attribute="assignmentType" name="assignment-type" type="java.lang.String" /> + <xml-element java-attribute="assignmentStatus" name="assignment-status" type="java.lang.String" /> + <xml-element java-attribute="assignmentGroupUuid" name="assignment-group-uuid" required="true" type="java.lang.String" /> + <xml-element java-attribute="assignmentDate" name="assignment-date" type="java.lang.String" /> + <xml-element java-attribute="name" name="name" type="java.lang.String" /> + <xml-element java-attribute="modelUuid" name="model-uuid" type="java.lang.String" /> + <xml-element java-attribute="modelVersion" name="model-version" type="java.lang.String" /> + <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String" /> + <xml-element java-attribute="licenseKeyFileUrl" name="license-key-file-url" type="java.lang.String" /> + <xml-element container-type="java.util.ArrayList" java-attribute="supplierReleaseList" name="supplier-release-list" type="java.lang.String" /> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="OBSOLETE OBJECT: do not use" /> + <xml-property name="nameProps" value="name" /> + <xml-property name="indexedProps" value="assignment-group-uuid,att-uuid,name" /> + <xml-property name="uniqueProps" value="att-uuid" /> + <xml-property name="container" value="license-key-resources" /> + <xml-property name="namespace" value="license-management" /> + </xml-properties> + </java-type> <java-type name="Business"> <xml-properties> @@ -1873,8 +1919,8 @@ </xml-properties> <xml-root-element name="business" /> <java-attributes> - <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.openecomp.org.v9.Connectors" /> - <xml-element java-attribute="customers" name="customers" type="inventory.aai.openecomp.org.v9.Customers" /> + <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v9.Connectors" /> + <xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v9.Customers" /> </java-attributes> </java-type> @@ -1884,7 +1930,7 @@ </xml-properties> <xml-root-element name="connectors" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.openecomp.org.v9.Connector" /> + <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v9.Connector" /> </java-attributes> </java-type> @@ -1932,8 +1978,8 @@ <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> - <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v9.Metadata" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> + <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v9.Metadata" /> </java-attributes> <xml-properties> <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" /> @@ -1949,7 +1995,7 @@ </xml-properties> <xml-root-element name="customers" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.openecomp.org.v9.Customer" /> + <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v9.Customer" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> @@ -1980,8 +2026,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.openecomp.org.v9.ServiceSubscriptions" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v9.ServiceSubscriptions" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="customer identifiers to provide linkage back to BSS information." /> @@ -2000,7 +2046,7 @@ </xml-properties> <xml-root-element name="service-subscriptions" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.openecomp.org.v9.ServiceSubscription" /> + <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v9.ServiceSubscription" /> </java-attributes> </java-type> @@ -2022,9 +2068,9 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.openecomp.org.v9.ServiceInstances"> + <xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v9.ServiceInstances"> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Object that group service instances." /> @@ -2041,7 +2087,7 @@ </xml-properties> <xml-root-element name="service-instances" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.openecomp.org.v9.ServiceInstance" /> + <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v9.ServiceInstance" /> </java-attributes> </java-type> @@ -2119,11 +2165,6 @@ <xml-property name="description" value="URL customers will use to access the vHN Portal." /> </xml-properties> </xml-element> - <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Operational status of the service-instance." /> - </xml-properties> - </xml-element> <xml-element java-attribute="serviceInstanceLocationId" name="service-instance-location-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="An identifier that customers assign to the location where this service is being used." /> @@ -2144,9 +2185,9 @@ <xml-property name="description" value="Orchestration status of this service." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> - <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v9.Metadata" /> - <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.openecomp.org.v9.AllottedResources" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> + <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v9.Metadata" /> + <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v9.AllottedResources" /> </java-attributes> <xml-properties> <xml-property name="description" value="Instance of a service" /> @@ -2165,11 +2206,11 @@ </xml-properties> <xml-root-element name="service-design-and-creation" /> <java-attributes> - <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.openecomp.org.v9.VnfImages" /> - <xml-element java-attribute="services" name="services" type="inventory.aai.openecomp.org.v9.Services" /> - <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.openecomp.org.v9.ServiceCapabilities" /> - <xml-element java-attribute="models" name="models" type="inventory.aai.openecomp.org.v9.Models" /> - <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.openecomp.org.v9.NamedQueries" /> + <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v9.VnfImages" /> + <xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v9.Services" /> + <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v9.ServiceCapabilities" /> + <xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v9.Models" /> + <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v9.NamedQueries" /> </java-attributes> </java-type> @@ -2179,14 +2220,14 @@ </xml-properties> <xml-root-element name="vnf-images" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.openecomp.org.v9.VnfImage" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v9.VnfImage" /> </java-attributes> </java-type> <java-type name="VnfImage"> <xml-root-element name="vnf-image" /> <java-attributes> - <xml-element java-attribute="vnfImageUuid" name="vnf-image-uuid" required="true" type="java.lang.String" xml-key="true"> + <xml-element java-attribute="attUuid" name="att-uuid" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique ID of this asset" /> </xml-properties> @@ -2216,12 +2257,12 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers. This is a kludge." /> - <xml-property name="indexedProps" value="application,vnf-image-uuid,application-vendor,application-version" /> - <xml-property name="uniqueProps" value="vnf-image-uuid" /> + <xml-property name="indexedProps" value="application,att-uuid,application-vendor,application-version" /> + <xml-property name="uniqueProps" value="att-uuid" /> <xml-property name="container" value="vnf-images" /> <xml-property name="namespace" value="service-design-and-creation" /> </xml-properties> @@ -2233,7 +2274,7 @@ </xml-properties> <xml-root-element name="services" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.openecomp.org.v9.Service" /> + <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v9.Service" /> </java-attributes> </java-type> @@ -2265,7 +2306,7 @@ <xml-property name="description" value="service version" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Stand-in for service model definitions. Likely to be deprecated in favor of models from ASDC. Does not strictly map to ASDC services." /> @@ -2281,7 +2322,7 @@ </xml-properties> <xml-root-element name="service-capabilities" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.openecomp.org.v9.ServiceCapability" /> + <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v9.ServiceCapability" /> </java-attributes> </java-type> @@ -2303,7 +2344,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Early definition of server/resource pairings, likely to be replaced by models. No new use should be made of this." /> @@ -2319,24 +2360,25 @@ </xml-properties> <xml-root-element name="network" /> <java-attributes> - <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.openecomp.org.v9.LogicalLinks" /> - <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.openecomp.org.v9.SitePairSets" /> - <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.openecomp.org.v9.VpnBindings" /> - <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.openecomp.org.v9.VplsPes" /> - <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.openecomp.org.v9.MulticastConfigurations" /> - <xml-element java-attribute="vces" name="vces" type="inventory.aai.openecomp.org.v9.Vces" /> - <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.openecomp.org.v9.Vnfcs" /> - <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.openecomp.org.v9.L3Networks" /> - <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.openecomp.org.v9.NetworkPolicies" /> - <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.openecomp.org.v9.GenericVnfs" /> - <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.openecomp.org.v9.LagLinks" /> - <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.openecomp.org.v9.Newvces" /> - <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.openecomp.org.v9.Pnfs" /> - <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.openecomp.org.v9.PhysicalLinks" /> - <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.openecomp.org.v9.IpsecConfigurations" /> - <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.openecomp.org.v9.RouteTableReferences" /> - <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.openecomp.org.v9.InstanceGroups" /> - <xml-element java-attribute="zones" name="zones" type="inventory.aai.openecomp.org.v9.Zones" /> + <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v9.LogicalLinks" /> + <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v9.SitePairSets" /> + <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v9.VpnBindings" /> + <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v9.VplsPes" /> + <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v9.MulticastConfigurations" /> + <xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v9.Vces" /> + <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v9.Vnfcs" /> + <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v9.L3Networks" /> + <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v9.NetworkPolicies" /> + <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v9.GenericVnfs" /> + <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v9.LagLinks" /> + <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v9.Newvces" /> + <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v9.Pnfs" /> + <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v9.PhysicalLinks" /> + <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v9.IpsecConfigurations" /> + <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v9.RouteTableReferences" /> + <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v9.InstanceGroups" /> + <xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v9.Zones" /> + <xml-element java-attribute="testObjects" name="test-objects" type="inventory.aai.onap.org.v9.TestObjects" /> </java-attributes> </java-type> @@ -2346,7 +2388,7 @@ </xml-properties> <xml-root-element name="logical-links" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.openecomp.org.v9.LogicalLink" /> + <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v9.LogicalLink" /> </java-attributes> </java-type> @@ -2375,7 +2417,7 @@ </xml-element> <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="v4, v6, or ds for dual stack" /> + <xml-property name="description" value="v4, v6, or ds for dual stack (should be att-ip-version)" /> </xml-properties> </xml-element> <xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String"> @@ -2454,7 +2496,7 @@ <xml-property name="description" value="Reason for this entity, role it is playing" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points" /> @@ -2472,7 +2514,7 @@ </xml-properties> <xml-root-element name="site-pair-sets" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.openecomp.org.v9.SitePairSet" /> + <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v9.SitePairSet" /> </java-attributes> </java-type> @@ -2489,8 +2531,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.openecomp.org.v9.RoutingInstances" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v9.RoutingInstances" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Set of instances for probes used to measure service level agreements" /> @@ -2507,7 +2549,7 @@ </xml-properties> <xml-root-element name="routing-instances" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.openecomp.org.v9.RoutingInstance" /> + <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v9.RoutingInstance" /> </java-attributes> </java-type> @@ -2529,8 +2571,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.openecomp.org.v9.SitePairs" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v9.SitePairs" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="routing-instance-id" /> @@ -2546,7 +2588,7 @@ </xml-properties> <xml-root-element name="site-pairs" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.openecomp.org.v9.SitePair" /> + <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v9.SitePair" /> </java-attributes> </java-type> @@ -2580,7 +2622,7 @@ </xml-element> <xml-element java-attribute="destinationEquipType" name="destination-equip-type" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="The type of destinatination equipment. Could be Router, etc." /> + <xml-property name="description" value="The type of destinatination equipment. Could be Router, UCPE, etc." /> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> @@ -2588,8 +2630,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.openecomp.org.v9.ClassesOfService" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v9.ClassesOfService" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="site-pair-id" /> @@ -2605,7 +2647,7 @@ </xml-properties> <xml-root-element name="classes-of-service" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.openecomp.org.v9.ClassOfService" /> + <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v9.ClassOfService" /> </java-attributes> </java-type> @@ -2632,7 +2674,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="cos" /> @@ -2644,7 +2686,7 @@ <java-type name="VpnBindings"> <xml-root-element name="vpn-bindings" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.openecomp.org.v9.VpnBinding" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v9.VpnBinding" /> </java-attributes> </java-type> @@ -2694,7 +2736,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList"> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList"> <xml-properties> <xml-property name="description" value="l3-networks relate to vpn-bindings" /> </xml-properties> @@ -2717,7 +2759,7 @@ </xml-properties> <xml-root-element name="vpls-pes" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.openecomp.org.v9.VplsPe" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v9.VplsPe" /> </java-attributes> </java-type> @@ -2750,9 +2792,9 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> - <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v9.PInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v9.LagInterfaces" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> + <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v9.PInterfaces" /> + <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v9.LagInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="VPLS Provider Edge routers." /> @@ -2768,7 +2810,7 @@ </xml-properties> <xml-root-element name="multicast-configurations" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.openecomp.org.v9.MulticastConfiguration" /> + <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v9.MulticastConfiguration" /> </java-attributes> </java-type> @@ -2795,7 +2837,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="multicast-configuration-id" /> @@ -2811,7 +2853,7 @@ </xml-properties> <xml-root-element name="vces" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.openecomp.org.v9.Vce" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v9.Vce" /> </java-attributes> </java-type> @@ -2856,6 +2898,7 @@ <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Indicator for whether the resource is considered operational" /> + <xml-property name="dbAlias" value="operational-status" /> </xml-properties> </xml-element> <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String"> @@ -2913,10 +2956,10 @@ <xml-property name="description" value="OBSOLETE - see child relationships" /> </xml-properties> </xml-element> - <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.openecomp.org.v9.PortGroups" /> - <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.openecomp.org.v9.Licenses" /> - <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.openecomp.org.v9.Entitlements" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v9.PortGroups" /> + <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v9.Licenses" /> + <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v9.Entitlements" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated." /> @@ -2933,7 +2976,7 @@ <java-type name="PortGroups"> <xml-root-element name="port-groups" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.openecomp.org.v9.PortGroup" /> + <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v9.PortGroup" /> </java-attributes> </java-type> @@ -2995,8 +3038,8 @@ <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" /> </xml-properties> </xml-element> - <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.openecomp.org.v9.CvlanTags" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v9.CvlanTags" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Used to capture the network interfaces of this VCE" /> @@ -3010,7 +3053,7 @@ <java-type name="CvlanTags"> <xml-root-element name="cvlan-tags" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.openecomp.org.v9.CvlanTagEntry" /> + <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v9.CvlanTagEntry" /> </java-attributes> </java-type> @@ -3027,7 +3070,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="dependentOn" value="port-group" /> @@ -3044,7 +3087,7 @@ </xml-properties> <xml-root-element name="vnfcs" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.openecomp.org.v9.Vnfc" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v9.Vnfc" /> </java-attributes> </java-type> @@ -3103,7 +3146,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation" /> @@ -3116,7 +3159,7 @@ <java-type name="L3Networks"> <xml-root-element name="l3-networks" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.openecomp.org.v9.L3Network" /> + <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v9.L3Network" /> </java-attributes> </java-type> @@ -3259,10 +3302,10 @@ <xml-property name="description" value="Path to the controller object." /> </xml-properties> </xml-element> - <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.openecomp.org.v9.Subnets" /> - <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.openecomp.org.v9.CtagAssignments" /> - <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.openecomp.org.v9.SegmentationAssignments" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" > + <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v9.Subnets" /> + <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v9.CtagAssignments" /> + <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v9.SegmentationAssignments" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" > <xml-properties> <xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding" /> </xml-properties> @@ -3281,7 +3324,7 @@ <java-type name="NetworkPolicies"> <xml-root-element name="network-policies" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.openecomp.org.v9.NetworkPolicy" /> + <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v9.NetworkPolicy" /> </java-attributes> </java-type> <java-type name="NetworkPolicy"> @@ -3307,7 +3350,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="nameProps" value="network-policy-fqdn" /> @@ -3321,7 +3364,7 @@ <java-type name="CtagAssignments"> <xml-root-element name="ctag-assignments" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.openecomp.org.v9.CtagAssignment" /> + <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v9.CtagAssignment" /> </java-attributes> </java-type> @@ -3338,7 +3381,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="vlan-id-inner" /> @@ -3350,7 +3393,7 @@ <java-type name="Subnets"> <xml-root-element name="subnets" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.openecomp.org.v9.Subnet" /> + <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v9.Subnet" /> </java-attributes> </java-type> @@ -3418,7 +3461,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="indexedProps" value="subnet-id,subnet-name" /> @@ -3435,7 +3478,7 @@ </xml-properties> <xml-root-element name="generic-vnfs" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.openecomp.org.v9.GenericVnf" /> + <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v9.GenericVnf" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> @@ -3483,6 +3526,7 @@ <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Indicator for whether the resource is considered operational. Valid values are in-service-path and out-of-service-path." /> + <xml-property name="dbAlias" value="operational-status" /> </xml-properties> </xml-element> <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String"> @@ -3512,7 +3556,7 @@ </xml-element> <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="identifier of managed by company or customer" /> + <xml-property name="description" value="identifier of managed by ATT or customer" /> </xml-properties> </xml-element> <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String"> @@ -3537,32 +3581,32 @@ </xml-element> <xml-element java-attribute="vcpu" name="vcpu" type="java.lang.Long"> <xml-properties> - <xml-property name="description" value="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only in some usecases" /> + <xml-property name="description" value="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE" /> </xml-properties> </xml-element> <xml-element java-attribute="vcpuUnits" name="vcpu-units" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="units associated with vcpu, used for VNFs with no vservers/flavors, to be used only in some usecases" /> + <xml-property name="description" value="units associated with vcpu, used for VNFs with no vservers/flavors, to be used only by uCPE" /> </xml-properties> </xml-element> <xml-element java-attribute="vmemory" name="vmemory" type="java.lang.Long"> <xml-properties> - <xml-property name="description" value="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only in some usecases" /> + <xml-property name="description" value="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE" /> </xml-properties> </xml-element> <xml-element java-attribute="vmemoryUnits" name="vmemory-units" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="units associated with vmemory, used for VNFs with no vservers/flavors, to be used only in some usecases" /> + <xml-property name="description" value="units associated with vmemory, used for VNFs with no vservers/flavors, to be used only by uCPE" /> </xml-properties> </xml-element> <xml-element java-attribute="vdisk" name="vdisk" type="java.lang.Long"> <xml-properties> - <xml-property name="description" value="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only in some usecases" /> + <xml-property name="description" value="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only uCPE" /> </xml-properties> </xml-element> <xml-element java-attribute="vdiskUnits" name="vdisk-units" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only in some usecases" /> + <xml-property name="description" value="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only by uCPE" /> </xml-properties> </xml-element> <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean"> @@ -3644,12 +3688,12 @@ <xml-property name="description" value="Path to the controller object." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v9.LInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v9.LagInterfaces" /> - <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.openecomp.org.v9.VfModules" /> - <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.openecomp.org.v9.Licenses" /> - <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.openecomp.org.v9.Entitlements" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v9.LInterfaces" /> + <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v9.LagInterfaces" /> + <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v9.VfModules" /> + <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v9.Licenses" /> + <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v9.Entitlements" /> </java-attributes> <xml-properties> <xml-property name="description" value="General purpose VNF" /> @@ -3669,7 +3713,7 @@ </xml-properties> <xml-root-element name="vf-modules" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.openecomp.org.v9.VfModule" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v9.VfModule" /> </java-attributes> </java-type> @@ -3759,7 +3803,7 @@ <xml-property name="description" value="Path to the controller object." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="a deployment unit of VNFCs" /> @@ -3777,7 +3821,7 @@ </xml-properties> <xml-root-element name="lag-links" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.openecomp.org.v9.LagLink" /> + <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v9.LagLink" /> </java-attributes> </java-type> @@ -3794,7 +3838,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="LAG links can connect lag-interfaces" /> @@ -3810,7 +3854,7 @@ </xml-properties> <xml-root-element name="newvces" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.openecomp.org.v9.Newvce" /> + <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v9.Newvce" /> </java-attributes> </java-type> @@ -3845,6 +3889,7 @@ <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Indicator for whether the resource is considered operational" /> + <xml-property name="dbAlias" value="operational-status" /> </xml-properties> </xml-element> <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String"> @@ -3887,8 +3932,8 @@ <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v9.LInterfaces" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> + <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v9.LInterfaces" /> </java-attributes> <xml-properties> <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf. This object will be retired with vce." /> @@ -3907,7 +3952,7 @@ </xml-properties> <xml-root-element name="pnfs" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.openecomp.org.v9.Pnf" /> + <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v9.Pnf" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> @@ -3954,7 +3999,7 @@ </xml-element> <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="identifier of managed by company or customer" /> + <xml-property name="description" value="identifier of managed by ATT or customer" /> </xml-properties> </xml-element> <xml-element java-attribute="ipaddressV4Oam" name="ipaddress-v4-oam" type="java.lang.String"> @@ -4028,12 +4073,12 @@ <xml-property name="description" value="Nf Role is the role performed by this instance in the network." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> - <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v9.PInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v9.LagInterfaces" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> + <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v9.PInterfaces" /> + <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v9.LagInterfaces" /> </java-attributes> <xml-properties> - <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world." /> + <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE." /> <xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status" /> <xml-property name="searchable" value="pnf-name" /> <xml-property name="uniqueProps" value="pnf-name" /> @@ -4048,7 +4093,7 @@ </xml-properties> <xml-root-element name="physical-links" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.openecomp.org.v9.PhysicalLink" /> + <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v9.PhysicalLink" /> </java-attributes> <xml-properties> <xml-property name="maximumDepth" value="0" /> @@ -4098,7 +4143,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Collection of physical connections, typically between p-interfaces" /> @@ -4113,7 +4158,7 @@ <java-type name="VigServers"> <xml-root-element name="vig-servers" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.openecomp.org.v9.VigServer" /> + <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v9.VigServer" /> </java-attributes> </java-type> @@ -4140,7 +4185,7 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607" /> @@ -4153,7 +4198,7 @@ <java-type name="IpsecConfigurations"> <xml-root-element name="ipsec-configurations" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.openecomp.org.v9.IpsecConfiguration" /> + <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v9.IpsecConfiguration" /> </java-attributes> </java-type> @@ -4177,7 +4222,7 @@ </xml-element> <xml-element java-attribute="requestedDmzType" name="requested-dmz-type" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="can offer a shared DMZ or a DMZ specific to a customer" /> + <xml-property name="description" value="ATT can offer a shared DMZ or a DMZ specific to a customer" /> </xml-properties> </xml-element> <xml-element java-attribute="sharedDmzNetworkAddress" name="shared-dmz-network-address" type="java.lang.String"> @@ -4202,7 +4247,7 @@ </xml-element> <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" /> + <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" /> </xml-properties> </xml-element> <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String"> @@ -4232,7 +4277,7 @@ </xml-element> <xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" /> + <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" /> </xml-properties> </xml-element> <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String"> @@ -4247,7 +4292,7 @@ </xml-element> <xml-element java-attribute="xauthUserId" name="xauth-userid" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="user ID for xAuth, sm-user, nmteHostName" /> + <xml-property name="description" value="user ID for xAuth, sm-user,ucpeHostName,nmteHostName" /> </xml-properties> </xml-element> <xml-element java-attribute="xauthUserPassword" name="xauth-user-password" type="java.lang.String"> @@ -4270,8 +4315,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> - <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.openecomp.org.v9.VigServers" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> + <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v9.VigServers" /> </java-attributes> <xml-properties> <xml-property name="description" value="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" /> @@ -4287,7 +4332,7 @@ <xml-root-element name="notification-event" /> <java-attributes> <xml-element java-attribute="cambriaPartition" name="cambria.partition" type="java.lang.String" /> - <xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.openecomp.org.v9.NotificationEventHeader" /> + <xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.onap.org.v9.NotificationEventHeader" /> <xml-any-element java-attribute="entity" /> </java-attributes> </java-type> @@ -4312,8 +4357,8 @@ <java-type name="AaiInternal"> <xml-root-element name="aai-internal" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.openecomp.org.v9.ReservedPropNames" /> - <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.openecomp.org.v9.EdgePropNames" /> + <xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v9.ReservedPropNames" /> + <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v9.EdgePropNames" /> </java-attributes> </java-type> <java-type name="ReservedPropNames"> @@ -4358,7 +4403,7 @@ </xml-properties> <xml-root-element name="models" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.openecomp.org.v9.Model" /> + <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v9.Model" /> </java-attributes> </java-type> @@ -4388,8 +4433,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.openecomp.org.v9.ModelVers" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v9.ModelVers" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> </java-type> @@ -4397,7 +4442,7 @@ <java-type name="ModelVers"> <xml-root-element name="model-vers" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.openecomp.org.v9.ModelVer" /> + <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v9.ModelVer" /> </java-attributes> </java-type> @@ -4436,16 +4481,16 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.openecomp.org.v9.ModelElements" /> - <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v9.Metadata" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v9.ModelElements" /> + <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v9.Metadata" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> </java-type> <java-type name="ModelElements"> <xml-root-element name="model-elements" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.openecomp.org.v9.ModelElement" /> + <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v9.ModelElement" /> </java-attributes> </java-type> @@ -4482,24 +4527,24 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.openecomp.org.v9.ModelElements"> + <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v9.ModelElements"> <xml-properties> <xml-property name="description" value="Defines how other models combine to make up a higher-level model" /> </xml-properties> </xml-element> - <xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.openecomp.org.v9.ModelConstraints"> + <xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v9.ModelConstraints"> <xml-properties> <xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> </java-type> <java-type name="ModelConstraints"> <xml-root-element name="model-constraints" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.openecomp.org.v9.ModelConstraint" /> + <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v9.ModelConstraint" /> </java-attributes> </java-type> @@ -4520,7 +4565,7 @@ </xml-properties> </xml-element> <xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String" /> - <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.openecomp.org.v9.ConstrainedElementSets" /> + <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v9.ConstrainedElementSets" /> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> @@ -4532,7 +4577,7 @@ <java-type name="ConstrainedElementSets"> <xml-root-element name="constrained-element-sets" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.openecomp.org.v9.ConstrainedElementSet" /> + <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v9.ConstrainedElementSet" /> </java-attributes> </java-type> @@ -4555,15 +4600,15 @@ <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" /> <xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String" /> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> - <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.openecomp.org.v9.ElementChoiceSets" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v9.ElementChoiceSets" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> </java-type> <java-type name="ElementChoiceSets"> <xml-root-element name="element-choice-sets" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.openecomp.org.v9.ElementChoiceSet" /> + <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v9.ElementChoiceSet" /> </java-attributes> </java-type> @@ -4586,15 +4631,15 @@ <xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String" /> <xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String" /> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> - <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.openecomp.org.v9.ModelElements" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v9.ModelElements" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> </java-type> <java-type name="NamedQueries"> <xml-root-element name="named-queries" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.openecomp.org.v9.NamedQuery" /> + <xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v9.NamedQuery" /> </java-attributes> </java-type> @@ -4617,15 +4662,15 @@ </xml-element> <xml-element java-attribute="description" name="description" type="java.lang.String" /> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> - <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.openecomp.org.v9.NamedQueryElements" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v9.NamedQueryElements" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> </java-type> <java-type name="NamedQueryElements"> <xml-root-element name="named-query-elements" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.openecomp.org.v9.NamedQueryElement" /> + <xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v9.NamedQueryElement" /> </java-attributes> </java-type> @@ -4649,17 +4694,17 @@ <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> <xml-element java-attribute="propertyLimitDesc" name="property-limit-desc" type="java.lang.String" /> <xml-element java-attribute="doNotOutput" name="do-not-output" type="java.lang.String" /> - <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.openecomp.org.v9.NamedQueryElements" /> - <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.openecomp.org.v9.RelatedLookups" /> - <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.openecomp.org.v9.PropertyConstraints" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v9.NamedQueryElements" /> + <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v9.RelatedLookups" /> + <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v9.PropertyConstraints" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> </java-type> <java-type name="RelatedLookups"> <xml-root-element name="related-lookups" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.openecomp.org.v9.RelatedLookup" /> + <xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v9.RelatedLookup" /> </java-attributes> </java-type> @@ -4685,14 +4730,14 @@ <xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" type="java.lang.String" /> <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" /> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> </java-type> <java-type name="PropertyConstraints"> <xml-root-element name="property-constraints" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.openecomp.org.v9.PropertyConstraint" /> + <xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v9.PropertyConstraint" /> </java-attributes> </java-type> @@ -4725,9 +4770,9 @@ </xml-properties> <xml-root-element name="model-and-named-query-search" /> <java-attributes> - <xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.openecomp.org.v9.QueryParameters" /> - <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.openecomp.org.v9.InstanceFilters" /> - <xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.openecomp.org.v9.SecondaryFilts" /> + <xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.onap.org.v9.QueryParameters" /> + <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v9.InstanceFilters" /> + <xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v9.SecondaryFilts" /> <xml-element java-attribute="topNodeType" name="top-node-type" type="java.lang.String" /> <xml-element java-attribute="secondaryFilterCutPoint" name="secondary-filter-cut-point" type="java.lang.String" /> </java-attributes> @@ -4739,8 +4784,8 @@ </xml-properties> <xml-root-element name="query-parameters" /> <java-attributes> - <xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.openecomp.org.v9.NamedQuery" /> - <xml-element java-attribute="model" name="model" type="inventory.aai.openecomp.org.v9.OverloadedModel" /> + <xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v9.NamedQuery" /> + <xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v9.OverloadedModel" /> </java-attributes> </java-type> @@ -4790,8 +4835,8 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> </xml-properties> </xml-element> - <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.openecomp.org.v9.ModelVers" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v9.ModelVers" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> </java-type> @@ -4801,7 +4846,7 @@ </xml-properties> <xml-root-element name="instance-filters" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.openecomp.org.v9.InstanceFilter" /> + <xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v9.InstanceFilter" /> </java-attributes> </java-type> @@ -4822,7 +4867,7 @@ </xml-properties> <xml-root-element name="secondary-filts" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.openecomp.org.v9.SecondaryFilt" /> + <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v9.SecondaryFilt" /> </java-attributes> </java-type> @@ -4853,7 +4898,7 @@ </xml-properties> <xml-root-element name="response-list" /> <java-attributes> - <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.openecomp.org.v9.InventoryResponseItems" /> + <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v9.InventoryResponseItems" /> </java-attributes> </java-type> @@ -4864,7 +4909,7 @@ </xml-properties> <xml-root-element name="inventory-response-items" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.openecomp.org.v9.InventoryResponseItem" /> + <xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v9.InventoryResponseItem" /> </java-attributes> </java-type> @@ -4877,8 +4922,8 @@ <java-attributes> <xml-element java-attribute="modelName" name="model-name" type="java.lang.String" /> <xml-any-element java-attribute="item" /> - <xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.openecomp.org.v9.ExtraProperties" /> - <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.openecomp.org.v9.InventoryResponseItems" /> + <xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.onap.org.v9.ExtraProperties" /> + <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v9.InventoryResponseItems" /> </java-attributes> </java-type> @@ -4888,7 +4933,7 @@ </xml-properties> <xml-root-element name="extra-properties" /> <java-attributes> - <xml-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.openecomp.org.v9.ExtraProperty" /> + <xml-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v9.ExtraProperty" /> </java-attributes> </java-type> @@ -4906,7 +4951,7 @@ </xml-properties> <xml-root-element name="route-table-references" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.openecomp.org.v9.RouteTableReference" /> + <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v9.RouteTableReference" /> </java-attributes> </java-type> @@ -4928,7 +4973,7 @@ <xml-property name="description" value="Concurrency value" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> @@ -4947,7 +4992,7 @@ </xml-properties> <xml-root-element name="instance-groups" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.openecomp.org.v9.InstanceGroup" /> + <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v9.InstanceGroup" /> </java-attributes> </java-type> @@ -4979,7 +5024,7 @@ <xml-property name="description" value="Concurrency value" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> @@ -4999,7 +5044,7 @@ </xml-properties> <xml-root-element name="segmentation-assignments" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.openecomp.org.v9.SegmentationAssignment" /> + <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v9.SegmentationAssignment" /> </java-attributes> </java-type> @@ -5016,7 +5061,7 @@ <xml-property name="description" value="Concurrency value" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Openstack segmentation assignment." /> @@ -5032,7 +5077,7 @@ </xml-properties> <xml-root-element name="allotted-resources" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.openecomp.org.v9.AllottedResource" /> + <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v9.AllottedResource" /> </java-attributes> </java-type> @@ -5086,8 +5131,8 @@ <xml-property name="description" value="Concurrency value" /> </xml-properties> </xml-element> - <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.openecomp.org.v9.TunnelXconnects" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v9.TunnelXconnects" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> @@ -5107,7 +5152,7 @@ </xml-properties> <xml-root-element name="tunnel-xconnects" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.openecomp.org.v9.TunnelXconnect" /> + <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v9.TunnelXconnect" /> </java-attributes> </java-type> @@ -5144,7 +5189,7 @@ <xml-property name="description" value="Concurrency value" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> @@ -5163,7 +5208,7 @@ </xml-properties> <xml-root-element name="entitlements" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.openecomp.org.v9.Entitlement" /> + <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v9.Entitlement" /> </java-attributes> </java-type> @@ -5185,7 +5230,7 @@ <xml-property name="description" value="Concurrency value" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Metadata for entitlement group." /> @@ -5202,7 +5247,7 @@ </xml-properties> <xml-root-element name="licenses" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.openecomp.org.v9.License" /> + <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v9.License" /> </java-attributes> </java-type> @@ -5224,7 +5269,7 @@ <xml-property name="description" value="Concurrency value" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="Metadata for license group." /> @@ -5258,7 +5303,7 @@ </xml-properties> <xml-root-element name="zones" /> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.openecomp.org.v9.Zone" /> + <xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.onap.org.v9.Zone" /> </java-attributes> </java-type> @@ -5295,7 +5340,7 @@ <xml-property name="description" value="Concurrency value" /> </xml-properties> </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" /> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> </java-attributes> <xml-properties> <xml-property name="description" value="A zone is a grouping of assets in a location homing to the same connections into the CBB" /> @@ -5306,6 +5351,249 @@ <xml-property name="namespace" value="network" /> </xml-properties> </java-type> - + <java-type name="TestObjects"> + <xml-root-element name="test-objects" /> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="testObject" name="test-object" type="inventory.aai.onap.org.v9.TestObject" /> + </java-attributes> + <xml-properties> + <xml-property name="maximumDepth" value="0" /> + <xml-property name="description" value="Collection of VNFs" /> + </xml-properties> + </java-type> + + <java-type name="TestObject"> + <xml-root-element name="test-object" /> + <java-attributes> + <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Unique id of VNF. This is unique across the graph." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Name of VNF." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Alternate name of VNF." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource. This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Unique identifier of service, does not necessarily map to ASDC service models. SOON TO BE DEPRECATED" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Indicator for whether the resource is considered operational. Valid values are in-service-path and out-of-service-path." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="OBSOLETE - do not use" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Client should send valid enumerated value" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Orchestration status of this VNF, used by MSO." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="identifier of managed by ATT or customer" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Address tail-f uses to configure test-object, also used for troubleshooting and is IP used for traps generated by test-object." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="v4 Loopback0 address" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="nmLanV6Address" name="nm-lan-v6-address" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="v6 Loopback address" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="managementV6Address" name="management-v6-address" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="v6 management address" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vcpu" name="vcpu" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vcpuUnits" name="vcpu-units" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="units associated with vcpu, used for VNFs with no vservers/flavors, to be used only by uCPE" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vmemory" name="vmemory" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vmemoryUnits" name="vmemory-units" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="units associated with vmemory, used for VNFs with no vservers/flavors, to be used only by uCPE" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vdisk" name="vdisk" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only uCPE" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="vdiskUnits" name="vdisk-units" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only by uCPE" /> + </xml-properties> + </xml-element> + <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean"> + <xml-properties> + <xml-property name="defaultValue" value="false"/> + <xml-property name="description" value="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." /> + </xml-properties> + </xml-element> + <xml-element default-value="false" required="true" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" type="java.lang.Boolean"> + <xml-properties> + <xml-property name="defaultValue" value="false"/> + <xml-property name="description" value="used to indicate whether closed loop function is enabled on this node" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="summaryStatus" name="summary-status" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="details regarding the test-object operation, PLEASE DISCONTINUE USE OF THIS FIELD." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="encryptedAccessFlag" name="encrypted-access-flag" type="java.lang.Boolean"> + <xml-properties> + <xml-property name="description" value="indicates whether access uses SSH" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="entitlementAssignmentGroupUuid" name="entitlement-assignment-group-uuid" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="UUID of the Entitlement group used for licensing VNFs, OBSOLETE - See child relationships." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="UUID of the specific entitlement resource. OBSOLETE - See child relationships." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="licenseAssignmentGroupUuid" name="license-assignment-group-uuid" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="UUID of the license assignment group. OBSOLETE - See child relationships." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="licenseKeyUuid" name="license-key-uuid" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="UUID of the actual license resource. OBSOLETE - See child relationships." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="the ASDC model id for this resource or service model." /> + <xml-property name="dbAlias" value="model-invariant-id-local" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="the ASDC model version for this resource or service model." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="the ASDC model version for this resource or service model." /> + <xml-property name="visibility" value="internal" /> + <xml-property name="dbAlias" value="model-version-id-local" /> + <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="personaModelCustomizationId" name="persona-model-customization-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." /> + <xml-property name="dbAlias" value="model-customization-id" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&AI widget." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="asNumber" name="as-number" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="as-number of the VNF" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="regionalResourceSubzone" name="regional-resource-subzone" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="represents sub zone of the rr plane" /> + </xml-properties> + </xml-element> + <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Path to the controller object." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" /> + </java-attributes> + <xml-properties> + <xml-property name="description" value="General purpose VNF" /> + <xml-property name="nameProps" value="vnf-name" /> + <xml-property name="indexedProps" value="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" /> + <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" /> + <xml-property name="uniqueProps" value="vnf-id" /> + <xml-property name="container" value="test-objects" /> + <xml-property name="namespace" value="network" /> + <xml-property name="extends" value="vnf" /> + </xml-properties> + </java-type> </java-types> </xml-bindings> diff --git a/aai-core/src/test/resources/org/openecomp/aai/introspection/sideeffect/nested-case.json b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/sideeffect/nested-case.json index 40a0493a..40a0493a 100644 --- a/aai-core/src/test/resources/org/openecomp/aai/introspection/sideeffect/nested-case.json +++ b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/sideeffect/nested-case.json diff --git a/aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/graphson/resource.graphson b/aai-core/src/test/resources/bundleconfig-local/etc/queryformarts/graphson/resource.graphson index 04f48174..04f48174 100644 --- a/aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/graphson/resource.graphson +++ b/aai-core/src/test/resources/bundleconfig-local/etc/queryformarts/graphson/resource.graphson diff --git a/aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/resource-format.json b/aai-core/src/test/resources/bundleconfig-local/etc/queryformarts/resource-format.json index c7e42556..c7e42556 100644 --- a/aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/resource-format.json +++ b/aai-core/src/test/resources/bundleconfig-local/etc/queryformarts/resource-format.json diff --git a/aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/resource_and_url-format.json b/aai-core/src/test/resources/bundleconfig-local/etc/queryformarts/resource_and_url-format.json index d90a71bc..d90a71bc 100644 --- a/aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/resource_and_url-format.json +++ b/aai-core/src/test/resources/bundleconfig-local/etc/queryformarts/resource_and_url-format.json diff --git a/aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/simple-format.json b/aai-core/src/test/resources/bundleconfig-local/etc/queryformarts/simple-format.json index dd342615..dd342615 100644 --- a/aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/simple-format.json +++ b/aai-core/src/test/resources/bundleconfig-local/etc/queryformarts/simple-format.json diff --git a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/ambiguous-relationship.json b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/ambiguous-relationship.json index 241cc146..241cc146 100644 --- a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/ambiguous-relationship.json +++ b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/ambiguous-relationship.json diff --git a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/both-failv10-successv9.json b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/both-failv10-successv9.json index 0f0378d9..0f0378d9 100644 --- a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/both-failv10-successv9.json +++ b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/both-failv10-successv9.json diff --git a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/both-successv10-failv9.json b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/both-successv10-failv9.json index 490bbd30..490bbd30 100644 --- a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/both-successv10-failv9.json +++ b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/both-successv10-failv9.json diff --git a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/only-related-link.json b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/only-related-link.json index 15e383aa..15e383aa 100644 --- a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/only-related-link.json +++ b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/only-related-link.json diff --git a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/only-relationship-data.json b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/only-relationship-data.json index dc7445e0..dc7445e0 100644 --- a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/only-relationship-data.json +++ b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/only-relationship-data.json diff --git a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/too-many-items-relationship.json b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/too-many-items-relationship.json index 97765cfb..97765cfb 100644 --- a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/too-many-items-relationship.json +++ b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/too-many-items-relationship.json diff --git a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/top-level-two-keys-relationship.json b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/top-level-two-keys-relationship.json index c6dbf557..c6dbf557 100644 --- a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/top-level-two-keys-relationship.json +++ b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/top-level-two-keys-relationship.json diff --git a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/two-top-level-relationship.json b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/two-top-level-relationship.json index 54cac2c8..54cac2c8 100644 --- a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/two-top-level-relationship.json +++ b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/two-top-level-relationship.json diff --git a/aai-core/src/test/resources/dbedgerules/DbEdgeRules_test.json b/aai-core/src/test/resources/dbedgerules/DbEdgeRules_test.json new file mode 100644 index 00000000..0031d1f0 --- /dev/null +++ b/aai-core/src/test/resources/dbedgerules/DbEdgeRules_test.json @@ -0,0 +1,37 @@ +{ + "rules": [ + { + "from": "foo", + "to": "bar", + "label": "eats", + "direction": "OUT", + "multiplicity": "One2Many", + "contains-other-v": "NONE", + "delete-other-v": "${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE" + }, + { + "from": "foo", + "to": "baz", + "label": "isVeryHappyAbout", + "direction": "OUT", + "multiplicity": "One2Many", + "contains-other-v": "${direction}", + "delete-other-v": "${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE" + }, + { + "from": "quux", + "to": "foo", + "label": "dancesWith", + "direction": "IN", + "multiplicity": "One2Many", + "contains-other-v": "!${direction}", + "delete-other-v": "${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE" + } + ] +}
\ No newline at end of file diff --git a/aai-core/src/test/resources/dbedgerules/DbEdgeRules_test_broken.json b/aai-core/src/test/resources/dbedgerules/DbEdgeRules_test_broken.json new file mode 100644 index 00000000..d4b7f7f3 --- /dev/null +++ b/aai-core/src/test/resources/dbedgerules/DbEdgeRules_test_broken.json @@ -0,0 +1,35 @@ +{ + "rules": [ + { + "from": "foo", + "to": "bar", + "label": "eats", + "direction": "OUT", + "multiplicity": "One2Many", + "contains-other-v": "NONE", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE" + }, + { + "from": "foo", + "to": "baz", + "label": "isVeryHappyAbout", + "direction": "OUT", + "multiplicity": "One2Many", + "contains-other-v": "${direction}", + "delete-other-v": "${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE" + }, + { + "from": "quux", + "to": "foo", + "label": "dancesWith", + "direction": "IN", + "multiplicity": "One2Many", + "contains-other-v": "!${direction}", + "delete-other-v": "${direction}", + "prevent-delete": "NONE" + } + ] +}
\ No newline at end of file diff --git a/aai-core/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v11.xml b/aai-core/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v11.xml deleted file mode 100644 index a4899974..00000000 --- a/aai-core/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v11.xml +++ /dev/null @@ -1,5932 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- - ============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========================================================= - --> - -<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v11" xml-mapping-metadata-complete="true"> - <xml-schema element-form-default="QUALIFIED"> - <xml-ns namespace-uri="http://org.onap.aai.inventory/v11" /> - </xml-schema> - <java-types> - <java-type name="Inventory"> - <xml-root-element name="inventory" /> - <java-attributes> - <xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v11.Search" /> - <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v11.Actions" /> - <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v11.CloudInfrastructure" /> - <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v11.Business" /> - <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v11.ServiceDesignAndCreation" /> - <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v11.Network" /> - <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v11.AaiInternal" /> - <xml-element java-attribute="nodes" name="nodes" type="inventory.aai.onap.org.v11.Nodes"/> - </java-attributes> - </java-type> - - <java-type name="Nodes"> - <xml-root-element name="nodes" /> - </java-type> - <java-type name="Search"> - <xml-root-element name="search" /> - <java-attributes> - <xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v11.EdgeTagQueryResult" /> - <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v11.EdgeTagQueryRequest" /> - <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v11.SearchResults" /> - <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v11.SdnZoneResponse" /> - </java-attributes> - </java-type> - - <java-type name="EdgeTagQueryResult"> - <xml-root-element name="edge-tag-query-result" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v11.TaggedInventoryItemList" /> - </java-attributes> - </java-type> - - <java-type name="TaggedInventoryItemList"> - <xml-root-element name="tagged-inventory-item-list" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v11.InventoryItem" /> - </java-attributes> - </java-type> - - <java-type name="InventoryItem"> - <xml-root-element name="inventory-item" /> - <java-attributes> - <xml-element java-attribute="inventoryItemType" name="inventory-item-type" type="java.lang.String" /> - <xml-element java-attribute="inventoryItemLink" name="inventory-item-link" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.onap.org.v11.InventoryItemData" /> - <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v11.TaggedInventoryItemList" /> - </java-attributes> - </java-type> - - <java-type name="InventoryItemData"> - <xml-root-element name="inventory-item-data" /> - <java-attributes> - <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" /> - <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" /> - </java-attributes> - </java-type> - - <java-type name="EdgeTagQueryRequest"> - <xml-root-element name="edge-tag-query-request" /> - <java-attributes> - <xml-element java-attribute="edgeTag" name="edge-tag" type="java.lang.String" /> - <xml-element java-attribute="resultDetail" name="result-detail" type="java.lang.String" /> - <xml-element java-attribute="startNodeType" name="start-node-type" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.onap.org.v11.StartNodeFilter" /> - <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v11.IncludeNodeFilter" /> - <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v11.SecondaryFilter" /> - </java-attributes> - </java-type> - - <java-type name="StartNodeFilter"> - <xml-root-element name="start-node-filter" /> - <java-attributes> - <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" /> - <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" /> - </java-attributes> - </java-type> - - <java-type name="IncludeNodeFilter"> - <xml-root-element name="include-node-filter" /> - <java-attributes> - <xml-element java-attribute="includeNodeType" name="include-node-type" type="java.lang.String" /> - </java-attributes> - </java-type> - - <java-type name="SecondaryFilter"> - <xml-root-element name="secondary-filter" /> - <java-attributes> - <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" /> - <xml-element java-attribute="filterType" name="filter-type" type="java.lang.String" /> - <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" /> - </java-attributes> - </java-type> - - <java-type name="SearchResults"> - <xml-root-element name="search-results" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v11.ResultData" /> - </java-attributes> - </java-type> - - <java-type name="ResultData"> - <xml-root-element name="result-data" /> - <java-attributes> - <xml-element java-attribute="resourceType" name="resource-type" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The specific type of node in the A&AI graph" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceLink" name="resource-link" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The URL to the specific resource" /> - </xml-properties> - </xml-element> - </java-attributes> - </java-type> - - <java-type name="SdnZoneResponse"> - <xml-root-element name="sdn-zone-response" /> - <java-attributes> - <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v11.OamNetworks" /> - <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v11.AzAndDvsSwitches" /> - </java-attributes> - </java-type> - - <java-type name="AzAndDvsSwitches"> - <xml-root-element name="az-and-dvs-switches" /> - <java-attributes> - <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v11.DvsSwitches" /> - <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v11.AvailabilityZone" /> - </java-attributes> - </java-type> - - <java-type name="Actions"> - <xml-properties> - <xml-property name="description" value="APIs that are more action related than REST (e.g., notify, update)." /> - </xml-properties> - <xml-root-element name="actions" /> - <java-attributes> - <xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v11.Update" /> - <xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v11.Notify" /> - </java-attributes> - </java-type> - - <java-type name="Update"> - <xml-properties> - <xml-property name="description" value="Serves a PATCH like function. Does not enforce concurrency control. Clear each usage with AAI team." /> - </xml-properties> - <xml-root-element name="update" /> - <java-attributes> - <xml-element java-attribute="updateNodeType" name="update-node-type" required="true" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.v11.UpdateNodeKey" /> - <xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v11.Action" /> - </java-attributes> - </java-type> - - <java-type name="Action"> - <xml-root-element name="action" /> - <java-attributes> - <xml-element java-attribute="actionType" name="action-type" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.onap.org.v11.ActionData" /> - </java-attributes> - </java-type> - - <java-type name="ActionData"> - <xml-root-element name="action-data" /> - <java-attributes> - <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" /> - <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" /> - </java-attributes> - </java-type> - - <java-type name="UpdateNodeKey"> - <xml-root-element name="update-node-key" /> - <java-attributes> - <xml-element java-attribute="keyName" name="key-name" type="java.lang.String" /> - <xml-element java-attribute="keyValue" name="key-value" type="java.lang.String" /> - </java-attributes> - </java-type> - - <java-type name="Notify"> - <xml-root-element name="notify" /> - <java-attributes> - <xml-element java-attribute="eventId" name="event-id" required="true" type="java.lang.String" /> - <xml-element java-attribute="nodeType" name="node-type" type="java.lang.String" /> - <xml-element java-attribute="eventTrigger" name="event-trigger" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.onap.org.v11.KeyData" /> - <xml-element java-attribute="selflink" name="selflink" type="java.lang.String" /> - </java-attributes> - </java-type> - - <java-type name="KeyData"> - <xml-root-element name="key-data" /> - <java-attributes> - <xml-element java-attribute="keyName" name="key-name" type="java.lang.String" /> - <xml-element java-attribute="keyValue" name="key-value" type="java.lang.String" /> - </java-attributes> - </java-type> - - <java-type name="CloudInfrastructure"> - <xml-properties> - <xml-property name="description" value="Namespace for cloud infrastructure." /> - </xml-properties> - <xml-root-element name="cloud-infrastructure" /> - <java-attributes> - <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v11.Complexes" /> - <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v11.CloudRegions" /> - <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v11.NetworkProfiles" /> - <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v11.Pservers" /> - <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v11.VirtualDataCenters" /> - </java-attributes> - </java-type> - - <java-type name="CloudRegions"> - <xml-root-element name="cloud-regions" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v11.CloudRegion" /> - </java-attributes> - <xml-properties> - <xml-property name="maximumDepth" value="0" /> - </xml-properties> - </java-type> - - <java-type name="CloudRegion"> - <xml-root-element name="cloud-region" /> - <java-attributes> - <xml-element java-attribute="cloudOwner" name="cloud-owner" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Identifier used by the vendor for the region. Second part of composite key" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="cloudType" name="cloud-type" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Type of the cloud (e.g., openstack)" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ownerDefinedType" name="owner-defined-type" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Cloud-owner defined type indicator (e.g., dcp, lcp)" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="cloudRegionVersion" name="cloud-region-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Software version employed at the site. NOTE - THIS FIELD IS NOT KEPT UP TO DATE." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="URL of the keystone identity service" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="cloudZone" name="cloud-zone" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Zone where the cloud is homed. NOTE - THIS FIELD IS NOT CORRECTLY POPULATED." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="complex name for cloud-region instance. NOTE - THIS FIELD IS NOT CORRECTLY POPULATED." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v11.VolumeGroups" /> - <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v11.Tenants" /> - <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v11.Flavors" /> - <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v11.GroupAssignments" /> - <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v11.Snapshots" /> - <xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v11.Images" /> - <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v11.DvsSwitches" /> - <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v11.OamNetworks" /> - <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v11.AvailabilityZones" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation." /> - <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type" /> - <xml-property name="nameProps" value="owner-defined-type" /> - <xml-property name="container" value="cloud-regions" /> - <xml-property name="namespace" value="cloud-infrastructure" /> - </xml-properties> - </java-type> - <java-type name="VolumeGroups"> - <xml-properties> - <xml-property name="description" value="Collection of persistent block-level storage." /> - </xml-properties> - <xml-root-element name="volume-groups" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v11.VolumeGroup" /> - </java-attributes> - </java-type> - - <java-type name="VolumeGroup"> - <xml-root-element name="volume-group" /> - <java-attributes> - <xml-element java-attribute="volumeGroupId" name="volume-group-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique ID of volume-group." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="volumeGroupName" name="volume-group-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of the volume group." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Heat stack id corresponding to this volume-group" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource. This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Orchestration status of this volume-group" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vfModuleModelCustomizationId" name="vf-module-model-customization-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="helps relate the volume group to the vf-module whose components will require the volume group" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Persistent block-level storage." /> - <xml-property name="indexedProps" value="volume-group-name,vnf-type,heat-stack-id,volume-group-id" /> - <xml-property name="searchable" value="volume-group-id,volume-group-name" /> - <xml-property name="dependentOn" value="cloud-region" /> - <xml-property name="container" value="volume-groups" /> - </xml-properties> - </java-type> - - <java-type name="RelationshipList"> - <xml-root-element name="relationship-list" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v11.Relationship" /> - </java-attributes> - </java-type> - - <java-type name="Relationship"> - <xml-root-element name="relationship" /> - <java-attributes> - <xml-element java-attribute="relatedTo" name="related-to" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="A keyword provided by A&AI to indicate type of node." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relatedLink" name="related-link" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="URL to the object in A&AI." /> - </xml-properties> - </xml-element> - <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v11.RelationshipData" /> - <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v11.RelatedToProperty" /> - </java-attributes> - </java-type> - - <java-type name="RelatedToProperty"> - <xml-root-element name="related-to-property" /> - <java-attributes> - <xml-element java-attribute="propertyKey" name="property-key" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Key part of a key/value pair" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Value part of a key/value pair" /> - </xml-properties> - </xml-element> - </java-attributes> - </java-type> - - <java-type name="RelationshipData"> - <xml-root-element name="relationship-data" /> - <java-attributes> - <xml-element java-attribute="relationshipKey" name="relationship-key" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="A keyword provided by A&AI to indicate an attribute." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipValue" name="relationship-value" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Value of the attribute." /> - </xml-properties> - </xml-element> - </java-attributes> - </java-type> - - <java-type name="Complexes"> - <xml-properties> - <xml-property name="description" value="Collection of physical locations that can house cloud-regions." /> - </xml-properties> - <xml-root-element name="complexes" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v11.Complex" /> - </java-attributes> - <xml-properties> - <xml-property name="maximumDepth" value="0" /> - </xml-properties> - </java-type> - - <java-type name="Complex"> - <xml-root-element name="complex" /> - <java-attributes> - <xml-element java-attribute="physicalLocationId" name="physical-location-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique identifier for physical location, e.g., CLLI" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="dataCenterCode" name="data-center-code" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Data center code which can be an alternate way to identify a complex" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Gamma complex name for LCP instance." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="URL of the keystone identity service" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="physicalLocationType" name="physical-location-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Type, e.g., central office, data center." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="street1" name="street1" required="true" type="java.lang.String" /> - <xml-element java-attribute="street2" name="street2" type="java.lang.String" /> - <xml-element java-attribute="city" name="city" required="true" type="java.lang.String" /> - <xml-element java-attribute="state" name="state" type="java.lang.String" /> - <xml-element java-attribute="postalCode" name="postal-code" required="true" type="java.lang.String" /> - <xml-element java-attribute="country" name="country" required="true" type="java.lang.String" /> - <xml-element java-attribute="region" name="region" required="true" type="java.lang.String" /> - <xml-element java-attribute="latitude" name="latitude" type="java.lang.String" /> - <xml-element java-attribute="longitude" name="longitude" type="java.lang.String" /> - <xml-element java-attribute="elevation" name="elevation" type="java.lang.String" /> - <xml-element java-attribute="lata" name="lata" type="java.lang.String" /> - <xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v11.CtagPools" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Collection of physical locations that can house cloud-regions." /> - <xml-property name="indexedProps" value="identity-url,data-center-code,complex-name,physical-location-id" /> - <xml-property name="searchable" value="physical-location-id,data-center-code,complex-name,street1,street2,postal-code" /> - <xml-property name="uniqueProps" value="physical-location-id" /> - <xml-property name="container" value="complexes" /> - <xml-property name="namespace" value="cloud-infrastructure" /> - </xml-properties> - </java-type> - - <java-type name="CtagPools"> - <xml-root-element name="ctag-pools" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v11.CtagPool" /> - </java-attributes> - </java-type> - - <java-type name="CtagPool"> - <xml-root-element name="ctag-pool" /> - <java-attributes> - <xml-element java-attribute="targetPe" name="target-pe" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="The Target provider edge router" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Name of the availability zone" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ctagPoolPurpose" name="ctag-pool-purpose" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Describes what the intended purpose of this pool is." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ctagValues" name="ctag-values" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Comma separated list of ctags" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose." /> - <xml-property name="indexedProps" value="availability-zone-name" /> - <xml-property name="dependentOn" value="complex" /> - <xml-property name="container" value="ctag-pools" /> - </xml-properties> - </java-type> - - <java-type name="Tenants"> - <xml-properties> - <xml-property name="description" value="Collection of openstack tenants." /> - </xml-properties> - <xml-root-element name="tenants" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v11.Tenant" /> - </java-attributes> - <xml-properties> - <xml-property name="maximumDepth" value="0" /> - </xml-properties> - </java-type> - - <java-type name="Tenant"> - <xml-root-element name="tenant" /> - <java-attributes> - <xml-element java-attribute="tenantId" name="tenant-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique id relative to the cloud-region." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="tenantName" name="tenant-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Readable name of tenant" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vservers" name="vservers" type="inventory.aai.onap.org.v11.Vservers" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Openstack tenant" /> - <xml-property name="nameProps" value="tenant-name" /> - <xml-property name="indexedProps" value="tenant-name,tenant-id" /> - <xml-property name="searchable" value="tenant-id,tenant-name" /> - <xml-property name="dependentOn" value="cloud-region" /> - <xml-property name="container" value="tenants" /> - </xml-properties> - </java-type> - - <java-type name="Vservers"> - <xml-properties> - <xml-property name="description" value="Collection of virtual Servers, aka virtual machines or VMs." /> - </xml-properties> - <xml-root-element name="vservers" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v11.Vserver" /> - </java-attributes> - </java-type> - - <java-type name="Vserver"> - <xml-root-element name="vserver" /> - <java-attributes> - <xml-element java-attribute="vserverId" name="vserver-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique identifier for this vserver relative to its tenant" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vserverName" name="vserver-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of vserver" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vserverName2" name="vserver-name2" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Alternative name of vserver" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vserverSelflink" name="vserver-selflink" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="URL to endpoint where AAI can get more details" /> - </xml-properties> - </xml-element> - <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="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." /> - </xml-properties> - </xml-element> - <xml-element default-value="false" required="true" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="Used to indicate whether closed loop function is enabled on this node" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="volumes" name="volumes" type="inventory.aai.onap.org.v11.Volumes" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Virtual Servers, aka virtual machine or VM." /> - <xml-property name="nameProps" value="vserver-name" /> - <xml-property name="indexedProps" value="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2" /> - <xml-property name="searchable" value="vserver-id,vserver-name,vserver-name2" /> - <xml-property name="dependentOn" value="tenant" /> - <xml-property name="container" value="vservers" /> - </xml-properties> - </java-type> - - <java-type name="LInterfaces"> - <xml-properties> - <xml-property name="description" value="Collection of logical interfaces." /> - </xml-properties> - <xml-root-element name="l-interfaces" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v11.LInterface" /> - </java-attributes> - </java-type> - - <java-type name="LInterface"> - <xml-root-element name="l-interface" /> - <java-attributes> - <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Name given to the interface" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="E.g., CUSTOMER, UPLINK, etc." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="v6WanLinkIp" name="v6-wan-link-ip" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="URL to endpoint where AAI can get more details" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="ID of interface" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="macaddr" name="macaddr" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="MAC address for the interface" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="networkName" name="network-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of the network" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Whether A&AI should be managing this interface of not. Could have value like CUSTOMER" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="interfaceDescription" name="interface-description" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Human friendly text regarding this interface." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="isPortMirrored" name="is-port-mirrored" required="true" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="boolean indicatating whether or not port is a mirrored." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v11.Vlans" /> - <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v11.SriovVfs" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv4AddressList" /> - <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv6AddressList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Logical interfaces, e.g., a vnic." /> - <xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name" /> - <xml-property name="dependentOn" value="generic-vnf,newvce,vpe,p-interface,vserver,lag-interface" /> - <xml-property name="container" value="l-interfaces" /> - </xml-properties> - </java-type> - - <java-type name="SriovVfs"> - <xml-properties> - <xml-property name="description" value="Collection of SR-IOV Virtual Functions." /> - </xml-properties> - <xml-root-element name="sriov-vfs" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v11.SriovVf" /> - </java-attributes> - </java-type> - <java-type name="SriovVf"> - <xml-root-element name="sriov-vf" /> - <java-attributes> - <xml-element java-attribute="pciId" name="pci-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="PCI ID used to identify the sriov-vf" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vfVlanFilter" name="vf-vlan-filter" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vfMacFilter" name="vf-mac-filter" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vfVlanStrip" name="vf-vlan-strip" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="description" value="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vfVlanAntiSpoofCheck" name="vf-vlan-anti-spoof-check" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="description" value="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." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vfMacAntiSpoofCheck" name="vf-mac-anti-spoof-check" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="description" value="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." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vfMirrors" name="vf-mirrors" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vfBroadcastAllow" name="vf-broadcast-allow" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vfUnknownMulticastAllow" name="vf-unknown-multicast-allow" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vfUnknownUnicastAllow" name="vf-unknown-unicast-allow" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vfInsertStag" name="vf-insert-stag" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="description" value="This option, if set to true, instructs to insert outer tag after traffic comes out of VM." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vfLinkStatus" name="vf-link-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="This option is used to set the link status. Valid values as of 1607 are on, off, and auto." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Neutron network id of the interface" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)" /> - <xml-property name="indexedProps" value="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id" /> - <xml-property name="dependentOn" value="l-interface" /> - <xml-property name="container" value="sriov-vfs" /> - </xml-properties> - </java-type> - - <java-type name="L3InterfaceIpv4AddressList"> - <xml-root-element name="l3-interface-ipv4-address-list" /> - <java-attributes> - <xml-element java-attribute="l3InterfaceIpv4Address" name="l3-interface-ipv4-address" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="IP address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="l3InterfaceIpv4PrefixLength" name="l3-interface-ipv4-prefix-length" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="Prefix length, 32 for single address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="Inner VLAN tag" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="Outer VLAN tag" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="description" value="Indicator of fixed or floating address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Neutron network id of the interface that address belongs to" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Neutron id of subnet that address belongs to" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="IPv4 Address Range" /> - <xml-property name="indexedProps" value="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" /> - <xml-property name="dependentOn" value="vlan,l-interface" /> - </xml-properties> - </java-type> - - <java-type name="Vlans"> - <xml-root-element name="vlans" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v11.Vlan" /> - </java-attributes> - </java-type> - - <java-type name="Vlan"> - <xml-root-element name="vlan" /> - <java-attributes> - <xml-element java-attribute="vlanInterface" name="vlan-interface" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="String that identifies the interface" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="Inner VLAN tag" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="Outer VLAN tag" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Captures the numeric part of the speed" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Captures the units corresponding to the speed" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vlanDescription" name="vlan-description" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used to describe (the service associated with) the vlan" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="backdoorConnection" name="backdoor-connection" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Whether customer is going to use this VLAN for backdoor connection to another customer premise device." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vpnId" name="vpn-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="This indicates the customers VPN ID associated with this vlan" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Status of a vnf's vlan interface, on which the customer circuit resides, mastered by SDN-C." /> - </xml-properties> - </xml-element> - <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv4AddressList" /> - <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv6AddressList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Definition of vlan" /> - <xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-id" /> - <xml-property name="uniqueProps" value="vpn-id" /> - <xml-property name="dependentOn" value="l-interface" /> - <xml-property name="container" value="vlans" /> - </xml-properties> - </java-type> - - <java-type name="L3InterfaceIpv6AddressList"> - <xml-root-element name="l3-interface-ipv6-address-list" /> - <java-attributes> - <xml-element java-attribute="l3InterfaceIpv6Address" name="l3-interface-ipv6-address" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="IP address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="l3InterfaceIpv6PrefixLength" name="l3-interface-ipv6-prefix-length" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="Prefix length, 128 for single address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="Inner VLAN tag" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="Outer VLAN tag" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="description" value="Indicator of fixed or floating address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Neutron network id of the interface that address belongs to" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Neutron id of subnet that address belongs to" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="IPv6 Address Range" /> - <xml-property name="indexedProps" value="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" /> - <xml-property name="dependentOn" value="vlan,l-interface" /> - </xml-properties> - </java-type> - - <java-type name="Volumes"> - <xml-properties> - <xml-property name="description" value="Collection of ephemeral Block storage volumes." /> - </xml-properties> - <xml-root-element name="volumes" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v11.Volume" /> - </java-attributes> - </java-type> - - <java-type name="Volume"> - <xml-root-element name="volume" /> - <java-attributes> - <xml-element java-attribute="volumeId" name="volume-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique ID of block storage volume relative to the vserver." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="volumeSelflink" name="volume-selflink" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="URL to endpoint where AAI can get more details" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Ephemeral Block storage volume." /> - <xml-property name="indexedProps" value="volume-id" /> - <xml-property name="dependentOn" value="vserver" /> - <xml-property name="container" value="volumes" /> - </xml-properties> - </java-type> - - <java-type name="Flavors"> - <xml-properties> - <xml-property name="description" value="Collection of openstack flavors." /> - </xml-properties> - <xml-root-element name="flavors" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v11.Flavor" /> - </java-attributes> - </java-type> - - <java-type name="Flavor"> - <xml-root-element name="flavor" /> - <java-attributes> - <xml-element java-attribute="flavorId" name="flavor-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Flavor id, expected to be unique across cloud-region." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="flavorName" name="flavor-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Flavor name" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="flavorVcpus" name="flavor-vcpus" type="java.lang.Integer"> - <xml-properties> - <xml-property name="description" value="Number of CPUs" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="flavorRam" name="flavor-ram" type="java.lang.Integer"> - <xml-properties> - <xml-property name="description" value="Amount of memory" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="flavorDisk" name="flavor-disk" type="java.lang.Integer"> - <xml-properties> - <xml-property name="description" value="Disk space" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="flavorEphemeral" name="flavor-ephemeral" type="java.lang.Integer"> - <xml-properties> - <xml-property name="description" value="Amount of ephemeral disk space" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="flavorSwap" name="flavor-swap" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="amount of swap space allocation" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="flavorIsPublic" name="flavor-is-public" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="description" value="whether flavor is available to all users or private to the tenant it was created in." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="flavorSelflink" name="flavor-selflink" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="URL to endpoint where AAI can get more details" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="flavorDisabled" name="flavor-disabled" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="description" value="Boolean as to whether this flavor is no longer enabled" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Openstack flavor." /> - <xml-property name="nameProps" value="flavor-name" /> - <xml-property name="indexedProps" value="flavor-name,flavor-id" /> - <xml-property name="dependentOn" value="cloud-region" /> - <xml-property name="container" value="flavors" /> - </xml-properties> - </java-type> - - <java-type name="Snapshots"> - <xml-properties> - <xml-property name="description" value="Collection of openstack snapshots" /> - </xml-properties> - <xml-root-element name="snapshots" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v11.Snapshot" /> - </java-attributes> - </java-type> - - <java-type name="Snapshot"> - <xml-root-element name="snapshot" /> - <java-attributes> - <xml-element java-attribute="snapshotId" name="snapshot-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Snapshot id, this is the key UUID assoc associated in glance with the snapshots." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="snapshotName" name="snapshot-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Snapshot name" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="snapshotArchitecture" name="snapshot-architecture" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Operating system architecture" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="snapshotOsDistro" name="snapshot-os-distro" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The common name of the operating system distribution in lowercase" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="snapshotOsVersion" name="snapshot-os-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The operating system version as specified by the distributor." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="application" name="application" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The application that the image instantiates." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The vendor of the application." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The version of the application." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="snapshotSelflink" name="snapshot-selflink" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="URL to endpoint where AAI can get more details" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="prevSnapshotId" name="prev-snapshot-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="This field contains the UUID of the previous snapshot (if any)." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Openstack snapshot" /> - <xml-property name="nameProps" value="snapshot-name" /> - <xml-property name="uniqueProps" value="snapshot-id" /> - <xml-property name="indexedProps" value="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id" /> - <xml-property name="dependentOn" value="cloud-region" /> - <xml-property name="container" value="snapshots" /> - </xml-properties> - </java-type> - - <java-type name="GroupAssignments"> - <xml-properties> - <xml-property name="description" value="Collection of openstack group assignments" /> - </xml-properties> - <xml-root-element name="group-assignments" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v11.GroupAssignment" /> - </java-attributes> - </java-type> - - <java-type name="GroupAssignment"> - <xml-root-element name="group-assignment" /> - <java-attributes> - <xml-element java-attribute="groupId" name="group-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Group id, expected to be unique across cloud-region." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="groupType" name="group-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Group type - the type of group this instance refers to" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="groupName" name="group-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Group name - name assigned to the group" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="groupDescription" name="group-description" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Group description - description of the group" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)." /> - <xml-property name="nameProps" value="group-name" /> - <xml-property name="indexedProps" value="group-id,group-type,group-name" /> - <xml-property name="dependentOn" value="cloud-region" /> - <xml-property name="container" value="group-assignments" /> - </xml-properties> - </java-type> - - <java-type name="Images"> - <xml-properties> - <xml-property name="description" value="Collectio of Openstack images." /> - </xml-properties> - <xml-root-element name="images" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v11.Image" /> - </java-attributes> - </java-type> - - <java-type name="Image"> - <xml-root-element name="image" /> - <java-attributes> - <xml-element java-attribute="imageId" name="image-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Image id, expected to be unique across cloud region" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="imageName" name="image-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Image name" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="imageArchitecture" name="image-architecture" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Operating system architecture." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="imageOsDistro" name="image-os-distro" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The common name of the operating system distribution in lowercase" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="imageOsVersion" name="image-os-version" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The operating system version as specified by the distributor." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="application" name="application" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The application that the image instantiates." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The vendor of the application." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The version of the application." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="imageSelflink" name="image-selflink" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="URL to endpoint where AAI can get more details" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Openstack image." /> - <xml-property name="nameProps" value="image-name" /> - <xml-property name="indexedProps" value="application,image-name,application-vendor,image-id,application-version" /> - <xml-property name="dependentOn" value="cloud-region" /> - <xml-property name="container" value="images" /> - </xml-properties> - </java-type> - - <java-type name="Metadata"> - <xml-properties> - <xml-property name="description" value="Collection of metadatum (key/value pairs)" /> - </xml-properties> - <xml-root-element name="metadata" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v11.Metadatum" /> - </java-attributes> - </java-type> - - <java-type name="Metadatum"> - <xml-root-element name="metadatum" /> - <java-attributes> - <xml-element java-attribute="metaname" name="metaname" required="true" type="java.lang.String" xml-key="true" /> - <xml-element java-attribute="metaval" name="metaval" required="true" type="java.lang.String" /> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Key/value pairs" /> - <xml-property name="indexedProps" value="metaname" /> - <xml-property name="dependentOn" value="tenant,image,service-instance,connector,model" /> - <xml-property name="container" value="metadata" /> - </xml-properties> - </java-type> - - <java-type name="DvsSwitches"> - <xml-properties> - <xml-property name="description" value="Collection of digital virtual switch metadata used for vmWare VCEs and VPEs." /> - </xml-properties> - <xml-root-element name="dvs-switches" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v11.DvsSwitch" /> - </java-attributes> - </java-type> - - <java-type name="DvsSwitch"> - <xml-root-element name="dvs-switch" /> - <java-attributes> - <xml-element java-attribute="switchName" name="switch-name" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="DVS switch name" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vcenterUrl" name="vcenter-url" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="URL used to reach the vcenter" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="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. " /> - <xml-property name="indexedProps" value="vcenter-url,switch-name" /> - <xml-property name="dependentOn" value="cloud-region" /> - <xml-property name="container" value="dvs-switches" /> - </xml-properties> - </java-type> - - <java-type name="NetworkProfiles"> - <xml-properties> - <xml-property name="description" value="Collection of network profiles" /> - </xml-properties> - <xml-root-element name="network-profiles" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v11.NetworkProfile" /> - </java-attributes> - </java-type> - - <java-type name="NetworkProfile"> - <xml-root-element name="network-profile" /> - <java-attributes> - <xml-element java-attribute="nmProfileName" name="nm-profile-name" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique name of network profile." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="communityString" name="community-string" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Encrypted SNMP community string" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Network profile populated by SDN-GP for SNMP" /> - <xml-property name="indexedProps" value="nm-profile-name" /> - <xml-property name="container" value="network-profiles" /> - <xml-property name="namespace" value="cloud-infrastructure" /> - </xml-properties> - </java-type> - - <java-type name="Pservers"> - <xml-properties> - <xml-property name="description" value="Collection of compute hosts." /> - </xml-properties> - <xml-root-element name="pservers" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v11.Pserver" /> - </java-attributes> - <xml-properties> - <xml-property name="maximumDepth" value="0" /> - </xml-properties> - </java-type> - - <java-type name="Pserver"> - <xml-root-element name="pserver" /> - <java-attributes> - <xml-element java-attribute="hostname" name="hostname" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Value from executing hostname on the compute node." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ptniiEquipName" name="ptnii-equip-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="PTNII name" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="numberOfCpus" name="number-of-cpus" type="java.lang.Integer"> - <xml-properties> - <xml-property name="description" value="Number of cpus" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="diskInGigabytes" name="disk-in-gigabytes" type="java.lang.Integer"> - <xml-properties> - <xml-property name="description" value="Disk size, in GBs" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ramInMegabytes" name="ram-in-megabytes" type="java.lang.Integer"> - <xml-properties> - <xml-property name="description" value="RAM size, in MBs" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Equipment type. Source of truth should define valid values." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Equipment vendor. Source of truth should define valid values." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Equipment model. Source of truth should define valid values." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="fqdn" name="fqdn" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Fully-qualified domain name" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="pserverSelflink" name="pserver-selflink" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="URL to endpoint where AAI can get more details" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used to configure device, also used for troubleshooting and is IP used for traps generated by device." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Serial number, may be queried" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="IPV4 Loopback 0 address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="IPV6 Loopback 0 address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="IPV4 AIM address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="IPV6 AIM address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="IPV6 OAM address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="CANOPI's inventory status. Only set with values exactly as defined by CANOPI." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="pserverId" name="pserver-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="ID of Pserver" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="internetTopology" name="internet-topology" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="internet topology of Pserver" /> - </xml-properties> - </xml-element> - <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="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." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="pserverName2" name="pserver-name2" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="alternative pserver name" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="purpose" name="purpose" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="purpose of pserver" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v11.PInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver." /> - <xml-property name="nameProps" value="pserver-name2" /> - <xml-property name="indexedProps" value="hostname,in-maint,pserver-id,pserver-name2,inv-status" /> - <xml-property name="searchable" value="hostname,pserver-name2,pserver-id,ipv4-oam-address" /> - <xml-property name="container" value="pservers" /> - <xml-property name="namespace" value="cloud-infrastructure" /> - </xml-properties> - </java-type> - - <java-type name="PInterfaces"> - <xml-properties> - <xml-property name="description" value="Collection of physical interfaces." /> - </xml-properties> - <xml-root-element name="p-interfaces" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v11.PInterface" /> - </java-attributes> - </java-type> - - <java-type name="PInterface"> - <xml-root-element name="p-interface" /> - <java-attributes> - <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Name that identifies the physical interface" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Captures the numeric part of the speed" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Captures the units corresponding to the speed" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="portDescription" name="port-description" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Nature of the services and connectivity on this port." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="equipmentIdentifier" name="equipment-identifier" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="CLEI or other specification for p-interface hardware." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Role specification for p-interface hardware." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="interfaceType" name="interface-type" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Indicates the physical properties of the interface." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Physical interface (e.g., nic)" /> - <xml-property name="indexedProps" value="interface-name,prov-status" /> - <xml-property name="nameProps" value="prov-status" /> - <xml-property name="dependentOn" value="vpls-pe,pserver,pnf" /> - <xml-property name="container" value="p-interfaces" /> - </xml-properties> - </java-type> - - <java-type name="LagInterfaces"> - <xml-properties> - <xml-property name="description" value="Collection of link aggregate interfaces." /> - </xml-properties> - <xml-root-element name="lag-interfaces" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v11.LagInterface" /> - </java-attributes> - </java-type> - - <java-type name="LagInterface"> - <xml-root-element name="lag-interface" /> - <java-attributes> - <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Name that identifies the link aggregate interface" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="interfaceDescription" name="interface-description" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Human friendly text regarding this interface." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Captures the numeric part of the speed" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Captures the units corresponding to the speed" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="ID of interface" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." /> - </xml-properties> - </xml-element> - <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Link aggregate interface" /> - <xml-property name="indexedProps" value="interface-name,interface-id,interface-role" /> - <xml-property name="dependentOn" value="generic-vnf,pserver,vpe,vpls-pe,pnf" /> - <xml-property name="container" value="lag-interfaces" /> - </xml-properties> - </java-type> - - <java-type name="OamNetworks"> - <xml-properties> - <xml-property name="description" value="Collection of OAM networks, to be deprecated shortly. Do not use for new purposes. " /> - </xml-properties> - <xml-root-element name="oam-networks" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v11.OamNetwork" /> - </java-attributes> - </java-type> - - <java-type name="OamNetwork"> - <xml-root-element name="oam-network" /> - <java-attributes> - <xml-element java-attribute="networkUuid" name="network-uuid" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="UUID of the network. Unique across a cloud-region" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of the network." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="cvlan-id" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer"> - <xml-properties> - <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="OAM network, to be deprecated shortly. Do not use for new purposes. " /> - <xml-property name="nameProps" value="network-name" /> - <xml-property name="indexedProps" value="cvlan-tag,network-uuid,network-name" /> - <xml-property name="dependentOn" value="cloud-region" /> - <xml-property name="container" value="oam-networks" /> - </xml-properties> - </java-type> - - <java-type name="AvailabilityZones"> - <xml-properties> - <xml-property name="description" value="Collection of availability zones" /> - </xml-properties> - <xml-root-element name="availability-zones" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v11.AvailabilityZone" /> - </java-attributes> - </java-type> - - <java-type name="AvailabilityZone"> - <xml-root-element name="availability-zone" /> - <java-attributes> - <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Name of the availability zone. Unique across a cloud region" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="hypervisorType" name="hypervisor-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Type of hypervisor. Source of truth should define valid values." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="State that indicates whether the availability zone should be used, etc. Source of truth should define valid values." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Availability zone, a collection of compute hosts/pservers" /> - <xml-property name="indexedProps" value="availability-zone-name" /> - <xml-property name="dependentOn" value="cloud-region" /> - <xml-property name="container" value="availability-zones" /> - </xml-properties> - </java-type> - - <java-type name="VirtualDataCenters"> - <xml-properties> - <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" /> - </xml-properties> - <xml-root-element name="virtual-data-centers" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v11.VirtualDataCenter" /> - </java-attributes> - </java-type> - - <java-type name="VirtualDataCenter"> - <xml-root-element name="virtual-data-center" /> - <java-attributes> - <xml-element java-attribute="vdcId" name="vdc-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique ID of the vdc" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vdcName" name="vdc-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of the virtual data center" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" /> - <xml-property name="nameProps" value="vdc-name" /> - <xml-property name="indexedProps" value="vdc-name,vdc-id" /> - <xml-property name="container" value="virtual-data-centers" /> - <xml-property name="namespace" value="cloud-infrastructure" /> - </xml-properties> - </java-type> - - <java-type name="Business"> - <xml-properties> - <xml-property name="description" value="Namespace for business related constructs" /> - </xml-properties> - <xml-root-element name="business" /> - <java-attributes> - <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v11.Connectors" /> - <xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v11.Customers" /> - </java-attributes> - </java-type> - - <java-type name="Connectors"> - <xml-properties> - <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" /> - </xml-properties> - <xml-root-element name="connectors" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v11.Connector" /> - </java-attributes> - </java-type> - - <java-type name="Connector"> - <xml-root-element name="connector" /> - <java-attributes> - <xml-element java-attribute="resourceInstanceId" name="resource-instance-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique id of resource instance." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC model id for this resource or service model." /> - <xml-property name="visibility" value="deployment" /> - <xml-property name="dbAlias" value="model-invariant-id-local" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC model version for this resource or service model." /> - <xml-property name="visibility" value="deployment" /> - <xml-property name="dbAlias" value="model-version-id-local" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC model version for this resource or service model." /> - <xml-property name="visibility" value="internal" /> - <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&AI widget." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" /> - <xml-property name="indexedProps" value="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version" /> - <xml-property name="container" value="connectors" /> - <xml-property name="namespace" value="business" /> - </xml-properties> - </java-type> - - <java-type name="Customers"> - <xml-properties> - <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information." /> - </xml-properties> - <xml-root-element name="customers" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v11.Customer" /> - </java-attributes> - <xml-properties> - <xml-property name="maximumDepth" value="0" /> - </xml-properties> - </java-type> - - <java-type name="Customer"> - <xml-root-element name="customer" /> - <java-attributes> - <xml-element java-attribute="globalCustomerId" name="global-customer-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Global customer id used across ECOMP to uniquely identify customer." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="subscriberName" name="subscriber-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Subscriber name, an alternate way to retrieve a customer." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="subscriberType" name="subscriber-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Subscriber type, a way to provide VID with only the INFRA customers." /> - <xml-property name="defaultValue" value="CUST" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v11.ServiceSubscriptions" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="customer identifiers to provide linkage back to BSS information." /> - <xml-property name="nameProps" value="subscriber-name" /> - <xml-property name="indexedProps" value="subscriber-name,global-customer-id,subscriber-type" /> - <xml-property name="searchable" value="global-customer-id,subscriber-name" /> - <xml-property name="uniqueProps" value="global-customer-id" /> - <xml-property name="container" value="customers" /> - <xml-property name="namespace" value="business" /> - </xml-properties> - </java-type> - - <java-type name="ServiceSubscriptions"> - <xml-properties> - <xml-property name="description" value="Collection of objects that group service instances." /> - </xml-properties> - <xml-root-element name="service-subscriptions" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v11.ServiceSubscription" /> - </java-attributes> - </java-type> - - <java-type name="ServiceSubscription"> - <xml-root-element name="service-subscription" /> - <java-attributes> - <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Value defined by orchestration to identify this service across ECOMP." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="tempUbSubAccountId" name="temp-ub-sub-account-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="This property will be deleted from A&AI in the near future. Only stop gap solution." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v11.ServiceInstances"> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Object that group service instances." /> - <xml-property name="indexedProps" value="service-type" /> - <xml-property name="dependentOn" value="customer" /> - <xml-property name="container" value="service-subscriptions" /> - <xml-property name="crossEntityReference" value="service-instance,service-type" /> - </xml-properties> - </java-type> - - <java-type name="ServiceInstances"> - <xml-properties> - <xml-property name="description" value="Collection of service instances" /> - </xml-properties> - <xml-root-element name="service-instances" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v11.ServiceInstance" /> - </java-attributes> - </java-type> - - <java-type name="ServiceInstance"> - <xml-root-element name="service-instance" /> - <java-attributes> - <xml-element java-attribute="serviceInstanceId" name="service-instance-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Uniquely identifies this instance of a service" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serviceInstanceName" name="service-instance-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="This field will store a name assigned to the service-instance." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC model id for this resource or service model." /> - <xml-property name="visibility" value="deployment" /> - <xml-property name="dbAlias" value="model-invariant-id-local" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC model version for this resource or service model." /> - <xml-property name="visibility" value="deployment" /> - <xml-property name="dbAlias" value="model-version-id-local" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC model version for this resource or service model." /> - <xml-property name="visibility" value="internal" /> - <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&AI widget." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="bandwidthTotal" name="bandwidth-total" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Indicates the total bandwidth to be used for this service." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vhnPortalUrl" name="vhn-portal-url" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="URL customers will use to access the vHN Portal." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Operational status of the service-instance." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serviceInstanceLocationId" name="service-instance-location-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="An identifier that customers assign to the location where this service is being used." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Path to the controller object." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Orchestration status of this service." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata" /> - <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v11.AllottedResources" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Instance of a service" /> - <xml-property name="indexedProps" value="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status" /> - <xml-property name="nameProps" value="service-instance-name" /> - <xml-property name="searchable" value="service-instance-id,service-instance-name" /> - <xml-property name="uniqueProps" value="service-instance-id" /> - <xml-property name="dependentOn" value="service-subscription" /> - <xml-property name="container" value="service-instances" /> - </xml-properties> - </java-type> - - <java-type name="ServiceDesignAndCreation"> - <xml-properties> - <xml-property name="description" value="Namespace for objects managed by ASDC" /> - </xml-properties> - <xml-root-element name="service-design-and-creation" /> - <java-attributes> - <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v11.VnfImages" /> - <xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v11.Services" /> - <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v11.ServiceCapabilities" /> - <xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v11.Models" /> - <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v11.NamedQueries" /> - </java-attributes> - </java-type> - - <java-type name="VnfImages"> - <xml-properties> - <xml-property name="description" value="Collection of image objects that pertain to a VNF that doesn't have associated vservers. This is a kludge." /> - </xml-properties> - <xml-root-element name="vnf-images" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v11.VnfImage" /> - </java-attributes> - </java-type> - - <java-type name="VnfImage"> - <xml-root-element name="vnf-image" /> - <java-attributes> - <xml-element java-attribute="vnfImageUuid" name="vnf-image-uuid" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique ID of this asset" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="application" name="application" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The application that the image instantiates." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="applicationVendor" name="application-vendor" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The vendor of the application." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The version of the application." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="URL to endpoint where AAI can get more details" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers. This is a kludge." /> - <xml-property name="indexedProps" value="application,vnf-image-uuid,application-vendor,application-version" /> - <xml-property name="uniqueProps" value="vnf-image-uuid" /> - <xml-property name="container" value="vnf-images" /> - <xml-property name="namespace" value="service-design-and-creation" /> - </xml-properties> - </java-type> - - <java-type name="Services"> - <xml-properties> - <xml-property name="description" value="Collection of service model definitions. Likely to be deprecated in favor of models from ASDC." /> - </xml-properties> - <xml-root-element name="services" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v11.Service" /> - </java-attributes> - </java-type> - - <java-type name="Service"> - <xml-root-element name="service" /> - <java-attributes> - <xml-element java-attribute="serviceId" name="service-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serviceDescription" name="service-description" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Description of the service" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serviceSelflink" name="service-selflink" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="URL to endpoint where AAI can get more details" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serviceVersion" name="service-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="service version" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Stand-in for service model definitions. Likely to be deprecated in favor of models from ASDC. Does not strictly map to ASDC services." /> - <xml-property name="indexedProps" value="service-description,service-id" /> - <xml-property name="container" value="services" /> - <xml-property name="namespace" value="service-design-and-creation" /> - </xml-properties> - </java-type> - - <java-type name="ServiceCapabilities"> - <xml-properties> - <xml-property name="description" value="Collection of service capabilities." /> - </xml-properties> - <xml-root-element name="service-capabilities" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v11.ServiceCapability" /> - </java-attributes> - </java-type> - - <java-type name="ServiceCapability"> - <xml-root-element name="service-capability" /> - <java-attributes> - <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource. This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Early definition of server/resource pairings, likely to be replaced by models. No new use should be made of this." /> - <xml-property name="indexedProps" value="service-type,vnf-type" /> - <xml-property name="container" value="service-capabilities" /> - <xml-property name="namespace" value="service-design-and-creation" /> - </xml-properties> - </java-type> - - <java-type name="Network"> - <xml-properties> - <xml-property name="description" value="Namespace for network inventory resources." /> - </xml-properties> - <xml-root-element name="network" /> - <java-attributes> - <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v11.LogicalLinks" /> - <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v11.SitePairSets" /> - <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v11.VpnBindings" /> - <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v11.VplsPes" /> - <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v11.MulticastConfigurations" /> - <xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v11.Vces" /> - <xml-element java-attribute="vpes" name="vpes" type="inventory.aai.onap.org.v11.Vpes" /> - <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v11.Vnfcs" /> - <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v11.L3Networks" /> - <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v11.NetworkPolicies" /> - <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v11.GenericVnfs" /> - <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v11.LagLinks" /> - <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v11.Newvces" /> - <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v11.Pnfs" /> - <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v11.PhysicalLinks" /> - <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v11.IpsecConfigurations" /> - <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v11.RouteTableReferences" /> - <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v11.InstanceGroups" /> - <xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v11.Zones" /> - <xml-element java-attribute="testObjects" name="test-objects" - type="inventory.aai.onap.org.v11.TestObjects" /> - </java-attributes> - </java-type> - - <java-type name="LogicalLinks"> - <xml-properties> - <xml-property name="description" value="Collection of logical connections" /> - </xml-properties> - <xml-root-element name="logical-links" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v11.LogicalLink" /> - </java-attributes> - </java-type> - - <java-type name="LogicalLink"> - <xml-root-element name="logical-link" /> - <java-attributes> - <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="linkType" name="link-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Type of logical link, e.g., evc" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Captures the numeric part of the speed" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Captures the units corresponding to the speed" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="v4, v6, or ds for dual stack" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="For example, static or BGP" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC model id for this resource or service model." /> - <xml-property name="visibility" value="deployment" /> - <xml-property name="dbAlias" value="model-invariant-id-local" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC model version for this resource or service model." /> - <xml-property name="visibility" value="deployment" /> - <xml-property name="dbAlias" value="model-version-id-local" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC model version for this resource or service model." /> - <xml-property name="visibility" value="internal" /> - <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&AI widget." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Indication of operational status of the logical link." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="linkRole" name="link-role" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Indication of the network use of the logical link." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="linkName2" name="link-name2" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Alias or alternate name (CLCI or D1 name)." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="linkId" name="link-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="UUID of the logical-link, SDNC generates this." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Circuit id" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="purpose" name="purpose" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Reason for this entity, role it is playing" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points" /> - <xml-property name="indexedProps" value="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose" /> - <xml-property name="uniqueProps" value="link-id" /> - <xml-property name="container" value="logical-links" /> - <xml-property name="namespace" value="network" /> - <xml-property name="searchable" value="link-name" /> - </xml-properties> - </java-type> - - <java-type name="SitePairSets"> - <xml-properties> - <xml-property name="description" value="Collection of sets of instances for probes related to generic-vnf" /> - </xml-properties> - <xml-root-element name="site-pair-sets" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v11.SitePairSet" /> - </java-attributes> - </java-type> - - <java-type name="SitePairSet"> - <xml-root-element name="site-pair-set" /> - <java-attributes> - <xml-element java-attribute="sitePairSetId" name="site-pair-set-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique id of site pair set." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v11.RoutingInstances" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Set of instances for probes used to measure service level agreements" /> - <xml-property name="indexedProps" value="site-pair-set-id" /> - <xml-property name="uniqueProps" value="site-pair-set-id" /> - <xml-property name="container" value="site-pair-sets" /> - <xml-property name="namespace" value="network" /> - </xml-properties> - </java-type> - - <java-type name="RoutingInstances"> - <xml-properties> - <xml-property name="description" value="set of probes related to generic-vnf routing instance" /> - </xml-properties> - <xml-root-element name="routing-instances" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v11.RoutingInstance" /> - </java-attributes> - </java-type> - - <java-type name="RoutingInstance"> - <xml-root-element name="routing-instance" /> - <java-attributes> - <xml-element java-attribute="routingInstanceId" name="routing-instance-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique id of routing instance" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="rpmOwner" name="rpm-owner" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="rpm owner" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v11.SitePairs" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="indexedProps" value="routing-instance-id" /> - <xml-property name="uniqueProps" value="routing-instance-id" /> - <xml-property name="dependentOn" value="site-pair-set" /> - <xml-property name="container" value="routing-instances" /> - </xml-properties> - </java-type> - - <java-type name="SitePairs"> - <xml-properties> - <xml-property name="description" value="probe within a set" /> - </xml-properties> - <xml-root-element name="site-pairs" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v11.SitePair" /> - </java-attributes> - </java-type> - - <java-type name="SitePair"> - <xml-root-element name="site-pair" /> - <java-attributes> - <xml-element java-attribute="sitePairId" name="site-pair-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="unique identifier of probe" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="sourceIp" name="source-ip" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Prefix address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="destinationIp" name="destination-ip" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Prefix address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="ip version, v4, v6" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="destinationHostname" name="destination-hostname" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Hostname of the destination equipment to which SLAs are measured against." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="destinationEquipType" name="destination-equip-type" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The type of destinatination equipment. Could be Router, UCPE, etc." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v11.ClassesOfService" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="indexedProps" value="site-pair-id" /> - <xml-property name="uniqueProps" value="site-pair-id" /> - <xml-property name="dependentOn" value="routing-instance" /> - <xml-property name="container" value="site-pairs" /> - </xml-properties> - </java-type> - - <java-type name="ClassesOfService"> - <xml-properties> - <xml-property name="description" value="class-of-service of probe" /> - </xml-properties> - <xml-root-element name="classes-of-service" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v11.ClassOfService" /> - </java-attributes> - </java-type> - - <java-type name="ClassOfService"> - <xml-root-element name="class-of-service" /> - <java-attributes> - <xml-element java-attribute="cos" name="cos" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="unique identifier of probe" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="probeId" name="probe-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="identifier of probe" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="probeType" name="probe-type" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="type of probe" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="indexedProps" value="cos" /> - <xml-property name="dependentOn" value="site-pair" /> - <xml-property name="container" value="classes-of-service" /> - </xml-properties> - </java-type> - - <java-type name="VpnBindings"> - <xml-root-element name="vpn-bindings" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v11.VpnBinding" /> - </java-attributes> - </java-type> - - <java-type name="VpnBinding"> - <xml-root-element name="vpn-binding" /> - <java-attributes> - <xml-element java-attribute="vpnId" name="vpn-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="VPN ID, globally unique within A&AI" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vpnName" name="vpn-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="VPN Name" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="globalRouteTarget" name="global-route-target" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Number used to identify a VPN, globally unique in the network" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vpnPlatform" name="vpn-platform" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the platform associated with the VPN example AVPN, Mobility" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vpnType" name="vpn-type" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Type of the vpn, should be taken from enumerated/valid values" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="routeDistinguisher" name="route-distinguisher" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="routeTargetRole" name="route-target-role" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Role assigned to this route target" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="routeTargets" name="route-targets" type="inventory.aai.onap.org.v11.RouteTargets" /> - - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList"> - <xml-properties> - <xml-property name="description" value="l3-networks relate to vpn-bindings" /> - </xml-properties> - </xml-element> - </java-attributes> - <xml-properties> - <xml-property name="description" value="VPN binding" /> - <xml-property name="nameProps" value="vpn-name,vpn-type" /> - <xml-property name="indexedProps" value="vpn-name,vpn-id,global-route-target,vpn-type" /> - <xml-property name="searchable" value="vpn-id,vpn-name" /> - <xml-property name="uniqueProps" value="vpn-id" /> - <xml-property name="container" value="vpn-bindings" /> - <xml-property name="namespace" value="network" /> - </xml-properties> - </java-type> - <java-type name="RouteTargets"> - <xml-properties> - <xml-property name="description" value="Collection of route target information" /> - </xml-properties> - <xml-root-element name="route-targets" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="routeTarget" name="route-target" type="inventory.aai.onap.org.v11.RouteTarget" /> - </java-attributes> - </java-type> - <java-type name="RouteTarget"> - <xml-root-element name="route-target" /> - <java-attributes> - <xml-element java-attribute="globalRouteTarget" name="global-route-target" required="true" xml-key="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Number used to identify an RT, globally unique in the network" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="routeTargetRole" name="route-target-role" required="true" xml-key="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Role assigned to this route target" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Route target information" /> - <xml-property name="container" value="route-targets" /> - <xml-property name="canBeLinked" value="true" /> - </xml-properties> - </java-type> - <java-type name="VplsPes"> - <xml-properties> - <xml-property name="description" value="Collection of VPLS Provider Edge routers" /> - </xml-properties> - <xml-root-element name="vpls-pes" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v11.VplsPe" /> - </java-attributes> - </java-type> - - <java-type name="VplsPe"> - <xml-root-element name="vpls-pe" /> - <java-attributes> - <xml-element java-attribute="equipmentName" name="equipment-name" required="true" type="java.lang.String" xml-key="true" /> - <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address)." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Client should send valid enumerated value, e.g., VPLS-PE." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="Temporary location for stag to get to VCE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v11.PInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="VPLS Provider Edge routers." /> - <xml-property name="indexedProps" value="prov-status,equipment-name" /> - <xml-property name="container" value="vpls-pes" /> - <xml-property name="namespace" value="network" /> - </xml-properties> - </java-type> - - <java-type name="MulticastConfigurations"> - <xml-properties> - <xml-property name="description" value="multicast configuration of generic-vnf ip-address" /> - </xml-properties> - <xml-root-element name="multicast-configurations" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v11.MulticastConfiguration" /> - </java-attributes> - </java-type> - - <java-type name="MulticastConfiguration"> - <xml-root-element name="multicast-configuration" /> - <java-attributes> - <xml-element java-attribute="multicastConfigurationId" name="multicast-configuration-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique id of multicast configuration." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="multicastProtocol" name="multicast-protocol" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="protocol of multicast configuration" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="rpType" name="rp-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="rp type of multicast configuration" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="indexedProps" value="multicast-configuration-id" /> - <xml-property name="uniqueProps" value="multicast-configuration-id" /> - <xml-property name="container" value="multicast-configurations" /> - <xml-property name="namespace" value="network" /> - </xml-properties> - </java-type> - - <java-type name="Vces"> - <xml-properties> - <xml-property name="description" value="Collection of Virtual Customer Edge Routers, used specifically for Gamma. This object is deprecated." /> - </xml-properties> - <xml-root-element name="vces" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v11.Vce" /> - </java-attributes> - </java-type> - - <java-type name="Vce"> - <xml-root-element name="vce" /> - <java-attributes> - <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique id of VNF. This is unique across the graph." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of VNF." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Alternate name of VNF." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource. This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Unique identifier of service, does not strictly map to ASDC services, SOON TO BE DEPRECATED." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Indicator for whether the resource is considered operational" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="OBSOLETE - do not use" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Network role being played by this VNF" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vpeId" name="vpe-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Unique ID of VPE connected to this VCE." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="v6VceWanAddress" name="v6-vce-wan-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Valid v6 IP address for the WAN Link on this router. Implied length of /64." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Loopback0 address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="OBSOLETE - see child relationships" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v11.PortGroups" /> - <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v11.Licenses" /> - <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v11.Entitlements" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated." /> - <xml-property name="nameProps" value="vnf-name" /> - <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id" /> - <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" /> - <xml-property name="uniqueProps" value="vnf-id" /> - <xml-property name="container" value="vces" /> - <xml-property name="namespace" value="network" /> - <xml-property name="extends" value="vnf" /> - </xml-properties> - </java-type> - - <java-type name="PortGroups"> - <xml-root-element name="port-groups" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v11.PortGroup" /> - </java-attributes> - </java-type> - - <java-type name="PortGroup"> - <xml-root-element name="port-group" /> - <java-attributes> - <xml-element java-attribute="interfaceId" name="interface-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique ID of the interface" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Neutron network id of this Interface" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="neutronNetworkName" name="neutron-network-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Neutron network name of this Interface" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="portGroupId" name="port-group-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Unique ID for port group in vmware" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="portGroupName" name="port-group-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Likely to duplicate value of neutron network name" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="switchName" name="switch-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="DVS or standard switch name (should be non-null for port groups associated with DVS)" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v11.CvlanTags" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Used to capture the network interfaces of this VCE" /> - <xml-property name="nameProps" value="port-group-name" /> - <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name" /> - <xml-property name="dependentOn" value="vce" /> - <xml-property name="container" value="port-groups" /> - </xml-properties> - </java-type> - - <java-type name="CvlanTags"> - <xml-root-element name="cvlan-tags" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v11.CvlanTagEntry" /> - </java-attributes> - </java-type> - - <java-type name="CvlanTagEntry"> - <xml-root-element name="cvlan-tag-entry" /> - <java-attributes> - <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long" xml-key="true"> - <xml-properties> - <xml-property name="description" value="See mis-na-virtualization-platform.yang" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="dependentOn" value="port-group" /> - <xml-property name="indexedProps" value="cvlan-tag" /> - <xml-property name="container" value="cvlan-tags" /> - </xml-properties> - </java-type> - - <java-type name="Vpes"> - <xml-properties> - <xml-property name="description" value="Virtual provider edge router. In 1504, A&AI will populate this object through an M&P and tool provided to operations." /> - </xml-properties> - <xml-root-element name="vpes" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vpe" name="vpe" type="inventory.aai.onap.org.v11.Vpe" /> - </java-attributes> - </java-type> - - <java-type name="Vpe"> - <xml-root-element name="vpe" /> - <java-attributes> - <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique id of VNF. This is unique across the graph." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of VNF." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Alternate name of VNF." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource. This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Unique identifier of service. Does not map strictly to ASDC services. SOON TO BE DEPRECATED" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Indicator for whether the resource is considered operational" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="OBSOLETE - do not use. See child relationships." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Client should send valid enumerated value" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address)." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer"> - <xml-properties> - <xml-property name="description" value="Prefix length for oam-address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Gateway address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="v4Loopback0IpAddress" name="v4-loopback0-ip-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Loopback0 address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="Temporary location for stag to get to VCE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="asNumber" name="as-number" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="as-number of the VPE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="summaryStatus" name="summary-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="details regarding the vpe operation, PLEASE DISCONTINUE USE OF THIS FIELD." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="encryptedAccessFlag" name="encrypted-access-flag" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="description" value="indicates whether vpe access uses SSH" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" /> - <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v11.Licenses" /> - <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v11.Entitlements" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Relationship-list must include related to info for complex." /> - <xml-property name="nameProps" value="vnf-name" /> - <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,prov-status,service-id" /> - <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" /> - <xml-property name="uniqueProps" value="vnf-id" /> - <xml-property name="container" value="vpes" /> - <xml-property name="namespace" value="network" /> - <xml-property name="extends" value="vnf" /> - </xml-properties> - </java-type> - - <java-type name="Vnfcs"> - <xml-properties> - <xml-property name="description" value="virtual network components associated with a vserver from application controller." /> - </xml-properties> - <xml-root-element name="vnfcs" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v11.Vnfc" /> - </java-attributes> - </java-type> - - <java-type name="Vnfc"> - <xml-root-element name="vnfc" /> - <java-attributes> - <xml-element java-attribute="vnfcName" name="vnfc-name" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique ID of vnfc." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfcFunctionCode" name="vnfc-function-code" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="function code" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfcType" name="vnfc-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="type" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="prov status of this vnfc" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Orchestration status of this VNF, mastered by APP-C" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipaddressV4OamVip" name="ipaddress-v4-oam-vip" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Oam V4 vip address of this vnfc" /> - </xml-properties> - </xml-element> - <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" /> - </xml-properties> - </xml-element> - <xml-element default-value="false" required="true" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="used to indicate whether closed loop function is enabled on this node" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="groupNotation" name="group-notation" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Group notation of VNFC" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation" /> - <xml-property name="searchable" value="vnfc-name" /> - <xml-property name="container" value="vnfcs" /> - <xml-property name="namespace" value="network" /> - </xml-properties> - </java-type> - - <java-type name="L3Networks"> - <xml-root-element name="l3-networks" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v11.L3Network" /> - </java-attributes> - </java-type> - - <java-type name="L3Network"> - <xml-root-element name="l3-network" /> - <java-attributes> - <xml-element java-attribute="networkId" name="network-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Network ID, should be uuid. Unique across A&AI." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of the network, governed by some naming convention.." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="networkType" name="network-type" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Type of the network - who defines these values?" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="networkRole" name="network-role" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Role the network plans - who defines these values?" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="networkTechnology" name="network-technology" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Network technology - who defines these values?" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Neutron network id of this Interface" /> - </xml-properties> - </xml-element> - <xml-element default-value="false" required="true" java-attribute="isBoundToVpn" name="is-bound-to-vpn" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="Set to true if bound to VPN" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Unique identifier of service from ASDC. Does not strictly map to ASDC services. SOON TO BE DEPRECATED" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="networkRoleInstance" name="network-role-instance" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="network role instance" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="contrailNetworkFqdn" name="contrail-network-fqdn" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Contrail FQDN for the network" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC model id for this resource or service model." /> - <xml-property name="visibility" value="deployment" /> - <xml-property name="dbAlias" value="model-invariant-id-local" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC model version for this resource or service model." /> - <xml-property name="visibility" value="deployment" /> - <xml-property name="dbAlias" value="model-version-id-local" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC model version for this resource or service model." /> - <xml-property name="visibility" value="internal" /> - <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&AI widget." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="physicalNetworkName" name="physical-network-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name associated with the physical network." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="isProviderNetwork" name="is-provider-network" required="true" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="boolean indicatating whether or not network is a provider network." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="isSharedNetwork" name="is-shared-network" required="true" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="boolean indicatating whether or not network is a shared network." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="isExternalNetwork" name="is-external-network" required="true" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="boolean indicatating whether or not network is an external network." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Path to the controller object." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Indicator for whether the resource is considered operational." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v11.Subnets" /> - <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v11.CtagAssignments" /> - <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v11.SegmentationAssignments" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" > - <xml-properties> - <xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding" /> - </xml-properties> - </xml-element> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Generic network definition" /> - <xml-property name="nameProps" value="network-name" /> - <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role" /> - <xml-property name="searchable" value="network-id,network-name" /> - <xml-property name="uniqueProps" value="network-id" /> - <xml-property name="container" value="l3-networks" /> - <xml-property name="namespace" value="network" /> - </xml-properties> - </java-type> - <java-type name="NetworkPolicies"> - <xml-root-element name="network-policies" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v11.NetworkPolicy" /> - </java-attributes> - </java-type> - <java-type name="NetworkPolicy"> - <xml-root-element name="network-policy" /> - <java-attributes> - <xml-element java-attribute="networkPolicyId" name="network-policy-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="UUID representing unique key to this instance" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="networkPolicyFqdn" name="network-policy-fqdn" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Contrail FQDN for the policy" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="ID for the openStack Heat instance" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="nameProps" value="network-policy-fqdn" /> - <xml-property name="indexedProps" value="network-policy-id,network-policy-fqdn" /> - <xml-property name="searchable" value="network-policy-id,network-policy-fqdn" /> - <xml-property name="uniqueProps" value="network-policy-id" /> - <xml-property name="container" value="network-policies" /> - <xml-property name="namespace" value="network" /> - </xml-properties> - </java-type> - <java-type name="CtagAssignments"> - <xml-root-element name="ctag-assignments" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v11.CtagAssignment" /> - </java-attributes> - </java-type> - - <java-type name="CtagAssignment"> - <xml-root-element name="ctag-assignment" /> - <java-attributes> - <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" required="true" type="java.lang.Long" xml-key="true"> - <xml-properties> - <xml-property name="description" value="id." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="indexedProps" value="vlan-id-inner" /> - <xml-property name="dependentOn" value="l3-network" /> - <xml-property name="container" value="ctag-assignments" /> - </xml-properties> - </java-type> - - <java-type name="Subnets"> - <xml-root-element name="subnets" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v11.Subnet" /> - </java-attributes> - </java-type> - - <java-type name="Subnet"> - <xml-root-element name="subnet" /> - <java-attributes> - <xml-element java-attribute="subnetId" name="subnet-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Subnet ID, should be UUID." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="subnetName" name="subnet-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name associated with the subnet." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Neutron id of this subnet" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="gatewayAddress" name="gateway-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="gateway ip address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="networkStartAddress" name="network-start-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="network start address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="cidrMask" name="cidr-mask" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="cidr mask" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="ip version" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" /> - </xml-properties> - </xml-element> - <xml-element default-value="false" required="true" java-attribute="dhcpEnabled" name="dhcp-enabled" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="dhcp enabled" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="dhcpStart" name="dhcp-start" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the start address reserved for use by dhcp" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="dhcpEnd" name="dhcp-end" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the last address reserved for use by dhcp" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="indexedProps" value="subnet-id,subnet-name" /> - <xml-property name="nameProps" value="subnet-name" /> - <xml-property name="uniqueProps" value="subnet-id" /> - <xml-property name="dependentOn" value="l3-network" /> - <xml-property name="container" value="subnets" /> - </xml-properties> - </java-type> - - <java-type name="GenericVnfs"> - <xml-properties> - <xml-property name="description" value="Collection of VNFs" /> - </xml-properties> - <xml-root-element name="generic-vnfs" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v11.GenericVnf" /> - </java-attributes> - <xml-properties> - <xml-property name="maximumDepth" value="0" /> - </xml-properties> - </java-type> - - <java-type name="GenericVnf"> - <xml-root-element name="generic-vnf" /> - <java-attributes> - <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique id of VNF. This is unique across the graph." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of VNF." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Alternate name of VNF." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource. This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Unique identifier of service, does not necessarily map to ASDC service models. SOON TO BE DEPRECATED" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Indicator for whether the resource is considered operational. Valid values are in-service-path and out-of-service-path." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="OBSOLETE - do not use" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Client should send valid enumerated value" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Orchestration status of this VNF, used by MSO." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="identifier of managed by ATT or customer" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by generic-vnf." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="v4 Loopback0 address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="nmLanV6Address" name="nm-lan-v6-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="v6 Loopback address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="managementV6Address" name="management-v6-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="v6 management address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vcpu" name="vcpu" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vcpuUnits" name="vcpu-units" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="units associated with vcpu, used for VNFs with no vservers/flavors, to be used only by uCPE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vmemory" name="vmemory" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vmemoryUnits" name="vmemory-units" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="units associated with vmemory, used for VNFs with no vservers/flavors, to be used only by uCPE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vdisk" name="vdisk" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" value="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only uCPE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vdiskUnits" name="vdisk-units" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only by uCPE" /> - </xml-properties> - </xml-element> - <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="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." /> - </xml-properties> - </xml-element> - <xml-element default-value="false" required="true" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="used to indicate whether closed loop function is enabled on this node" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="summaryStatus" name="summary-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="details regarding the generic-vnf operation, PLEASE DISCONTINUE USE OF THIS FIELD." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="encryptedAccessFlag" name="encrypted-access-flag" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="description" value="indicates whether generic-vnf access uses SSH" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="entitlementAssignmentGroupUuid" name="entitlement-assignment-group-uuid" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="UUID of the Entitlement group used for licensing VNFs, OBSOLETE - See child relationships." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="UUID of the specific entitlement resource. OBSOLETE - See child relationships." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="licenseAssignmentGroupUuid" name="license-assignment-group-uuid" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="UUID of the license assignment group. OBSOLETE - See child relationships." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="licenseKeyUuid" name="license-key-uuid" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="UUID of the actual license resource. OBSOLETE - See child relationships." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC model id for this resource or service model." /> - <xml-property name="visibility" value="deployment" /> - <xml-property name="dbAlias" value="model-invariant-id-local" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC model version for this resource or service model." /> - <xml-property name="visibility" value="deployment" /> - <xml-property name="dbAlias" value="model-version-id-local" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC model version for this resource or service model." /> - <xml-property name="visibility" value="internal" /> - <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&AI widget." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="asNumber" name="as-number" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="as-number of the VNF" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="regionalResourceSubzone" name="regional-resource-subzone" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="represents sub zone of the rr plane" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="nfType" name="nf-type" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Generic description of the type of NF" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="nfFunction" name="nf-function" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="English description of Network function that the specific VNF deployment is providing" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="role in the network that this model will be providing" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="nfNamingCode" name="nf-naming-code" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="string assigned to this model used for naming purposes" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Path to the controller object." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" /> - <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v11.VfModules" /> - <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v11.Licenses" /> - <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v11.Entitlements" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="General purpose VNF" /> - <xml-property name="nameProps" value="vnf-name" /> - <xml-property name="indexedProps" value="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role" /> - <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" /> - <xml-property name="uniqueProps" value="vnf-id" /> - <xml-property name="container" value="generic-vnfs" /> - <xml-property name="namespace" value="network" /> - <xml-property name="extends" value="vnf" /> - </xml-properties> - </java-type> - - <java-type name="VfModules"> - <xml-properties> - <xml-property name="description" value="Collection of vf-modules, a deployment unit of VNFCs" /> - </xml-properties> - <xml-root-element name="vf-modules" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v11.VfModule" /> - </java-attributes> - </java-type> - - <java-type name="VfModule"> - <xml-root-element name="vf-module" /> - <java-attributes> - <xml-element java-attribute="vfModuleId" name="vf-module-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique ID of vf-module." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vfModuleName" name="vf-module-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of vf-module" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Heat stack id corresponding to this instance." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="orchestration status of this vf-module, mastered by MSO" /> - </xml-properties> - </xml-element> - <xml-element default-value="false" required="true" java-attribute="isBaseVfModule" name="is-base-vf-module" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="used to indicate whether or not this object is base vf module" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC model id for this resource or service model." /> - <xml-property name="visibility" value="deployment" /> - <xml-property name="dbAlias" value="model-invariant-id-local" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC model version for this resource or service model." /> - <xml-property name="visibility" value="deployment" /> - <xml-property name="dbAlias" value="model-version-id-local" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC model version for this resource or service model." /> - <xml-property name="visibility" value="internal" /> - <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&AI widget." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="contrailServiceInstanceFqdn" name="contrail-service-instance-fqdn" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the Contrail unique ID for a service-instance" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="moduleIndex" name="module-index" type="java.lang.Integer"> - <xml-properties> - <xml-property name="description" value="the index will track the number of modules of a given type that have been deployed in a VNF, starting with 0, and always choosing the lowest available digit" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Path to the controller object." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="a deployment unit of VNFCs" /> - <xml-property name="indexedProps" value="vf-module-id,vf-module-name,heat-stack-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-service-instance-fqdn" /> - <xml-property name="searchable" value="vf-module-id,vf-module-name" /> - <xml-property name="dependentOn" value="generic-vnf" /> - <xml-property name="container" value="vf-modules" /> - </xml-properties> - </java-type> - - - <java-type name="LagLinks"> - <xml-properties> - <xml-property name="description" value="Collection of link aggregation connections" /> - </xml-properties> - <xml-root-element name="lag-links" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v11.LagLink" /> - </java-attributes> - </java-type> - - <java-type name="LagLink"> - <xml-root-element name="lag-link" /> - <java-attributes> - <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Alphabetical concatenation of lag-interface names" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="LAG links can connect lag-interfaces" /> - <xml-property name="indexedProps" value="link-name" /> - <xml-property name="container" value="lag-links" /> - <xml-property name="namespace" value="network" /> - </xml-properties> - </java-type> - - <java-type name="Newvces"> - <xml-properties> - <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf. This object will be retired with vce." /> - </xml-properties> - <xml-root-element name="newvces" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v11.Newvce" /> - </java-attributes> - </java-type> - - <java-type name="Newvce"> - <xml-root-element name="newvce" /> - <java-attributes> - <xml-element java-attribute="vnfId2" name="vnf-id2" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique id of VNF, can't use same attribute name right now until we promote this new object" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of VNF." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Alternate name of VNF." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource. This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Indicator for whether the resource is considered operational" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="OBSOLETE - do not use" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address)." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Client should send valid enumerated value, e.g., VPE." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="v4 Loopback0 address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf. This object will be retired with vce." /> - <xml-property name="nameProps" value="vnf-name" /> - <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2" /> - <xml-property name="searchable" value="vnf-id2,vnf-name,vnf-name2" /> - <xml-property name="uniqueProps" value="vnf-id2" /> - <xml-property name="container" value="newvces" /> - <xml-property name="namespace" value="network" /> - </xml-properties> - </java-type> - - <java-type name="Pnfs"> - <xml-properties> - <xml-property name="description" value="Collection of Physical Network Functions." /> - </xml-properties> - <xml-root-element name="pnfs" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v11.Pnf" /> - </java-attributes> - <xml-properties> - <xml-property name="maximumDepth" value="0" /> - </xml-properties> - </java-type> - - <java-type name="Pnf"> - <xml-root-element name="pnf" /> - <java-attributes> - <xml-element java-attribute="pnfName" name="pnf-name" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="unique name of Physical Network Function." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="pnfName2" name="pnf-name2" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="name of Physical Network Function." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="pnfName2Source" name="pnf-name2-source" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="source of name2" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="pnfId" name="pnf-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="id of pnf" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Equipment type. Source of truth should define valid values." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Equipment vendor. Source of truth should define valid values." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Equipment model. Source of truth should define valid values." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="identifier of managed by ATT or customer" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipaddressV4Oam" name="ipaddress-v4-oam" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="ipv4-oam-address with new naming convention for IP addresses" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="swVersion" name="sw-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="sw-version is the version of SW for the hosted application on the PNF." /> - </xml-properties> - </xml-element> - <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="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." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="frameId" name="frame-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="ID of the physical frame (relay rack) where pnf is installed." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Serial number of the device" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="IPV4 Loopback 0 address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="IPV6 Loopback 0 address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="IPV4 AIM address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="IPV6 AIM address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="IPV6 OAM address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="CANOPI's inventory status. Only set with values exactly as defined by CANOPI." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Nf Role is the role performed by this instance in the network." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v11.PInterfaces" /> - <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE." /> - <xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status" /> - <xml-property name="searchable" value="pnf-name" /> - <xml-property name="uniqueProps" value="pnf-name" /> - <xml-property name="container" value="pnfs" /> - <xml-property name="namespace" value="network" /> - </xml-properties> - </java-type> - - <java-type name="PhysicalLinks"> - <xml-properties> - <xml-property name="description" value="Collection of physical connections, typically between p-interfaces" /> - </xml-properties> - <xml-root-element name="physical-links" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v11.PhysicalLink" /> - </java-attributes> - <xml-properties> - <xml-property name="maximumDepth" value="0" /> - </xml-properties> - </java-type> - - <java-type name="PhysicalLink"> - <xml-root-element name="physical-link" /> - <java-attributes> - <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Captures the numeric part of the speed" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Captures the units corresponding to the speed" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Circuit it" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="dualMode" name="dual-mode" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Dual access mode (e.g., primary, secondary" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="To provide information on who manages this circuit. A&AI or 3rd party transport provider" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serviceProviderName" name="service-provider-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of the service Provider on this link." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Collection of physical connections, typically between p-interfaces" /> - <xml-property name="indexedProps" value="circuit-id,link-name" /> - <xml-property name="alternateKeys1" value="circuit-id" /> - <xml-property name="container" value="physical-links" /> - <xml-property name="namespace" value="network" /> - <xml-property name="searchable" value="link-name,circuit-id" /> - </xml-properties> - </java-type> - - <java-type name="VigServers"> - <xml-root-element name="vig-servers" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v11.VigServer" /> - </java-attributes> - </java-type> - - <java-type name="VigServer"> - <xml-root-element name="vig-server" /> - <java-attributes> - <xml-element java-attribute="vigAddressType" name="vig-address-type" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="indicates whether the VIG is for AVPN or INTERNET" /> - </xml-properties> - </xml-element> - <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV4Vig" name="ipaddress-v4-vig" type="java.lang.String" > - <xml-properties> - <xml-property name="description" value="v4 IP of the vig server" /> - </xml-properties> - </xml-element> - <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV6Vig" name="ipaddress-v6-vig" type="java.lang.String" > - <xml-properties> - <xml-property name="description" value="v6 IP of the vig server" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607" /> - <xml-property name="indexedProps" value="vig-address-type" /> - <xml-property name="dependentOn" value="ipsec-configuration" /> - <xml-property name="container" value="vig-servers" /> - </xml-properties> - </java-type> - - <java-type name="IpsecConfigurations"> - <xml-root-element name="ipsec-configurations" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v11.IpsecConfiguration" /> - </java-attributes> - </java-type> - - <java-type name="IpsecConfiguration"> - <xml-root-element name="ipsec-configuration" /> - <java-attributes> - <xml-element java-attribute="ipsecConfigurationId" name="ipsec-configuration-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="UUID of this configuration" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="requestedVigAddressType" name="requested-vig-address-type" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Indicate the type of VIG server like AVPN, INTERNET, BOTH" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="requestedEncryptionStrength" name="requested-encryption-strength" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="requestedDmzType" name="requested-dmz-type" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="ATT can offer a shared DMZ or a DMZ specific to a customer" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="sharedDmzNetworkAddress" name="shared-dmz-network-address" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Network address of shared DMZ" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="requestedCustomerName" name="requested-customer-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="If the DMZ is a custom DMZ, this field will indicate the customer information" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ikeVersion" name="ike-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="can be 1 or 2" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ikev1Authentication" name="ikev1-authentication" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Contains values like md5, sha1, sha256, sha384" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,? aes-192-cbc, aes-265-cbc" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ikev1AmGroupId" name="ikev1-am-group-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Group name defined in VIG for clients using aggressive mode" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ikev1AmPassword" name="ikev1-am-password" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="pre-shared key for the above group name " /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ikev1SaLifetime" name="ikev1-sa-lifetime" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Lifetime for IKEv1 SA" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipsecAuthentication" name="ipsec-authentication" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="md5, sha1, sha256, sha384" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc,? aes-192-cbc, aes-265-cbc" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Life time for IPSec SA" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipsecPfs" name="ipsec-pfs" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="enable PFS or not" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="xauthUserId" name="xauth-userid" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="user ID for xAuth, sm-user,ucpeHostName,nmteHostName" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="xauthUserPassword" name="xauth-user-password" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Encrypted using the Juniper $9$ algorithm" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="dpdInterval" name="dpd-interval" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The time between DPD probe" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="dpdFrequency" name="dpd-frequency" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Maximum number of DPD before claiming the tunnel is down" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v11.VigServers" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="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" /> - <xml-property name="indexedProps" value="ipsec-configuration-id" /> - <xml-property name="uniqueProps" value="ipsec-configuration-id" /> - <xml-property name="container" value="ipsec-configurations" /> - <xml-property name="namespace" value="network" /> - </xml-properties> - </java-type> - - - <java-type name="NotificationEvent"> - <xml-root-element name="notification-event" /> - <java-attributes> - <xml-element java-attribute="cambriaPartition" name="cambria.partition" type="java.lang.String" /> - <xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.onap.org.v11.NotificationEventHeader" /> - <xml-any-element java-attribute="entity" /> - </java-attributes> - </java-type> - <java-type name="NotificationEventHeader"> - <xml-root-element name="notification-event-header" /> - <java-attributes> - <xml-element java-attribute="id" name="id" type="java.lang.String" /> - <xml-element java-attribute="timestamp" name="timestamp" type="java.lang.String" /> - <xml-element java-attribute="sourceName" name="source-name" type="java.lang.String" /> - <xml-element java-attribute="domain" name="domain" type="java.lang.String" /> - <xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String" /> - <xml-element java-attribute="severity" name="severity" type="java.lang.String" /> - <xml-element java-attribute="eventType" name="event-type" type="java.lang.String" /> - <xml-element java-attribute="version" name="version" type="java.lang.String" /> - <xml-element java-attribute="action" name="action" type="java.lang.String" /> - <xml-element java-attribute="entityType" name="entity-type" type="java.lang.String" /> - <xml-element java-attribute="topEntityType" name="top-entity-type" type="java.lang.String" /> - <xml-element java-attribute="entityLink" name="entity-link" type="java.lang.String" /> - <xml-element java-attribute="status" name="status" type="java.lang.String" /> - </java-attributes> - </java-type> - <java-type name="AaiInternal"> - <xml-root-element name="aai-internal" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v11.ReservedPropNames" /> - <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v11.EdgePropNames" /> - </java-attributes> - </java-type> - <java-type name="ReservedPropNames"> - <xml-properties> - <xml-property name="description" value="Internal map to define some reserved properties of a vertex" /> - <xml-property name="uniqueProps" value="aai-unique-key" /> - <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri" /> - </xml-properties> - <xml-root-element name="reserved-prop-names" /> - <java-attributes> - <xml-element java-attribute="lastModSourceOfTruth" name="last-mod-source-of-truth" type="java.lang.String" /> - <xml-element java-attribute="aaiNodeType" name="aai-node-type" type="java.lang.String" /> - <xml-element java-attribute="aaiCreatedTs" name="aai-created-ts" type="java.lang.Long" /> - <xml-element java-attribute="aaiUniqueKey" name="aai-unique-key" type="java.lang.String" /> - <xml-element java-attribute="aaiLastModTs" name="aai-last-mod-ts" type="java.lang.Long" /> - <xml-element java-attribute="sourceOfTruth" name="source-of-truth" type="java.lang.String" /> - <xml-element java-attribute="aaiUri" name="aai-uri" type="java.lang.String" /> - </java-attributes> - </java-type> - <java-type name="EdgePropNames"> - <!-- NOTE that the names of these properties are not consistent and are in mixed case and hyphen case for now --> - <xml-properties> - <xml-property name="description" value="Internal map to define the properties of an edge and interpret the map EdgeRules" /> - <xml-property name="edgeInfo" value="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV" /> - </xml-properties> - <xml-root-element name="edge-prop-names" /> - <java-attributes> - <xml-element java-attribute="edgeLabel" name="edgeLabel" type="java.lang.String" /> - <xml-element java-attribute="direction" name="direction" type="java.lang.String" /> - <xml-element java-attribute="multiplicityRule" name="multiplicityRule" type="java.lang.String" /> - <xml-element java-attribute="isParent" name="isParent" type="java.lang.Boolean" /> - <xml-element java-attribute="usesResource" name="usesResource" type="java.lang.Boolean" /> - <xml-element java-attribute="hasDelTarget" name="hasDelTarget" type="java.lang.Boolean" /> - <xml-element java-attribute="SVC-INFRA" name="SVC-INFRA" type="java.lang.String" /> - <xml-element java-attribute="SVC-INFRA-REV" name="SVC-INFRA-REV" type="java.lang.String" /> - </java-attributes> - </java-type> - - <java-type name="Models"> - <xml-properties> - <xml-property name="description" value="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models" /> - </xml-properties> - <xml-root-element name="models" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v11.Model" /> - </java-attributes> - </java-type> - - <java-type name="Model"> - <xml-root-element name="model" /> - <xml-properties> - <xml-property name="description" value="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version" /> - <xml-property name="nameProps" value="model-type" /> - <xml-property name="indexedProps" value="model-invariant-id,model-type" /> - <xml-property name="uniqueProps" value="model-invariant-id" /> - <xml-property name="container" value="models" /> - <xml-property name="namespace" value="service-design-and-creation" /> - </xml-properties> - <java-attributes> - <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v11.ModelVers" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - </java-type> - - - <java-type name="ModelVers"> - <xml-root-element name="model-vers" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v11.ModelVer" /> - </java-attributes> - </java-type> - - <java-type name="ModelVer"> - <xml-root-element name="model-ver" /> - <xml-properties> - <xml-property name="description" value="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models" /> - <xml-property name="nameProps" value="model-name" /> - <xml-property name="indexedProps" value="model-version-id,model-name,model-version" /> - <xml-property name="uniqueProps" value="model-version-id" /> - <xml-property name="container" value="model-vers" /> - </xml-properties> - <java-attributes> - <xml-element java-attribute="modelVersionId" name="model-version-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of the model, which can change from version to version." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Version" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Description" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v11.ModelElements" /> - <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - </java-type> - - <java-type name="ModelElements"> - <xml-root-element name="model-elements" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v11.ModelElement" /> - </java-attributes> - </java-type> - - <java-type name="ModelElement"> - <xml-properties> - <xml-property name="description" value="Defines how other models combine to make up a higher-level model." /> - <xml-property name="uniqueProps" value="model-element-uuid" /> - <xml-property name="indexedProps" value="model-element-uuid" /> - <xml-property name="allowDirectRead" value="true" /> - <xml-property name="allowDirectWrite" value="false" /> - <xml-property name="container" value="model-elements" /> - </xml-properties> - <xml-root-element name="model-element" /> - <java-attributes> - <xml-element java-attribute="modelElementUuid" name="model-element-uuid" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="autoGenerateUuid" value="true" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="newDataDelFlag" name="new-data-del-flag" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Indicates whether this element was created as part of instantiation from this model" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="cardinality" name="cardinality" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="How many of this type of element are required/allowed" /> - </xml-properties> - </xml-element> - <xml-element container-type="java.util.ArrayList" java-attribute="linkagePoints" name="linkage-points" type="java.lang.String" > - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v11.ModelElements"> - <xml-properties> - <xml-property name="description" value="Defines how other models combine to make up a higher-level model" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v11.ModelConstraints"> - <xml-properties> - <xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - </java-type> - - <java-type name="ModelConstraints"> - <xml-root-element name="model-constraints" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v11.ModelConstraint" /> - </java-attributes> - </java-type> - - <java-type name="ModelConstraint"> - <xml-properties> - <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." /> - <xml-property name="uniqueProps" value="model-constraint-uuid" /> - <xml-property name="indexedProps" value="model-constraint-uuid" /> - <xml-property name="allowDirectRead" value="true" /> - <xml-property name="allowDirectWrite" value="false" /> - <xml-property name="container" value="model-constraints" /> - </xml-properties> - <xml-root-element name="model-constraint" /> - <java-attributes> - <xml-element java-attribute="modelConstraintUuid" name="model-constraint-uuid" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="autoGenerateUuid" value="true" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String" /> - <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v11.ConstrainedElementSets" /> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - </java-attributes> - </java-type> - - <java-type name="ConstrainedElementSets"> - <xml-root-element name="constrained-element-sets" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v11.ConstrainedElementSet" /> - </java-attributes> - </java-type> - - <java-type name="ConstrainedElementSet"> - <xml-properties> - <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." /> - <xml-property name="uniqueProps" value="constrained-element-set-uuid" /> - <xml-property name="indexedProps" value="constrained-element-set-uuid" /> - <xml-property name="allowDirectRead" value="true" /> - <xml-property name="allowDirectWrite" value="false" /> - <xml-property name="container" value="constrained-element-sets" /> - </xml-properties> - <xml-root-element name="constrained-element-set" /> - <java-attributes> - <xml-element java-attribute="constrainedElementSetUuid" name="constrained-element-set-uuid" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="autoGenerateUuid" value="true" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" /> - <xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String" /> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> - <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v11.ElementChoiceSets" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - </java-type> - - <java-type name="ElementChoiceSets"> - <xml-root-element name="element-choice-sets" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v11.ElementChoiceSet" /> - </java-attributes> - </java-type> - - <java-type name="ElementChoiceSet"> - <xml-properties> - <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." /> - <xml-property name="uniqueProps" value="element-choice-set-uuid" /> - <xml-property name="indexedProps" value="element-choice-set-uuid" /> - <xml-property name="allowDirectRead" value="true" /> - <xml-property name="allowDirectWrite" value="false" /> - <xml-property name="container" value="element-choice-sets" /> - </xml-properties> - <xml-root-element name="element-choice-set" /> - <java-attributes> - <xml-element java-attribute="elementChoiceSetUuid" name="element-choice-set-uuid" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="autoGenerateUuid" value="true" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String" /> - <xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String" /> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> - <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v11.ModelElements" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - </java-type> - - <java-type name="NamedQueries"> - <xml-root-element name="named-queries" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v11.NamedQuery" /> - </java-attributes> - </java-type> - - <java-type name="NamedQuery"> - <xml-properties> - <xml-property name="description" value="TBD" /> - <xml-property name="nameProps" value="named-query-name" /> - <xml-property name="uniqueProps" value="named-query-uuid" /> - <xml-property name="indexedProps" value="named-query-uuid,named-query-name" /> - <xml-property name="container" value="named-queries" /> - <xml-property name="namespace" value="service-design-and-creation" /> - </xml-properties> - <xml-root-element name="named-query" /> - <java-attributes> - <xml-element java-attribute="namedQueryUuid" name="named-query-uuid" required="true" type="java.lang.String" xml-key="true" /> - <xml-element java-attribute="namedQueryName" name="named-query-name" required="true" type="java.lang.String" /> - <xml-element java-attribute="namedQueryVersion" name="named-query-version" required="true" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="requiredInputParams" name="required-input-param" type="java.lang.String" > - <xml-element-wrapper name="required-input-params" /> - </xml-element> - <xml-element java-attribute="description" name="description" type="java.lang.String" /> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> - <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v11.NamedQueryElements" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - </java-type> - - <java-type name="NamedQueryElements"> - <xml-root-element name="named-query-elements" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v11.NamedQueryElement" /> - </java-attributes> - </java-type> - - <java-type name="NamedQueryElement"> - <xml-properties> - <xml-property name="description" value="TBD" /> - <xml-property name="uniqueProps" value="named-query-element-uuid" /> - <xml-property name="indexedProps" value="named-query-element-uuid" /> - <xml-property name="allowDirectRead" value="true" /> - <xml-property name="allowDirectWrite" value="false" /> - <xml-property name="container" value="named-query-elements" /> - </xml-properties> - <xml-root-element name="named-query-element" /> - <java-attributes> - <xml-element java-attribute="namedQueryElementUuid" name="named-query-element-uuid" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="autoGenerateUuid" value="true" /> - </xml-properties> - </xml-element> - <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" /> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> - <xml-element java-attribute="propertyLimitDesc" name="property-limit-desc" type="java.lang.String" /> - <xml-element java-attribute="doNotOutput" name="do-not-output" type="java.lang.String" /> - <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v11.NamedQueryElements" /> - <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v11.RelatedLookups" /> - <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v11.PropertyConstraints" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - </java-type> - - <java-type name="RelatedLookups"> - <xml-root-element name="related-lookups" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v11.RelatedLookup" /> - </java-attributes> - </java-type> - - <java-type name="RelatedLookup"> - <xml-properties> - <xml-property name="description" value="TBD" /> - <xml-property name="uniqueProps" value="related-lookup-uuid" /> - <xml-property name="indexedProps" value="related-lookup-uuid" /> - <xml-property name="allowDirectRead" value="true" /> - <xml-property name="allowDirectWrite" value="false" /> - <xml-property name="container" value="related-lookups" /> - </xml-properties> - <xml-root-element name="related-lookup" /> - <java-attributes> - <xml-element java-attribute="relatedLookupUuid" name="related-lookup-uuid" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="autoGenerateUuid" value="true" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="sourceNodeType" name="source-node-type" required="true" type="java.lang.String" /> - <xml-element java-attribute="sourceNodeProperty" name="source-node-property" required="true" type="java.lang.String" /> - <xml-element java-attribute="targetNodeType" name="target-node-type" required="true" type="java.lang.String" /> - <xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" type="java.lang.String" /> - <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" /> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - </java-type> - - <java-type name="PropertyConstraints"> - <xml-root-element name="property-constraints" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v11.PropertyConstraint" /> - </java-attributes> - </java-type> - - <java-type name="PropertyConstraint"> - <xml-properties> - <xml-property name="description" value="TBD" /> - <xml-property name="uniqueProps" value="property-constraint-uuid" /> - <xml-property name="indexedProps" value="property-constraint-uuid" /> - <xml-property name="allowDirectRead" value="true" /> - <xml-property name="allowDirectWrite" value="false" /> - <xml-property name="container" value="property-constraints" /> - </xml-properties> - <xml-root-element name="property-constraint" /> - <java-attributes> - <xml-element java-attribute="propertyConstraintUuid" name="property-constraint-uuid" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="autoGenerateUuid" value="true" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" /> - <xml-element java-attribute="propertyName" name="property-name" required="true" type="java.lang.String" /> - <xml-element java-attribute="propertyValue" name="property-value" required="true" type="java.lang.String" /> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" /> - </java-attributes> - </java-type> - - <java-type name="ModelAndNamedQuerySearch"> - <xml-properties> - <xml-property name="description" value="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query" /> - </xml-properties> - <xml-root-element name="model-and-named-query-search" /> - <java-attributes> - <xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.onap.org.v11.QueryParameters" /> - <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v11.InstanceFilters" /> - <xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v11.SecondaryFilts" /> - <xml-element java-attribute="topNodeType" name="top-node-type" type="java.lang.String" /> - <xml-element java-attribute="secondaryFilterCutPoint" name="secondary-filter-cut-point" type="java.lang.String" /> - </java-attributes> - </java-type> - - <java-type name="QueryParameters"> - <xml-properties> - <xml-property name="description" value="QueryParameters for performing a named-query or model query" /> - </xml-properties> - <xml-root-element name="query-parameters" /> - <java-attributes> - <xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v11.NamedQuery" /> - <xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v11.OverloadedModel" /> - </java-attributes> - </java-type> - - <java-type name="OverloadedModel"> - <xml-root-element name="overloaded-model" /> - <xml-properties> - <xml-property name="description" value="Allows for legacy POST of old-style and new-style models" /> - </xml-properties> - <java-attributes> - <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelNameVersionId" name="model-name-version-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of the model, which can change from version to version." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelId" name="model-id" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Invariant unique ID which does not change from version to version" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Version" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Description" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v11.ModelVers" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - </java-type> - - <java-type name="InstanceFilters"> - <xml-properties> - <xml-property name="description" value="InstanceFilters for performing a named-query or model query" /> - </xml-properties> - <xml-root-element name="instance-filters" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v11.InstanceFilter" /> - </java-attributes> - </java-type> - - <java-type name="InstanceFilter"> - <xml-properties> - <xml-property name="description" value="InstanceFilter for performing a named-query or model query" /> - <xml-property name="container" value="instance-filters" /> - </xml-properties> - <xml-root-element name="instance-filter" /> - <java-attributes> - <xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any" /> - </java-attributes> - </java-type> - - <java-type name="SecondaryFilts"> - <xml-properties> - <xml-property name="description" value="SecondaryFilts for performing a named-query or model query" /> - </xml-properties> - <xml-root-element name="secondary-filts" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v11.SecondaryFilt" /> - </java-attributes> - </java-type> - - <java-type name="SecondaryFilt"> - <xml-properties> - <xml-property name="description" value="SecondaryFilt for performing a named-query or model query" /> - </xml-properties> - <xml-root-element name="secondary-filt" /> - <java-attributes> - <xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any" /> - </java-attributes> - </java-type> - - <java-type name="Properties"> - <xml-properties> - <xml-property name="description" value="Property holder for query properties or instance properties" /> - </xml-properties> - <xml-root-element name="properties" /> - <java-attributes> - <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" /> - <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" /> - </java-attributes> - </java-type> - - <java-type name="ResponseList"> - <xml-properties> - <xml-property name="description" value="Response container for the results of a named-query or model query" /> - </xml-properties> - <xml-root-element name="response-list" /> - <java-attributes> - <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v11.InventoryResponseItems" /> - </java-attributes> - </java-type> - - <java-type name="InventoryResponseItems"> - <xml-properties> - <xml-property name="description" value="Container for inventory items in response list" /> - <xml-property name="container" value="response-list" /> - </xml-properties> - <xml-root-element name="inventory-response-items" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v11.InventoryResponseItem" /> - </java-attributes> - </java-type> - - <java-type name="InventoryResponseItem"> - <xml-properties> - <xml-property name="description" value="Inventory item for response list" /> - <xml-property name="container" value="inventory-response-items" /> - </xml-properties> - <xml-root-element name="inventory-response-item" /> - <java-attributes> - <xml-element java-attribute="modelName" name="model-name" type="java.lang.String" /> - <xml-any-element java-attribute="item" /> - <xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.onap.org.v11.ExtraProperties" /> - <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v11.InventoryResponseItems" /> - </java-attributes> - </java-type> - - <java-type name="ExtraProperties"> - <xml-properties> - <xml-property name="description" value="Extra properties for inventory item for response list" /> - </xml-properties> - <xml-root-element name="extra-properties" /> - <java-attributes> - <xml-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v11.ExtraProperty" /> - </java-attributes> - </java-type> - - <java-type name="ExtraProperty"> - <xml-root-element name="extra-property" /> - <java-attributes> - <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" /> - <xml-any-element java-attribute="propertyValue" lax="true" name="property-value" /> - </java-attributes> - </java-type> - - <java-type name="RouteTableReferences"> - <xml-properties> - <xml-property name="description" value="Collection of openstack route table references" /> - </xml-properties> - <xml-root-element name="route-table-references" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v11.RouteTableReference" /> - </java-attributes> - </java-type> - - <java-type name="RouteTableReference"> - <xml-root-element name="route-table-reference" /> - <java-attributes> - <xml-element java-attribute="routeTableReferenceId" name="route-table-reference-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="routeTableReferenceFqdn" name="route-table-reference-fqdn" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="FQDN entry in the route table." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Concurrency value" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - - <xml-properties> - <xml-property name="description" value="Openstack route table reference." /> - <xml-property name="nameProps" value="route-table-reference-fqdn" /> - <xml-property name="uniqueProps" value="route-table-reference-id" /> - <xml-property name="indexedProps" value="route-table-reference-id,route-table-reference-fqdn" /> - <xml-property name="container" value="route-table-references" /> - <xml-property name="namespace" value="network" /> - </xml-properties> - </java-type> - - <java-type name="InstanceGroups"> - <xml-properties> - <xml-property name="description" value="Collection of openstack route table references" /> - </xml-properties> - <xml-root-element name="instance-groups" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v11.InstanceGroup" /> - </java-attributes> - </java-type> - - <java-type name="InstanceGroup"> - <xml-root-element name="instance-group" /> - <java-attributes> - <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Instance Group ID, UUID assigned to this instance." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="description" name="description" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Descriptive text to help identify the usage of this instance-group" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="type" name="type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Only valid value today is lower case ha for high availability" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="subType" name="sub-type" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Valid values for ha type are [geo-activeactive, geo-activestandby, local-activeactive, local-activestandby]" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Concurrency value" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - - <xml-properties> - <xml-property name="description" value="General mechanism for grouping instances" /> - <xml-property name="nameProps" value="description" /> - <xml-property name="uniqueProps" value="id" /> - <xml-property name="indexedProps" value="id,description,type,sub-type" /> - <xml-property name="container" value="instance-groups" /> - <xml-property name="namespace" value="network" /> - </xml-properties> - </java-type> - - - <java-type name="SegmentationAssignments"> - <xml-properties> - <xml-property name="description" value="Collection of openstack segmentation assignments" /> - </xml-properties> - <xml-root-element name="segmentation-assignments" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v11.SegmentationAssignment" /> - </java-attributes> - </java-type> - - <java-type name="SegmentationAssignment"> - <xml-root-element name="segmentation-assignment" /> - <java-attributes> - <xml-element java-attribute="segmentationId" name="segmentation-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Concurrency value" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Openstack segmentation assignment." /> - <xml-property name="indexedProps" value="segmentation-id" /> - <xml-property name="dependentOn" value="l3-network" /> - <xml-property name="container" value="segmentation-assignments" /> - </xml-properties> - </java-type> - - <java-type name="AllottedResources"> - <xml-properties> - <xml-property name="description" value="This object is used to store slices of services being offered" /> - </xml-properties> - <xml-root-element name="allotted-resources" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v11.AllottedResource" /> - </java-attributes> - </java-type> - - <java-type name="AllottedResource"> - <xml-root-element name="allotted-resource" /> - <java-attributes> - <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Allotted Resource id UUID assigned to this instance." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="description" name="description" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The descriptive information assigned to this allotted resource instance" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Link back to more information in the controller" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC model id for this resource or service model." /> - <xml-property name="visibility" value="deployment" /> - <xml-property name="dbAlias" value="model-invariant-id-local" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC model version for this resource or service model." /> - <xml-property name="visibility" value="deployment" /> - <xml-property name="dbAlias" value="model-version-id-local" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="the ASDC model version for this resource or service model." /> - <xml-property name="visibility" value="internal" /> - <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Concurrency value" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Orchestration status" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Indicator for whether the resource is considered operational" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="type" name="type" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Generic description of the type of allotted resource." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="role" name="role" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="role in the network that this resource will be providing." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v11.TunnelXconnects" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - - <xml-properties> - <xml-property name="description" value="Represents a slice or partial piece of a resource that gets separately allotted" /> - <xml-property name="nameProps" value="description" /> - <xml-property name="uniqueProps" value="id" /> - <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id,type,role" /> - <xml-property name="dependentOn" value="service-instance" /> - <xml-property name="container" value="allotted-resources" /> - <!-- <xml-property name="namespace" value="network" /> --> - </xml-properties> - </java-type> - - <java-type name="TunnelXconnects"> - <xml-properties> - <xml-property name="description" value="This object is used to store the specific tunnel cross connect aspects of an allotted resource" /> - </xml-properties> - <xml-root-element name="tunnel-xconnects" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v11.TunnelXconnect" /> - </java-attributes> - </java-type> - - <java-type name="TunnelXconnect"> - <xml-root-element name="tunnel-xconnect" /> - <java-attributes> - <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Allotted Resource id UUID assigned to this instance." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The WAN uplink bandwidth for WAN1" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The WAN downlink bandwidth for WAN1" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The WAN uplink bandwidth for WAN2" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="The WAN downlink bandwidth for WAN2" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Concurrency value" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - - <xml-properties> - <xml-property name="description" value="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted" /> - <xml-property name="uniqueProps" value="id" /> - <xml-property name="indexedProps" value="id" /> - <xml-property name="dependentOn" value="allotted-resource" /> - <xml-property name="container" value="tunnel-xconnects" /> - <!-- <xml-property name="namespace" value="network" /> --> - </xml-properties> - </java-type> - - <java-type name="Entitlements"> - <xml-properties> - <xml-property name="description" value="Entitlements, keyed by group-uuid and resource-uuid, related to license management" /> - </xml-properties> - <xml-root-element name="entitlements" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v11.Entitlement" /> - </java-attributes> - </java-type> - - <java-type name="Entitlement"> - <xml-root-element name="entitlement" /> - <java-attributes> - <xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique ID for the entitlement group the resource comes from, should be uuid." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique ID of an entitlement resource. " /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Concurrency value" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Metadata for entitlement group." /> - <xml-property name="indexedProps" value="group-uuid,resource-uuid" /> - <xml-property name="dependentOn" value="generic-vnf,vce,vpe" /> - <xml-property name="container" value="entitlements" /> - </xml-properties> - </java-type> - - - <java-type name="Licenses"> - <xml-properties> - <xml-property name="description" value="Licenses to be allocated across resources, keyed by group-uuid and resource-uuid, related to license management" /> - </xml-properties> - <xml-root-element name="licenses" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v11.License" /> - </java-attributes> - </java-type> - - <java-type name="License"> - <xml-root-element name="license" /> - <java-attributes> - <xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique ID for the license group the resource belongs to, should be uuid." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique ID of a license resource. " /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Concurrency value" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Metadata for license group." /> - <xml-property name="indexedProps" value="group-uuid,resource-uuid" /> - <xml-property name="dependentOn" value="generic-vnf,vce,vpe" /> - <xml-property name="container" value="licenses" /> - </xml-properties> - </java-type> - - <java-type name="Vnf"> - <xml-root-element name="vnf"/> - <java-attributes> - <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Unique id of VNF. This is unique across the graph." /> - </xml-properties> - </xml-element> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Abstract vnf class" /> - <xml-property name="indexedProps" value="vnf-id" /> - <xml-property name="uniqueProps" value="vnf-id" /> - <xml-property name="inheritors" value="vce,vpe,generic-vnf" /> - <xml-property name="abstract" value="true" /> - </xml-properties> - </java-type> - - <java-type name="Zones"> - <xml-properties> - <xml-property name="description" value="Collection of zones" /> - </xml-properties> - <xml-root-element name="zones" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.onap.org.v11.Zone" /> - </java-attributes> - </java-type> - - <java-type name="Zone"> - <xml-root-element name="zone" /> - <java-attributes> - <xml-element java-attribute="zoneId" name="zone-id" required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" value="Code assigned by AIC to the zone" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="zoneName" name="zone-name" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="English name associated with the zone" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Design of zone [Medium/Large?]" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Context of zone [production/test]" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="status" name="status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Status of a zone." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Concurrency value" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - </java-attributes> - <xml-properties> - <xml-property name="description" value="A zone is a grouping of assets in a location homing to the same connections into the CBB" /> - <xml-property name="nameProps" value="zone-name" /> - <xml-property name="indexedProps" value="zone-id,design-type,zone-context" /> - <xml-property name="uniqueProps" value="zone-id" /> - <xml-property name="container" value="zones" /> - <xml-property name="namespace" value="network" /> - </xml-properties> - </java-type> - <java-type name="TestObjects"> - <xml-properties> - <xml-property name="description" value="Collection of VNFs" /> - </xml-properties> - <xml-root-element name="test-objects" /> - <java-attributes> - <xml-element container-type="java.util.ArrayList" - java-attribute="testObject" name="test-object" - type="inventory.aai.onap.org.v11.TestObject" /> - </java-attributes> - <xml-properties> - <xml-property name="maximumDepth" value="0" /> - </xml-properties> - </java-type> - <java-type name="TestObject"> - <xml-root-element name="test-object" /> - <java-attributes> - <xml-element java-attribute="vnfId" name="vnf-id" - required="true" type="java.lang.String" xml-key="true"> - <xml-properties> - <xml-property name="description" - value="Unique id of VNF. This is unique across the graph." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfName" name="vnf-name" - required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of VNF." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfName2" name="vnf-name2" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Alternate name of VNF." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vnfType" name="vnf-type" - required="true" type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="String capturing type of vnf, that was intended to identify the ASDC resource. This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="serviceId" name="service-id" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="Unique identifier of service, does not necessarily map to ASDC service models. SOON TO BE DEPRECATED" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="Regional way of organizing pservers, source of truth should define values" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="provStatus" name="prov-status" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="Trigger for operational monitoring of this resource by Service Assurance systems." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="operationalState" name="operational-state" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="Indicator for whether the resource is considered operational. Valid values are in-service-path and out-of-service-path." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="licenseKey" name="license-key" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="OBSOLETE - do not use" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="equipmentRole" name="equipment-role" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="Client should send valid enumerated value" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="orchestrationStatus" name="orchestration-status" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="Orchestration status of this VNF, used by MSO." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="heatStackId" name="heat-stack-id" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="Heat stack id corresponding to this instance, managed by MSO" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="Corresponds to the SDN-C catalog id used to configure this VCE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="managementOption" name="management-option" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="identifier of managed by ATT or customer" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by generic-vnf." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="v4 Loopback0 address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="nmLanV6Address" name="nm-lan-v6-address" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="v6 Loopback address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="managementV6Address" name="management-v6-address" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="v6 management address" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vcpu" name="vcpu" type="java.lang.Long"> - <xml-properties> - <xml-property name="description" - value="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vcpuUnits" name="vcpu-units" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="units associated with vcpu, used for VNFs with no vservers/flavors, to be used only by uCPE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vmemory" name="vmemory" - type="java.lang.Long"> - <xml-properties> - <xml-property name="description" - value="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vmemoryUnits" name="vmemory-units" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="units associated with vmemory, used for VNFs with no vservers/flavors, to be used only by uCPE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vdisk" name="vdisk" - type="java.lang.Long"> - <xml-properties> - <xml-property name="description" - value="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only uCPE" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="vdiskUnits" name="vdisk-units" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only by uCPE" /> - </xml-properties> - </xml-element> - <xml-element default-value="false" required="true" - java-attribute="inMaint" name="in-maint" type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false" /> - <xml-property name="description" - value="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." /> - </xml-properties> - </xml-element> - <xml-element default-value="false" required="true" - java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" - type="java.lang.Boolean"> - <xml-properties> - <xml-property name="defaultValue" value="false" /> - <xml-property name="description" - value="used to indicate whether closed loop function is enabled on this node" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="resourceVersion" name="resource-version" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="Used for optimistic concurrency. Must be empty on create, valid on update and delete." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="summaryStatus" name="summary-status" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="details regarding the generic-vnf operation, PLEASE DISCONTINUE USE OF THIS FIELD." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="encryptedAccessFlag" name="encrypted-access-flag" - type="java.lang.Boolean"> - <xml-properties> - <xml-property name="description" - value="indicates whether generic-vnf access uses SSH" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="entitlementAssignmentGroupUuid" - name="entitlement-assignment-group-uuid" type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="UUID of the Entitlement group used for licensing VNFs, OBSOLETE - See child relationships." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="entitlementResourceUuid" - name="entitlement-resource-uuid" type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="UUID of the specific entitlement resource. OBSOLETE - See child relationships." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="licenseAssignmentGroupUuid" - name="license-assignment-group-uuid" type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="UUID of the license assignment group. OBSOLETE - See child relationships." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="licenseKeyUuid" name="license-key-uuid" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="UUID of the actual license resource. OBSOLETE - See child relationships." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelInvariantId" name="model-invariant-id" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="the ASDC model id for this resource or service model." /> - <xml-property name="visibility" value="deployment" /> - <xml-property name="dbAlias" value="model-invariant-id-local" /> - <xml-property name="requires" value="model-version-id" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelVersionId" name="model-version-id" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="the ASDC model version for this resource or service model." /> - <xml-property name="visibility" value="deployment" /> - <xml-property name="dbAlias" value="model-version-id-local" /> - <xml-property name="requires" value="model-invariant-id" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="personaModelVer" name="persona-model-ver" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="the ASDC model version for this resource or service model." /> - <xml-property name="visibility" value="internal" /> - <xml-property name="dataCopy" - value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="notVisibleTestElement" - name="not-visible-test-element" type="java.lang.String"> - <xml-properties> - <xml-property name="visibility" value="internal" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="modelCustomizationId" name="model-customization-id" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="captures the id of all the configuration used to customize the resource for the service." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="widgetModelId" name="widget-model-id" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="the ASDC data dictionary widget model. This maps directly to the A&AI widget." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="widgetModelVersion" name="widget-model-version" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="asNumber" name="as-number" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="as-number of the VNF" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="regionalResourceSubzone" - name="regional-resource-subzone" type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="represents sub zone of the rr plane" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="nfType" name="nf-type" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="Generic description of the type of NF" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="nfFunction" name="nf-function" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="English description of Network function that the specific VNF deployment is providing" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="nfRole" name="nf-role" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="role in the network that this model will be providing" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="nfNamingCode" name="nf-naming-code" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" - value="string assigned to this model used for naming purposes" /> - </xml-properties> - </xml-element> - <xml-element java-attribute="selflink" name="selflink" - type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Path to the controller object." /> - </xml-properties> - </xml-element> - <xml-element java-attribute="testObjects" name="test-objects" type="inventory.aai.onap.org.v11.TestObjects" /> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" /> - - </java-attributes> - <xml-properties> - <xml-property name="description" value="General purpose VNF" /> - <xml-property name="nameProps" value="vnf-name" /> - <xml-property name="indexedProps" - value="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,nf-type,nf-function,nf-naming-code,nf-role" /> - <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" /> - <xml-property name="uniqueProps" value="vnf-id" /> - <xml-property name="container" value="test-objects" /> - <xml-property name="namespace" value="network" /> - <xml-property name="extends" value="vnf" /> - </xml-properties> - </java-type> - </java-types> -</xml-bindings> diff --git a/aai-schema/.gitignore b/aai-schema/.gitignore index ae3c1726..2f30844c 100644 --- a/aai-schema/.gitignore +++ b/aai-schema/.gitignore @@ -1 +1,2 @@ /bin/ +/.checkstyle @@ -11,7 +11,7 @@ <artifactId>aai-common</artifactId> <version>1.1.0-SNAPSHOT</version> <packaging>pom</packaging> - <name>AAI - aai-common</name> + <name>aai-aai-common</name> <description>Contains all of the common code for resources and traversal repos</description> <modules> |