diff options
| -rw-r--r-- | aai-core/src/main/java/org/openecomp/aai/dbgen/DataGrooming.java | 2 | ||||
| -rw-r--r-- | aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd | 183 | ||||
| -rw-r--r-- | aai-schema/src/main/resources/oxm/aai_oxm_v11.xml | 11 | ||||
| -rw-r--r-- | pom.xml | 34 |
4 files changed, 133 insertions, 97 deletions
diff --git a/aai-core/src/main/java/org/openecomp/aai/dbgen/DataGrooming.java b/aai-core/src/main/java/org/openecomp/aai/dbgen/DataGrooming.java index 8dca75c5..f2d6a4b8 100644 --- a/aai-core/src/main/java/org/openecomp/aai/dbgen/DataGrooming.java +++ b/aai-core/src/main/java/org/openecomp/aai/dbgen/DataGrooming.java @@ -938,7 +938,7 @@ public class DataGrooming { if( (ghost2 != null) && ghost2FixOn ){ ghost2.remove(); } - else { + else if (vOut != null) { vOut.remove(); } if (singleCommits) { diff --git a/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd b/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd index aa7dd9f4..f137cd31 100644 --- a/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd +++ b/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd @@ -7114,93 +7114,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="network"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace for network inventory resources.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element ref="tns:logical-links" minOccurs="0"/> - <xs:element ref="tns:site-pair-sets" minOccurs="0"/> - <xs:element ref="tns:vpn-bindings" minOccurs="0"/> - <xs:element ref="tns:vpls-pes" minOccurs="0"/> - <xs:element ref="tns:multicast-configurations" minOccurs="0"/> - <xs:element ref="tns:vces" minOccurs="0"/> - <xs:element ref="tns:vnfcs" minOccurs="0"/> - <xs:element ref="tns:l3-networks" minOccurs="0"/> - <xs:element ref="tns:network-policies" minOccurs="0"/> - <xs:element ref="tns:generic-vnfs" minOccurs="0"/> - <xs:element ref="tns:lag-links" minOccurs="0"/> - <xs:element ref="tns:newvces" minOccurs="0"/> - <xs:element ref="tns:pnfs" minOccurs="0"/> - <xs:element ref="tns:physical-links" minOccurs="0"/> - <xs:element ref="tns:ipsec-configurations" minOccurs="0"/> - <xs:element ref="tns:route-table-references" minOccurs="0"/> - <xs:element ref="tns:instance-groups" minOccurs="0"/> - <xs:element ref="tns:zones" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="reserved-prop-names"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element name="last-mod-source-of-truth" type="xs:string" minOccurs="0"/> - <xs:element name="aai-node-type" type="xs:string" minOccurs="0"/> - <xs:element name="aai-created-ts" type="xs:unsignedInt" minOccurs="0"/> - <xs:element name="aai-unique-key" type="xs:string" minOccurs="0"/> - <xs:element name="aai-last-mod-ts" type="xs:unsignedInt" minOccurs="0"/> - <xs:element name="source-of-truth" type="xs:string" minOccurs="0"/> - <xs:element name="aai-uri" type="xs:string" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="edge-prop-names"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Internal map to define the properties of an edge and interpret the map EdgeRules",edgeInfo="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element name="edgeLabel" type="xs:string" minOccurs="0"/> - <xs:element name="direction" type="xs:string" minOccurs="0"/> - <xs:element name="multiplicityRule" type="xs:string" minOccurs="0"/> - <xs:element name="contains-other-v" type="xs:string" minOccurs="0"/> - <xs:element name="delete-other-v" type="xs:string" minOccurs="0"/> - <xs:element name="SVC-INFRA" type="xs:string" minOccurs="0"/> - <xs:element name="prevent-delete" type="xs:string" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="aai-internal"> - <xs:complexType> - <xs:sequence> - <xs:element ref="tns:reserved-prop-names" minOccurs="0" maxOccurs="unbounded"/> - <xs:element ref="tns:edge-prop-names" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="inventory"> - <xs:complexType> - <xs:sequence> - <xs:element ref="tns:search" minOccurs="0"/> - <xs:element ref="tns:actions" minOccurs="0"/> - <xs:element ref="tns:cloud-infrastructure" minOccurs="0"/> - <xs:element ref="tns:external-system" minOccurs="0"/> - <xs:element ref="tns:business" minOccurs="0"/> - <xs:element ref="tns:service-design-and-creation" minOccurs="0"/> - <xs:element ref="tns:network" minOccurs="0"/> - <xs:element ref="tns:aai-internal" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> <xs:element name="configuration"> <xs:complexType> <xs:annotation> @@ -7209,17 +7122,17 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> <xs:sequence> - <xs:element name="management-option" type="xs:string" minOccurs="0"> + <xs:element name="configuration-id" type="xs:string"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well.")</annox:annotate> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID assigned to configuration.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="configuration-id" type="xs:string"> + <xs:element name="management-option" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID assigned to configuration.")</annox:annotate> + <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> @@ -7310,6 +7223,94 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="network"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace for network inventory resources.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element ref="tns:logical-links" minOccurs="0"/> + <xs:element ref="tns:site-pair-sets" minOccurs="0"/> + <xs:element ref="tns:vpn-bindings" minOccurs="0"/> + <xs:element ref="tns:vpls-pes" minOccurs="0"/> + <xs:element ref="tns:multicast-configurations" minOccurs="0"/> + <xs:element ref="tns:vces" minOccurs="0"/> + <xs:element ref="tns:vnfcs" minOccurs="0"/> + <xs:element ref="tns:l3-networks" minOccurs="0"/> + <xs:element ref="tns:network-policies" minOccurs="0"/> + <xs:element ref="tns:generic-vnfs" minOccurs="0"/> + <xs:element ref="tns:lag-links" minOccurs="0"/> + <xs:element ref="tns:newvces" minOccurs="0"/> + <xs:element ref="tns:pnfs" minOccurs="0"/> + <xs:element ref="tns:physical-links" minOccurs="0"/> + <xs:element ref="tns:ipsec-configurations" minOccurs="0"/> + <xs:element ref="tns:route-table-references" minOccurs="0"/> + <xs:element ref="tns:instance-groups" minOccurs="0"/> + <xs:element ref="tns:zones" minOccurs="0"/> + <xs:element ref="tns:configurations" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="reserved-prop-names"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element name="last-mod-source-of-truth" type="xs:string" minOccurs="0"/> + <xs:element name="aai-node-type" type="xs:string" minOccurs="0"/> + <xs:element name="aai-created-ts" type="xs:unsignedInt" minOccurs="0"/> + <xs:element name="aai-unique-key" type="xs:string" minOccurs="0"/> + <xs:element name="aai-last-mod-ts" type="xs:unsignedInt" minOccurs="0"/> + <xs:element name="source-of-truth" type="xs:string" minOccurs="0"/> + <xs:element name="aai-uri" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="edge-prop-names"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Internal map to define the properties of an edge and interpret the map EdgeRules",edgeInfo="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element name="edgeLabel" type="xs:string" minOccurs="0"/> + <xs:element name="direction" type="xs:string" minOccurs="0"/> + <xs:element name="multiplicityRule" type="xs:string" minOccurs="0"/> + <xs:element name="contains-other-v" type="xs:string" minOccurs="0"/> + <xs:element name="delete-other-v" type="xs:string" minOccurs="0"/> + <xs:element name="SVC-INFRA" type="xs:string" minOccurs="0"/> + <xs:element name="prevent-delete" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="aai-internal"> + <xs:complexType> + <xs:sequence> + <xs:element ref="tns:reserved-prop-names" minOccurs="0" maxOccurs="unbounded"/> + <xs:element ref="tns:edge-prop-names" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="inventory"> + <xs:complexType> + <xs:sequence> + <xs:element ref="tns:search" minOccurs="0"/> + <xs:element ref="tns:actions" minOccurs="0"/> + <xs:element ref="tns:cloud-infrastructure" minOccurs="0"/> + <xs:element ref="tns:external-system" minOccurs="0"/> + <xs:element ref="tns:business" minOccurs="0"/> + <xs:element ref="tns:service-design-and-creation" minOccurs="0"/> + <xs:element ref="tns:network" minOccurs="0"/> + <xs:element ref="tns:aai-internal" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> <xs:element name="notification-event-header"> <xs:complexType> <xs:sequence> diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml index ecf163e0..640ceed1 100644 --- a/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml +++ b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml @@ -2866,6 +2866,7 @@ <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="configurations" name="configurations" type="inventory.aai.onap.org.v11.Configurations" /> </java-attributes> </java-type> <java-type name="Configurations"> @@ -2881,16 +2882,16 @@ <java-type name="Configuration"> <xml-root-element name="configuration" /> <java-attributes> - <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well." /> - </xml-properties> - </xml-element> <xml-element java-attribute="configurationId" name="configuration-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="UUID assigned to configuration." /> </xml-properties> </xml-element> + <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well." /> + </xml-properties> + </xml-element> <xml-element java-attribute="configurationName" name="configuration-name" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Name of the configuration." /> @@ -70,6 +70,30 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> <version>3.6</version> + <configuration> + <reportPlugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>2.4</version> + <configuration> + <dependencyDetailsEnabled>false</dependencyDetailsEnabled> + <dependencyLocationsEnabled>false</dependencyLocationsEnabled> + </configuration> + <reports> + <report>dependencies</report> + </reports> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.8</version> + <configuration> + <additionalparam>-Xdoclint:none</additionalparam> + </configuration> + </plugin> + </reportPlugins> + </configuration> <dependencies> <dependency> <groupId>org.apache.maven.wagon</groupId> @@ -82,6 +106,16 @@ </build> <distributionManagement> + <repository> + <id>ecomp-releases</id> + <name>ECOMP Release Repository</name> + <url>${onap.nexus.url}/content/repositories/releases/</url> + </repository> + <snapshotRepository> + <id>ecomp-snapshots</id> + <name>ECOMP Snapshot Repository</name> + <url>${onap.nexus.url}/content/repositories/snapshots/</url> + </snapshotRepository> <site> <id>ecomp-site</id> <url>dav:${onap.nexus.url}${sitePath}</url> |