From 93b15d3d4364095dbc552751d70e116e615b99f4 Mon Sep 17 00:00:00 2001 From: "Lamont, William (wl2432)" Date: Thu, 7 Dec 2017 16:54:44 -0500 Subject: checking in tenant isolation oxm changes Issue-ID: AAI-554 Change-Id: I83bb7ba532e3ef44850669b430673fc904d60af0 Signed-off-by: Lamont, William (wl2432) --- .../main/resources/aai_schema/aai_schema_v12.xsd | 197 +++++++++++---------- aai-schema/src/main/resources/oxm/aai_oxm_v12.xml | 27 +-- 2 files changed, 123 insertions(+), 101 deletions(-) (limited to 'aai-schema') diff --git a/aai-schema/src/main/resources/aai_schema/aai_schema_v12.xsd b/aai-schema/src/main/resources/aai_schema/aai_schema_v12.xsd index 7ea13201..5748c329 100644 --- a/aai-schema/src/main/resources/aai_schema/aai_schema_v12.xsd +++ b/aai-schema/src/main/resources/aai_schema/aai_schema_v12.xsd @@ -2065,13 +2065,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - @org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details.") - - - @@ -2107,6 +2100,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + @org.onap.aai.annotations.Metadata(description="Node URL in CANOPI/MINT.") + + + @@ -2270,6 +2270,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + @org.onap.aai.annotations.Metadata(description="Node URL in CANOPI/MINT.") + + + @@ -2508,6 +2515,79 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + + @org.onap.aai.annotations.Metadata(description="It is a logical partition of the cloud which allows to have multiple environments in the production AIC.",indexedProps="operational-environment-id",nameProps="operational-environment-name",uniqueProps="operational-environment-id",container="operational-environments",namespace="cloud-infrastructure") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="UUID of an operational environment") + + + + + + + @org.onap.aai.annotations.Metadata(description="Operational Environment name") + + + + + + + @org.onap.aai.annotations.Metadata(description="Operational Environment Type.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Status") + + + + + + + @org.onap.aai.annotations.Metadata(description="Tenant Context.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Workload Context.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="a logical partition of the cloud which allows to have multiple environments in the production AIC.") + + + + + + + @@ -2521,6 +2601,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + @@ -3888,7 +3969,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version",uniqueProps="model-version-id",container="model-vers") + @org.onap.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models",nameProps="model-name",indexedProps="model-version-id,model-name,model-version,distribution-status",uniqueProps="model-version-id",container="model-vers") @@ -3913,6 +3994,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + @org.onap.aai.annotations.Metadata(description="Distribution Status") + + + @@ -6498,24 +6586,24 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + - @org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details.") + @org.onap.aai.annotations.Metadata(description="source of name2") - + - @org.onap.aai.annotations.Metadata(description="source of name2") + @org.onap.aai.annotations.Metadata(description="id of pnf") - + - @org.onap.aai.annotations.Metadata(description="id of pnf") + @org.onap.aai.annotations.Metadata(description="Node URL in CANOPI/MINT.") @@ -7191,17 +7279,17 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + - @org.onap.aai.annotations.Metadata(isKey=true,description="UUID assigned to configuration.") + @org.onap.aai.annotations.Metadata(description="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well.") - + - @org.onap.aai.annotations.Metadata(description="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well.") + @org.onap.aai.annotations.Metadata(isKey=true,description="UUID assigned to configuration.") @@ -7724,77 +7812,4 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - - @org.onap.aai.annotations.Metadata(description="It is a logical partition of the cloud which allows to have multiple environments in the production AIC.",indexedProps="operational-environment-id",uniqueProps="operational-environment-id",container="operational-environments",namespace="cloud-infrastructure") - - - - - - - @org.onap.aai.annotations.Metadata(isKey=true,description="UUID of an operational environment") - - - - - - - @org.onap.aai.annotations.Metadata(description="Operational Environment name") - - - - - - - @org.onap.aai.annotations.Metadata(description="Operational Environment Type.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Status") - - - - - - - @org.onap.aai.annotations.Metadata(description="Tenant Context.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Workload Context.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="a logical partition of the cloud which allows to have multiple environments in the production AIC.") - - - - - - - diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml index 07cec834..13363c50 100644 --- a/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml +++ b/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml @@ -501,6 +501,7 @@ + @@ -1787,6 +1788,11 @@ + + + + + @@ -1950,11 +1956,6 @@ - - - - - @@ -2893,14 +2894,14 @@ - + - + - + - + @@ -5218,7 +5219,7 @@ - + @@ -5238,6 +5239,11 @@ + + + + + @@ -6424,6 +6430,7 @@ + -- cgit 1.2.3-korg