summaryrefslogtreecommitdiffstats
path: root/aai-core/src
diff options
context:
space:
mode:
Diffstat (limited to 'aai-core/src')
-rw-r--r--aai-core/src/main/java/org/openecomp/aai/dbgen/SchemaGenerator.java22
-rw-r--r--aai-core/src/main/java/org/openecomp/aai/util/StoreNotificationEvent.java2
-rw-r--r--aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIToDBKeyTest.java52
-rw-r--r--aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIToExtensionInformationTest.java105
-rw-r--r--aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml2
-rw-r--r--aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v11.xml58
-rw-r--r--aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v9.xml2
-rw-r--r--aai-core/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v10.xml2
-rw-r--r--aai-core/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v11.xml58
9 files changed, 16 insertions, 287 deletions
diff --git a/aai-core/src/main/java/org/openecomp/aai/dbgen/SchemaGenerator.java b/aai-core/src/main/java/org/openecomp/aai/dbgen/SchemaGenerator.java
index c3f55cdd..9f85d029 100644
--- a/aai-core/src/main/java/org/openecomp/aai/dbgen/SchemaGenerator.java
+++ b/aai-core/src/main/java/org/openecomp/aai/dbgen/SchemaGenerator.java
@@ -186,28 +186,6 @@ public class SchemaGenerator{
LOGGER.info(imsg);
graphMgmt.commit();
- if (addDefaultCR) {
- if (!graph.traversal().V().has("cloud-owner", "att-aic").has("cloud-region-id", "AAIAIC25").hasNext()) {
- imsg = "Adding default cloud region to graph...";
- System.out.println(imsg);
- LOGGER.info(imsg);
- final Vertex cloudRegion = graph.addVertex();
-
- final String ts = String.valueOf(System.currentTimeMillis() / 1000L);
-
- cloudRegion.property("aai-node-type", "cloud-region");
- cloudRegion.property("cloud-owner", "att-aic");
- cloudRegion.property("cloud-region-id", "AAIAIC25");
- cloudRegion.property("cloud-region-version", "2.5");
- cloudRegion.property("complex-name", "AAIAIC25");
- cloudRegion.property("aai-created-ts", ts);
- cloudRegion.property("resource-version", ts);
- cloudRegion.property("source-of-truth", "aai-schema-loader");
- cloudRegion.property("last-mod-source-of-truth", "aai-schema-loader");
- cloudRegion.property(AAIProperties.AAI_URI, "/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25");
- graph.tx().commit();
- }
- }
}// End of loadSchemaIntoTitan()
}
diff --git a/aai-core/src/main/java/org/openecomp/aai/util/StoreNotificationEvent.java b/aai-core/src/main/java/org/openecomp/aai/util/StoreNotificationEvent.java
index 2d47d38a..29fa69dc 100644
--- a/aai-core/src/main/java/org/openecomp/aai/util/StoreNotificationEvent.java
+++ b/aai-core/src/main/java/org/openecomp/aai/util/StoreNotificationEvent.java
@@ -147,7 +147,7 @@ public class StoreNotificationEvent {
throw new AAIException("AAI_7350");
}
- DynamicEntity notificationEvent = notificationJaxbContext.getDynamicType("inventory.aai.att.com." + notificationVersion + ".NotificationEvent").newDynamicEntity();
+ DynamicEntity notificationEvent = notificationJaxbContext.getDynamicType("inventory.aai.onap.org." + notificationVersion + ".NotificationEvent").newDynamicEntity();
if (eventHeader.get("id") == null) {
eventHeader.set("id", genDate2() + "-" + UUID.randomUUID().toString());
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 59c5dd40..5ba47119 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
@@ -62,47 +62,6 @@ public class URIToDBKeyTest {
System.setProperty("AJSC_HOME", ".");
System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local");
}
-
- /**
- * 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
- */
- @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.
@@ -148,17 +107,6 @@ 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
deleted file mode 100644
index 4250fc88..00000000
--- a/aai-core/src/test/java/org/openecomp/aai/parsers/uri/URIToExtensionInformationTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * org.openecomp.aai
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.aai.parsers.uri;
-
-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.Test;
-
-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;
-
-@Ignore
-public class URIToExtensionInformationTest {
-
- private Loader v8Loader = LoaderFactory.createLoaderForVersion(ModelType.MOXY, Version.v8);
-
- /**
- * Configure.
- */
- @BeforeClass
- public static void configure() {
- System.setProperty("AJSC_HOME", ".");
- System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local");
- }
-
- /**
- * 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/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml
index ba6bb24a..568b2ad3 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
@@ -399,7 +399,7 @@
<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.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. In AT&amp;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&amp;T's AIC." />
+ <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" />
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 5bff420e..1c49cf18 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,7 +30,6 @@
<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" />
@@ -255,7 +254,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, e.g., att-aic. First part of composite key should be formatted as vendor-cloudname" />
+ <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">
@@ -310,7 +309,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. In AT&amp;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&amp;T's AIC." />
+ <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" />
@@ -1864,51 +1863,6 @@
</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" />
@@ -2206,7 +2160,7 @@
<java-type name="VnfImage">
<xml-root-element name="vnf-image" />
<java-attributes>
- <xml-element java-attribute="attUuid" name="att-uuid" required="true" type="java.lang.String" xml-key="true">
+ <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>
@@ -2240,8 +2194,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,att-uuid,application-vendor,application-version" />
- <xml-property name="uniqueProps" value="att-uuid" />
+ <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>
@@ -2392,7 +2346,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 (should be att-ip-version)" />
+ <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">
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 bbe5a8fe..22c0d4ae 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
@@ -307,7 +307,7 @@
<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.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. In AT&amp;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&amp;T's AIC." />
+ <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" />
diff --git a/aai-core/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v10.xml b/aai-core/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v10.xml
index 712e7cae..728e4b43 100644
--- a/aai-core/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v10.xml
+++ b/aai-core/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v10.xml
@@ -307,7 +307,7 @@
<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.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. In AT&amp;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&amp;T's AIC." />
+ <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" />
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
index e0b47a07..a4899974 100644
--- 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
@@ -30,7 +30,6 @@
<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" />
@@ -255,7 +254,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, e.g., att-aic. First part of composite key should be formatted as vendor-cloudname" />
+ <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">
@@ -310,7 +309,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. In AT&amp;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&amp;T's AIC." />
+ <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" />
@@ -1895,51 +1894,6 @@
</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" />
@@ -2259,7 +2213,7 @@
<java-type name="VnfImage">
<xml-root-element name="vnf-image" />
<java-attributes>
- <xml-element java-attribute="attUuid" name="att-uuid" required="true" type="java.lang.String" xml-key="true">
+ <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>
@@ -2293,8 +2247,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,att-uuid,application-vendor,application-version" />
- <xml-property name="uniqueProps" value="att-uuid" />
+ <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>
@@ -2451,7 +2405,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 (should be att-ip-version)" />
+ <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">