aboutsummaryrefslogtreecommitdiffstats
path: root/aai-service/provider/src/main/java/org
diff options
context:
space:
mode:
Diffstat (limited to 'aai-service/provider/src/main/java/org')
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/AaiInternal.java135
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Action.java130
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ActionData.java123
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Actions.java120
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/AvailabilityZone.java207
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/AvailabilityZones.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Business.java93
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CloudInfrastructure.java122
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CloudRegion.java539
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CloudRegions.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ConstrainedElementSet.java235
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ConstrainedElementSets.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CtagAssignment.java145
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CtagAssignments.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Customer.java235
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Customers.java100
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/EdgePropNames.java285
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ElementChoiceSet.java234
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ElementChoiceSets.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ExtraProperties.java65
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ExtraProperty.java95
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Flavor.java403
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Flavors.java100
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GenericVnf.java1284
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GenericVnfs.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GroupAssignment.java235
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GroupAssignments.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Image.java401
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Images.java100
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/IncludeNodeFilter.java95
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InstanceFilter.java65
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InstanceFilters.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Inventory.java259
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryItem.java191
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryItemData.java123
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryResponseItem.java151
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryResponseItems.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/KeyData.java123
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3InterfaceIpv4AddressList.java323
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3InterfaceIpv6AddressList.java323
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3Network.java764
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3Networks.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LInterface.java440
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LInterfaces.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LagInterface.java235
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LagInterfaces.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LogicalLink.java515
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LogicalLinks.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Metadata.java100
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Metadatum.java151
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Model.java346
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelAndNamedQuerySearch.java151
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelConstraint.java151
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelConstraints.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelElement.java365
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelElements.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Models.java100
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQueries.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQuery.java364
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQueryElement.java326
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQueryElements.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Network.java233
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NotificationEvent.java123
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NotificationEventHeader.java424
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Notify.java213
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ObjectFactory.java1036
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PInterface.java347
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PInterfaces.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PhysicalLink.java319
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PhysicalLinks.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pnf.java535
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pnfs.java100
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Properties.java123
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PropertyConstraint.java207
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PropertyConstraints.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pserver.java645
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pservers.java100
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/QueryParameters.java122
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelatedLookup.java298
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelatedLookups.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelatedToProperty.java123
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Relationship.java191
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelationshipData.java123
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelationshipList.java100
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ReservedPropNames.java238
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ResponseList.java95
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ResultData.java123
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Search.java95
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SearchResults.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SecondaryFilter.java151
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SegmentationAssignment.java151
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SegmentationAssignments.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Service.java235
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceDesignAndCreation.java149
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceInstance.java542
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceInstances.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceSubscription.java207
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceSubscriptions.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Services.java100
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Snapshot.java402
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Snapshots.java100
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/StartNodeFilter.java123
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Subnet.java423
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Subnets.java100
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/TaggedInventoryItemList.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Tenant.java206
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Tenants.java100
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Update.java190
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/UpdateNodeKey.java123
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VfModule.java395
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VfModules.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vlan.java418
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vlans.java100
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vnfc.java359
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vnfcs.java100
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Volume.java179
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VolumeGroup.java263
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VolumeGroups.java102
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Volumes.java100
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vserver.java358
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vservers.java100
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/package-info.java30
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIClient.java12
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIDeclarations.java56
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIRequest.java4
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIService.java32
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIServiceActivator.java11
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/CloudRegionRequest.java38
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericQueryRequest.java26
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericRequest.java4
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericVnfRequest.java24
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv4AddressListRequest.java61
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv6AddressListRequest.java57
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LInterfaceRequest.java65
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LagInterfacePnfRequest.java52
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NamedQueryRequest.java76
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NodesQueryRequest.java26
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfacePnfRequest.java52
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfaceRequest.java18
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PServerRequest.java116
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PhysicalLinkRequest.java14
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PnfRequest.java117
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/RelationshipRequest.java22
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SelfLinkRequest.java12
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/ServiceRequest.java109
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SubInterfaceRequest.java48
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SubnetRequest.java116
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/TenantRequest.java145
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VLanRequest.java137
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VServerVLanRequest.java147
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VserverRequest.java156
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/SubInterface.java4
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/InstanceFilter.java40
-rw-r--r--aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/NamedQueryData.java1
154 files changed, 466 insertions, 26852 deletions
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/AaiInternal.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/AaiInternal.java
deleted file mode 100644
index 2a21b6b..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/AaiInternal.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}reserved-prop-names" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}edge-prop-names" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "reservedPropNames",
- "edgePropNames"
-})
-@XmlRootElement(name = "aai-internal")
-public class AaiInternal
- implements AAIDatum
-{
-
- @XmlElement(name = "reserved-prop-names")
- protected List<ReservedPropNames> reservedPropNames;
- @XmlElement(name = "edge-prop-names")
- protected List<EdgePropNames> edgePropNames;
-
- /**
- * Gets the value of the reservedPropNames property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the reservedPropNames property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getReservedPropNames().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link ReservedPropNames }
- *
- *
- */
- public List<ReservedPropNames> getReservedPropNames() {
- if (reservedPropNames == null) {
- reservedPropNames = new ArrayList<ReservedPropNames>();
- }
- return this.reservedPropNames;
- }
-
- /**
- * Gets the value of the edgePropNames property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the edgePropNames property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getEdgePropNames().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link EdgePropNames }
- *
- *
- */
- public List<EdgePropNames> getEdgePropNames() {
- if (edgePropNames == null) {
- edgePropNames = new ArrayList<EdgePropNames>();
- }
- return this.edgePropNames;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Action.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Action.java
deleted file mode 100644
index 75b9a8e..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Action.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="action-type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}action-data" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "actionType",
- "actionData"
-})
-@XmlRootElement(name = "action")
-public class Action
- implements AAIDatum
-{
-
- @XmlElement(name = "action-type")
- protected String actionType;
- @XmlElement(name = "action-data")
- protected List<ActionData> actionData;
-
- /**
- * Gets the value of the actionType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getActionType() {
- return actionType;
- }
-
- /**
- * Sets the value of the actionType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setActionType(String value) {
- this.actionType = value;
- }
-
- /**
- * Gets the value of the actionData property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the actionData property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getActionData().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link ActionData }
- *
- *
- */
- public List<ActionData> getActionData() {
- if (actionData == null) {
- actionData = new ArrayList<ActionData>();
- }
- return this.actionData;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ActionData.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ActionData.java
deleted file mode 100644
index d47cb74..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ActionData.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="property-name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="property-value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "propertyName",
- "propertyValue"
-})
-@XmlRootElement(name = "action-data")
-public class ActionData
- implements AAIDatum
-{
-
- @XmlElement(name = "property-name")
- protected String propertyName;
- @XmlElement(name = "property-value")
- protected String propertyValue;
-
- /**
- * Gets the value of the propertyName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPropertyName() {
- return propertyName;
- }
-
- /**
- * Sets the value of the propertyName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPropertyName(String value) {
- this.propertyName = value;
- }
-
- /**
- * Gets the value of the propertyValue property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPropertyValue() {
- return propertyValue;
- }
-
- /**
- * Sets the value of the propertyValue property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPropertyValue(String value) {
- this.propertyValue = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Actions.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Actions.java
deleted file mode 100644
index 6ef17f7..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Actions.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}update" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}notify" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "update",
- "notify"
-})
-@XmlRootElement(name = "actions")
-public class Actions
- implements AAIDatum
-{
-
- protected Update update;
- protected Notify notify;
-
- /**
- * Gets the value of the update property.
- *
- * @return
- * possible object is
- * {@link Update }
- *
- */
- public Update getUpdate() {
- return update;
- }
-
- /**
- * Sets the value of the update property.
- *
- * @param value
- * allowed object is
- * {@link Update }
- *
- */
- public void setUpdate(Update value) {
- this.update = value;
- }
-
- /**
- * Gets the value of the notify property.
- *
- * @return
- * possible object is
- * {@link Notify }
- *
- */
- public Notify getNotify() {
- return notify;
- }
-
- /**
- * Sets the value of the notify property.
- *
- * @param value
- * allowed object is
- * {@link Notify }
- *
- */
- public void setNotify(Notify value) {
- this.notify = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/AvailabilityZone.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/AvailabilityZone.java
deleted file mode 100644
index 6dfc43a..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/AvailabilityZone.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="availability-zone-name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="hypervisor-type" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="operational-state" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "availabilityZoneName",
- "hypervisorType",
- "operationalState",
- "resourceVersion",
- "relationshipList"
-})
-@XmlRootElement(name = "availability-zone")
-public class AvailabilityZone
- implements AAIDatum
-{
-
- @XmlElement(name = "availability-zone-name", required = true)
- protected String availabilityZoneName;
- @XmlElement(name = "hypervisor-type", required = true)
- protected String hypervisorType;
- @XmlElement(name = "operational-state")
- protected String operationalState;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the availabilityZoneName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getAvailabilityZoneName() {
- return availabilityZoneName;
- }
-
- /**
- * Sets the value of the availabilityZoneName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setAvailabilityZoneName(String value) {
- this.availabilityZoneName = value;
- }
-
- /**
- * Gets the value of the hypervisorType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getHypervisorType() {
- return hypervisorType;
- }
-
- /**
- * Sets the value of the hypervisorType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setHypervisorType(String value) {
- this.hypervisorType = value;
- }
-
- /**
- * Gets the value of the operationalState property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getOperationalState() {
- return operationalState;
- }
-
- /**
- * Sets the value of the operationalState property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setOperationalState(String value) {
- this.operationalState = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/AvailabilityZones.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/AvailabilityZones.java
deleted file mode 100644
index 9d26ee3..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/AvailabilityZones.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}availability-zone" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "availabilityZone"
-})
-@XmlRootElement(name = "availability-zones")
-public class AvailabilityZones
- implements AAIDatum
-{
-
- @XmlElement(name = "availability-zone")
- protected List<AvailabilityZone> availabilityZone;
-
- /**
- * Gets the value of the availabilityZone property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the availabilityZone property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getAvailabilityZone().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link AvailabilityZone }
- *
- *
- */
- public List<AvailabilityZone> getAvailabilityZone() {
- if (availabilityZone == null) {
- availabilityZone = new ArrayList<AvailabilityZone>();
- }
- return this.availabilityZone;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Business.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Business.java
deleted file mode 100644
index 41d89d1..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Business.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}customers" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "customers"
-})
-@XmlRootElement(name = "business")
-public class Business
- implements AAIDatum
-{
-
- protected Customers customers;
-
- /**
- * Gets the value of the customers property.
- *
- * @return
- * possible object is
- * {@link Customers }
- *
- */
- public Customers getCustomers() {
- return customers;
- }
-
- /**
- * Sets the value of the customers property.
- *
- * @param value
- * allowed object is
- * {@link Customers }
- *
- */
- public void setCustomers(Customers value) {
- this.customers = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CloudInfrastructure.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CloudInfrastructure.java
deleted file mode 100644
index c2c2ee1..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CloudInfrastructure.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}cloud-regions" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}pservers" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "cloudRegions",
- "pservers"
-})
-@XmlRootElement(name = "cloud-infrastructure")
-public class CloudInfrastructure
- implements AAIDatum
-{
-
- @XmlElement(name = "cloud-regions")
- protected CloudRegions cloudRegions;
- protected Pservers pservers;
-
- /**
- * Gets the value of the cloudRegions property.
- *
- * @return
- * possible object is
- * {@link CloudRegions }
- *
- */
- public CloudRegions getCloudRegions() {
- return cloudRegions;
- }
-
- /**
- * Sets the value of the cloudRegions property.
- *
- * @param value
- * allowed object is
- * {@link CloudRegions }
- *
- */
- public void setCloudRegions(CloudRegions value) {
- this.cloudRegions = value;
- }
-
- /**
- * Gets the value of the pservers property.
- *
- * @return
- * possible object is
- * {@link Pservers }
- *
- */
- public Pservers getPservers() {
- return pservers;
- }
-
- /**
- * Sets the value of the pservers property.
- *
- * @param value
- * allowed object is
- * {@link Pservers }
- *
- */
- public void setPservers(Pservers value) {
- this.pservers = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CloudRegion.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CloudRegion.java
deleted file mode 100644
index 031702a..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CloudRegion.java
+++ /dev/null
@@ -1,539 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="cloud-owner" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="cloud-region-id" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="cloud-type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="owner-defined-type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="cloud-region-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="identity-url" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="cloud-zone" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="complex-name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}volume-groups" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}tenants" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}flavors" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}group-assignments" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}snapshots" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}images" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}availability-zones" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "cloudOwner",
- "cloudRegionId",
- "cloudType",
- "ownerDefinedType",
- "cloudRegionVersion",
- "identityUrl",
- "cloudZone",
- "complexName",
- "resourceVersion",
- "volumeGroups",
- "tenants",
- "flavors",
- "groupAssignments",
- "snapshots",
- "images",
- "availabilityZones",
- "relationshipList"
-})
-@XmlRootElement(name = "cloud-region")
-public class CloudRegion
- implements AAIDatum
-{
-
- @XmlElement(name = "cloud-owner", required = true)
- protected String cloudOwner;
- @XmlElement(name = "cloud-region-id", required = true)
- protected String cloudRegionId;
- @XmlElement(name = "cloud-type")
- protected String cloudType;
- @XmlElement(name = "owner-defined-type")
- protected String ownerDefinedType;
- @XmlElement(name = "cloud-region-version")
- protected String cloudRegionVersion;
- @XmlElement(name = "identity-url")
- protected String identityUrl;
- @XmlElement(name = "cloud-zone")
- protected String cloudZone;
- @XmlElement(name = "complex-name")
- protected String complexName;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "volume-groups")
- protected VolumeGroups volumeGroups;
- protected Tenants tenants;
- protected Flavors flavors;
- @XmlElement(name = "group-assignments")
- protected GroupAssignments groupAssignments;
- protected Snapshots snapshots;
- protected Images images;
- @XmlElement(name = "availability-zones")
- protected AvailabilityZones availabilityZones;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the cloudOwner property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getCloudOwner() {
- return cloudOwner;
- }
-
- /**
- * Sets the value of the cloudOwner property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setCloudOwner(String value) {
- this.cloudOwner = value;
- }
-
- /**
- * Gets the value of the cloudRegionId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getCloudRegionId() {
- return cloudRegionId;
- }
-
- /**
- * Sets the value of the cloudRegionId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setCloudRegionId(String value) {
- this.cloudRegionId = value;
- }
-
- /**
- * Gets the value of the cloudType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getCloudType() {
- return cloudType;
- }
-
- /**
- * Sets the value of the cloudType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setCloudType(String value) {
- this.cloudType = value;
- }
-
- /**
- * Gets the value of the ownerDefinedType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getOwnerDefinedType() {
- return ownerDefinedType;
- }
-
- /**
- * Sets the value of the ownerDefinedType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setOwnerDefinedType(String value) {
- this.ownerDefinedType = value;
- }
-
- /**
- * Gets the value of the cloudRegionVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getCloudRegionVersion() {
- return cloudRegionVersion;
- }
-
- /**
- * Sets the value of the cloudRegionVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setCloudRegionVersion(String value) {
- this.cloudRegionVersion = value;
- }
-
- /**
- * Gets the value of the identityUrl property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getIdentityUrl() {
- return identityUrl;
- }
-
- /**
- * Sets the value of the identityUrl property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setIdentityUrl(String value) {
- this.identityUrl = value;
- }
-
- /**
- * Gets the value of the cloudZone property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getCloudZone() {
- return cloudZone;
- }
-
- /**
- * Sets the value of the cloudZone property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setCloudZone(String value) {
- this.cloudZone = value;
- }
-
- /**
- * Gets the value of the complexName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getComplexName() {
- return complexName;
- }
-
- /**
- * Sets the value of the complexName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setComplexName(String value) {
- this.complexName = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the volumeGroups property.
- *
- * @return
- * possible object is
- * {@link VolumeGroups }
- *
- */
- public VolumeGroups getVolumeGroups() {
- return volumeGroups;
- }
-
- /**
- * Sets the value of the volumeGroups property.
- *
- * @param value
- * allowed object is
- * {@link VolumeGroups }
- *
- */
- public void setVolumeGroups(VolumeGroups value) {
- this.volumeGroups = value;
- }
-
- /**
- * Gets the value of the tenants property.
- *
- * @return
- * possible object is
- * {@link Tenants }
- *
- */
- public Tenants getTenants() {
- return tenants;
- }
-
- /**
- * Sets the value of the tenants property.
- *
- * @param value
- * allowed object is
- * {@link Tenants }
- *
- */
- public void setTenants(Tenants value) {
- this.tenants = value;
- }
-
- /**
- * Gets the value of the flavors property.
- *
- * @return
- * possible object is
- * {@link Flavors }
- *
- */
- public Flavors getFlavors() {
- return flavors;
- }
-
- /**
- * Sets the value of the flavors property.
- *
- * @param value
- * allowed object is
- * {@link Flavors }
- *
- */
- public void setFlavors(Flavors value) {
- this.flavors = value;
- }
-
- /**
- * Gets the value of the groupAssignments property.
- *
- * @return
- * possible object is
- * {@link GroupAssignments }
- *
- */
- public GroupAssignments getGroupAssignments() {
- return groupAssignments;
- }
-
- /**
- * Sets the value of the groupAssignments property.
- *
- * @param value
- * allowed object is
- * {@link GroupAssignments }
- *
- */
- public void setGroupAssignments(GroupAssignments value) {
- this.groupAssignments = value;
- }
-
- /**
- * Gets the value of the snapshots property.
- *
- * @return
- * possible object is
- * {@link Snapshots }
- *
- */
- public Snapshots getSnapshots() {
- return snapshots;
- }
-
- /**
- * Sets the value of the snapshots property.
- *
- * @param value
- * allowed object is
- * {@link Snapshots }
- *
- */
- public void setSnapshots(Snapshots value) {
- this.snapshots = value;
- }
-
- /**
- * Gets the value of the images property.
- *
- * @return
- * possible object is
- * {@link Images }
- *
- */
- public Images getImages() {
- return images;
- }
-
- /**
- * Sets the value of the images property.
- *
- * @param value
- * allowed object is
- * {@link Images }
- *
- */
- public void setImages(Images value) {
- this.images = value;
- }
-
- /**
- * Gets the value of the availabilityZones property.
- *
- * @return
- * possible object is
- * {@link AvailabilityZones }
- *
- */
- public AvailabilityZones getAvailabilityZones() {
- return availabilityZones;
- }
-
- /**
- * Sets the value of the availabilityZones property.
- *
- * @param value
- * allowed object is
- * {@link AvailabilityZones }
- *
- */
- public void setAvailabilityZones(AvailabilityZones value) {
- this.availabilityZones = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CloudRegions.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CloudRegions.java
deleted file mode 100644
index 220252f..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CloudRegions.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}cloud-region" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "cloudRegion"
-})
-@XmlRootElement(name = "cloud-regions")
-public class CloudRegions
- implements AAIDatum
-{
-
- @XmlElement(name = "cloud-region")
- protected List<CloudRegion> cloudRegion;
-
- /**
- * Gets the value of the cloudRegion property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the cloudRegion property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getCloudRegion().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link CloudRegion }
- *
- *
- */
- public List<CloudRegion> getCloudRegion() {
- if (cloudRegion == null) {
- cloudRegion = new ArrayList<CloudRegion>();
- }
- return this.cloudRegion;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ConstrainedElementSet.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ConstrainedElementSet.java
deleted file mode 100644
index 878679a..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ConstrainedElementSet.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="constrained-element-set-uuid" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="constraint-type" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="check-type" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}element-choice-sets" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "constrainedElementSetUuid",
- "constraintType",
- "checkType",
- "resourceVersion",
- "elementChoiceSets",
- "relationshipList"
-})
-@XmlRootElement(name = "constrained-element-set")
-public class ConstrainedElementSet
- implements AAIDatum
-{
-
- @XmlElement(name = "constrained-element-set-uuid", required = true)
- protected String constrainedElementSetUuid;
- @XmlElement(name = "constraint-type", required = true)
- protected String constraintType;
- @XmlElement(name = "check-type", required = true)
- protected String checkType;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "element-choice-sets")
- protected ElementChoiceSets elementChoiceSets;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the constrainedElementSetUuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getConstrainedElementSetUuid() {
- return constrainedElementSetUuid;
- }
-
- /**
- * Sets the value of the constrainedElementSetUuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setConstrainedElementSetUuid(String value) {
- this.constrainedElementSetUuid = value;
- }
-
- /**
- * Gets the value of the constraintType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getConstraintType() {
- return constraintType;
- }
-
- /**
- * Sets the value of the constraintType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setConstraintType(String value) {
- this.constraintType = value;
- }
-
- /**
- * Gets the value of the checkType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getCheckType() {
- return checkType;
- }
-
- /**
- * Sets the value of the checkType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setCheckType(String value) {
- this.checkType = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the elementChoiceSets property.
- *
- * @return
- * possible object is
- * {@link ElementChoiceSets }
- *
- */
- public ElementChoiceSets getElementChoiceSets() {
- return elementChoiceSets;
- }
-
- /**
- * Sets the value of the elementChoiceSets property.
- *
- * @param value
- * allowed object is
- * {@link ElementChoiceSets }
- *
- */
- public void setElementChoiceSets(ElementChoiceSets value) {
- this.elementChoiceSets = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ConstrainedElementSets.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ConstrainedElementSets.java
deleted file mode 100644
index 3f9009a..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ConstrainedElementSets.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}constrained-element-set" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "constrainedElementSet"
-})
-@XmlRootElement(name = "constrained-element-sets")
-public class ConstrainedElementSets
- implements AAIDatum
-{
-
- @XmlElement(name = "constrained-element-set")
- protected List<ConstrainedElementSet> constrainedElementSet;
-
- /**
- * Gets the value of the constrainedElementSet property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the constrainedElementSet property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getConstrainedElementSet().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link ConstrainedElementSet }
- *
- *
- */
- public List<ConstrainedElementSet> getConstrainedElementSet() {
- if (constrainedElementSet == null) {
- constrainedElementSet = new ArrayList<ConstrainedElementSet>();
- }
- return this.constrainedElementSet;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CtagAssignment.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CtagAssignment.java
deleted file mode 100644
index ca51b8e..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CtagAssignment.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="vlan-id-inner" type="{http://www.w3.org/2001/XMLSchema}unsignedInt"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "vlanIdInner",
- "resourceVersion",
- "relationshipList"
-})
-@XmlRootElement(name = "ctag-assignment")
-public class CtagAssignment
- implements AAIDatum
-{
-
- @XmlElement(name = "vlan-id-inner")
- @XmlSchemaType(name = "unsignedInt")
- protected long vlanIdInner;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the vlanIdInner property.
- *
- */
- public long getVlanIdInner() {
- return vlanIdInner;
- }
-
- /**
- * Sets the value of the vlanIdInner property.
- *
- */
- public void setVlanIdInner(long value) {
- this.vlanIdInner = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CtagAssignments.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CtagAssignments.java
deleted file mode 100644
index 62023f1..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CtagAssignments.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}ctag-assignment" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "ctagAssignment"
-})
-@XmlRootElement(name = "ctag-assignments")
-public class CtagAssignments
- implements AAIDatum
-{
-
- @XmlElement(name = "ctag-assignment")
- protected List<CtagAssignment> ctagAssignment;
-
- /**
- * Gets the value of the ctagAssignment property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the ctagAssignment property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getCtagAssignment().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link CtagAssignment }
- *
- *
- */
- public List<CtagAssignment> getCtagAssignment() {
- if (ctagAssignment == null) {
- ctagAssignment = new ArrayList<CtagAssignment>();
- }
- return this.ctagAssignment;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Customer.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Customer.java
deleted file mode 100644
index 5295f27..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Customer.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="global-customer-id" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="subscriber-name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="subscriber-type" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}service-subscriptions" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "globalCustomerId",
- "subscriberName",
- "subscriberType",
- "resourceVersion",
- "serviceSubscriptions",
- "relationshipList"
-})
-@XmlRootElement(name = "customer")
-public class Customer
- implements AAIDatum
-{
-
- @XmlElement(name = "global-customer-id", required = true)
- protected String globalCustomerId;
- @XmlElement(name = "subscriber-name", required = true)
- protected String subscriberName;
- @XmlElement(name = "subscriber-type", required = true)
- protected String subscriberType;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "service-subscriptions")
- protected ServiceSubscriptions serviceSubscriptions;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the globalCustomerId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getGlobalCustomerId() {
- return globalCustomerId;
- }
-
- /**
- * Sets the value of the globalCustomerId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setGlobalCustomerId(String value) {
- this.globalCustomerId = value;
- }
-
- /**
- * Gets the value of the subscriberName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSubscriberName() {
- return subscriberName;
- }
-
- /**
- * Sets the value of the subscriberName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSubscriberName(String value) {
- this.subscriberName = value;
- }
-
- /**
- * Gets the value of the subscriberType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSubscriberType() {
- return subscriberType;
- }
-
- /**
- * Sets the value of the subscriberType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSubscriberType(String value) {
- this.subscriberType = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the serviceSubscriptions property.
- *
- * @return
- * possible object is
- * {@link ServiceSubscriptions }
- *
- */
- public ServiceSubscriptions getServiceSubscriptions() {
- return serviceSubscriptions;
- }
-
- /**
- * Sets the value of the serviceSubscriptions property.
- *
- * @param value
- * allowed object is
- * {@link ServiceSubscriptions }
- *
- */
- public void setServiceSubscriptions(ServiceSubscriptions value) {
- this.serviceSubscriptions = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Customers.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Customers.java
deleted file mode 100644
index 191e333..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Customers.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}customer" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "customer"
-})
-@XmlRootElement(name = "customers")
-public class Customers
- implements AAIDatum
-{
-
- protected List<Customer> customer;
-
- /**
- * Gets the value of the customer property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the customer property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getCustomer().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Customer }
- *
- *
- */
- public List<Customer> getCustomer() {
- if (customer == null) {
- customer = new ArrayList<Customer>();
- }
- return this.customer;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/EdgePropNames.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/EdgePropNames.java
deleted file mode 100644
index 8d1e984..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/EdgePropNames.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="edgeLabel" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="direction" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="multiplicityRule" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="isParent" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/&gt;
- * &lt;element name="usesResource" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/&gt;
- * &lt;element name="hasDelTarget" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/&gt;
- * &lt;element name="SVC-INFRA" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="SVC-INFRA-REV" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "edgeLabel",
- "direction",
- "multiplicityRule",
- "isParent",
- "usesResource",
- "hasDelTarget",
- "svcinfra",
- "svcinfrarev"
-})
-@XmlRootElement(name = "edge-prop-names")
-public class EdgePropNames
- implements AAIDatum
-{
-
- protected String edgeLabel;
- protected String direction;
- protected String multiplicityRule;
- protected Boolean isParent;
- protected Boolean usesResource;
- protected Boolean hasDelTarget;
- @XmlElement(name = "SVC-INFRA")
- protected String svcinfra;
- @XmlElement(name = "SVC-INFRA-REV")
- protected String svcinfrarev;
-
- /**
- * Gets the value of the edgeLabel property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getEdgeLabel() {
- return edgeLabel;
- }
-
- /**
- * Sets the value of the edgeLabel property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setEdgeLabel(String value) {
- this.edgeLabel = value;
- }
-
- /**
- * Gets the value of the direction property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getDirection() {
- return direction;
- }
-
- /**
- * Sets the value of the direction property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setDirection(String value) {
- this.direction = value;
- }
-
- /**
- * Gets the value of the multiplicityRule property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getMultiplicityRule() {
- return multiplicityRule;
- }
-
- /**
- * Sets the value of the multiplicityRule property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setMultiplicityRule(String value) {
- this.multiplicityRule = value;
- }
-
- /**
- * Gets the value of the isParent property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public Boolean isIsParent() {
- return isParent;
- }
-
- /**
- * Sets the value of the isParent property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- public void setIsParent(Boolean value) {
- this.isParent = value;
- }
-
- /**
- * Gets the value of the usesResource property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public Boolean isUsesResource() {
- return usesResource;
- }
-
- /**
- * Sets the value of the usesResource property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- public void setUsesResource(Boolean value) {
- this.usesResource = value;
- }
-
- /**
- * Gets the value of the hasDelTarget property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public Boolean isHasDelTarget() {
- return hasDelTarget;
- }
-
- /**
- * Sets the value of the hasDelTarget property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- public void setHasDelTarget(Boolean value) {
- this.hasDelTarget = value;
- }
-
- /**
- * Gets the value of the svcinfra property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSVCINFRA() {
- return svcinfra;
- }
-
- /**
- * Sets the value of the svcinfra property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSVCINFRA(String value) {
- this.svcinfra = value;
- }
-
- /**
- * Gets the value of the svcinfrarev property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSVCINFRAREV() {
- return svcinfrarev;
- }
-
- /**
- * Sets the value of the svcinfrarev property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSVCINFRAREV(String value) {
- this.svcinfrarev = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ElementChoiceSet.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ElementChoiceSet.java
deleted file mode 100644
index 1b8aa1d..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ElementChoiceSet.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="element-choice-set-uuid" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="element-choice-set-name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="cardinality" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}model-elements" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "elementChoiceSetUuid",
- "elementChoiceSetName",
- "cardinality",
- "resourceVersion",
- "modelElements",
- "relationshipList"
-})
-@XmlRootElement(name = "element-choice-set")
-public class ElementChoiceSet
- implements AAIDatum
-{
-
- @XmlElement(name = "element-choice-set-uuid", required = true)
- protected String elementChoiceSetUuid;
- @XmlElement(name = "element-choice-set-name", required = true)
- protected String elementChoiceSetName;
- protected String cardinality;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "model-elements")
- protected ModelElements modelElements;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the elementChoiceSetUuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getElementChoiceSetUuid() {
- return elementChoiceSetUuid;
- }
-
- /**
- * Sets the value of the elementChoiceSetUuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setElementChoiceSetUuid(String value) {
- this.elementChoiceSetUuid = value;
- }
-
- /**
- * Gets the value of the elementChoiceSetName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getElementChoiceSetName() {
- return elementChoiceSetName;
- }
-
- /**
- * Sets the value of the elementChoiceSetName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setElementChoiceSetName(String value) {
- this.elementChoiceSetName = value;
- }
-
- /**
- * Gets the value of the cardinality property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getCardinality() {
- return cardinality;
- }
-
- /**
- * Sets the value of the cardinality property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setCardinality(String value) {
- this.cardinality = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the modelElements property.
- *
- * @return
- * possible object is
- * {@link ModelElements }
- *
- */
- public ModelElements getModelElements() {
- return modelElements;
- }
-
- /**
- * Sets the value of the modelElements property.
- *
- * @param value
- * allowed object is
- * {@link ModelElements }
- *
- */
- public void setModelElements(ModelElements value) {
- this.modelElements = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ElementChoiceSets.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ElementChoiceSets.java
deleted file mode 100644
index 6a88c0b..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ElementChoiceSets.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}element-choice-set" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "elementChoiceSet"
-})
-@XmlRootElement(name = "element-choice-sets")
-public class ElementChoiceSets
- implements AAIDatum
-{
-
- @XmlElement(name = "element-choice-set")
- protected List<ElementChoiceSet> elementChoiceSet;
-
- /**
- * Gets the value of the elementChoiceSet property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the elementChoiceSet property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getElementChoiceSet().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link ElementChoiceSet }
- *
- *
- */
- public List<ElementChoiceSet> getElementChoiceSet() {
- if (elementChoiceSet == null) {
- elementChoiceSet = new ArrayList<ElementChoiceSet>();
- }
- return this.elementChoiceSet;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ExtraProperties.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ExtraProperties.java
deleted file mode 100644
index eb3af33..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ExtraProperties.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "")
-@XmlRootElement(name = "extra-properties")
-public class ExtraProperties
- implements AAIDatum
-{
-
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ExtraProperty.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ExtraProperty.java
deleted file mode 100644
index b1d8866..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ExtraProperty.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="property-name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "propertyName"
-})
-@XmlRootElement(name = "extra-property")
-public class ExtraProperty
- implements AAIDatum
-{
-
- @XmlElement(name = "property-name")
- protected String propertyName;
-
- /**
- * Gets the value of the propertyName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPropertyName() {
- return propertyName;
- }
-
- /**
- * Sets the value of the propertyName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPropertyName(String value) {
- this.propertyName = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Flavor.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Flavor.java
deleted file mode 100644
index c0bf5d2..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Flavor.java
+++ /dev/null
@@ -1,403 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="flavor-id" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="flavor-name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="flavor-vcpus" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/&gt;
- * &lt;element name="flavor-ram" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/&gt;
- * &lt;element name="flavor-disk" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/&gt;
- * &lt;element name="flavor-ephemeral" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/&gt;
- * &lt;element name="flavor-swap" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="flavor-is-public" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/&gt;
- * &lt;element name="flavor-selflink" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="flavor-disabled" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "flavorId",
- "flavorName",
- "flavorVcpus",
- "flavorRam",
- "flavorDisk",
- "flavorEphemeral",
- "flavorSwap",
- "flavorIsPublic",
- "flavorSelflink",
- "flavorDisabled",
- "resourceVersion",
- "relationshipList"
-})
-@XmlRootElement(name = "flavor")
-public class Flavor
- implements AAIDatum
-{
-
- @XmlElement(name = "flavor-id", required = true)
- protected String flavorId;
- @XmlElement(name = "flavor-name", required = true)
- protected String flavorName;
- @XmlElement(name = "flavor-vcpus")
- protected Integer flavorVcpus;
- @XmlElement(name = "flavor-ram")
- protected Integer flavorRam;
- @XmlElement(name = "flavor-disk")
- protected Integer flavorDisk;
- @XmlElement(name = "flavor-ephemeral")
- protected Integer flavorEphemeral;
- @XmlElement(name = "flavor-swap")
- protected String flavorSwap;
- @XmlElement(name = "flavor-is-public")
- protected Boolean flavorIsPublic;
- @XmlElement(name = "flavor-selflink", required = true)
- protected String flavorSelflink;
- @XmlElement(name = "flavor-disabled")
- protected Boolean flavorDisabled;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the flavorId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getFlavorId() {
- return flavorId;
- }
-
- /**
- * Sets the value of the flavorId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setFlavorId(String value) {
- this.flavorId = value;
- }
-
- /**
- * Gets the value of the flavorName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getFlavorName() {
- return flavorName;
- }
-
- /**
- * Sets the value of the flavorName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setFlavorName(String value) {
- this.flavorName = value;
- }
-
- /**
- * Gets the value of the flavorVcpus property.
- *
- * @return
- * possible object is
- * {@link Integer }
- *
- */
- public Integer getFlavorVcpus() {
- return flavorVcpus;
- }
-
- /**
- * Sets the value of the flavorVcpus property.
- *
- * @param value
- * allowed object is
- * {@link Integer }
- *
- */
- public void setFlavorVcpus(Integer value) {
- this.flavorVcpus = value;
- }
-
- /**
- * Gets the value of the flavorRam property.
- *
- * @return
- * possible object is
- * {@link Integer }
- *
- */
- public Integer getFlavorRam() {
- return flavorRam;
- }
-
- /**
- * Sets the value of the flavorRam property.
- *
- * @param value
- * allowed object is
- * {@link Integer }
- *
- */
- public void setFlavorRam(Integer value) {
- this.flavorRam = value;
- }
-
- /**
- * Gets the value of the flavorDisk property.
- *
- * @return
- * possible object is
- * {@link Integer }
- *
- */
- public Integer getFlavorDisk() {
- return flavorDisk;
- }
-
- /**
- * Sets the value of the flavorDisk property.
- *
- * @param value
- * allowed object is
- * {@link Integer }
- *
- */
- public void setFlavorDisk(Integer value) {
- this.flavorDisk = value;
- }
-
- /**
- * Gets the value of the flavorEphemeral property.
- *
- * @return
- * possible object is
- * {@link Integer }
- *
- */
- public Integer getFlavorEphemeral() {
- return flavorEphemeral;
- }
-
- /**
- * Sets the value of the flavorEphemeral property.
- *
- * @param value
- * allowed object is
- * {@link Integer }
- *
- */
- public void setFlavorEphemeral(Integer value) {
- this.flavorEphemeral = value;
- }
-
- /**
- * Gets the value of the flavorSwap property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getFlavorSwap() {
- return flavorSwap;
- }
-
- /**
- * Sets the value of the flavorSwap property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setFlavorSwap(String value) {
- this.flavorSwap = value;
- }
-
- /**
- * Gets the value of the flavorIsPublic property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public Boolean isFlavorIsPublic() {
- return flavorIsPublic;
- }
-
- /**
- * Sets the value of the flavorIsPublic property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- public void setFlavorIsPublic(Boolean value) {
- this.flavorIsPublic = value;
- }
-
- /**
- * Gets the value of the flavorSelflink property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getFlavorSelflink() {
- return flavorSelflink;
- }
-
- /**
- * Sets the value of the flavorSelflink property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setFlavorSelflink(String value) {
- this.flavorSelflink = value;
- }
-
- /**
- * Gets the value of the flavorDisabled property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public Boolean isFlavorDisabled() {
- return flavorDisabled;
- }
-
- /**
- * Sets the value of the flavorDisabled property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- public void setFlavorDisabled(Boolean value) {
- this.flavorDisabled = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Flavors.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Flavors.java
deleted file mode 100644
index 2fd65da..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Flavors.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}flavor" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "flavor"
-})
-@XmlRootElement(name = "flavors")
-public class Flavors
- implements AAIDatum
-{
-
- protected List<Flavor> flavor;
-
- /**
- * Gets the value of the flavor property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the flavor property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getFlavor().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Flavor }
- *
- *
- */
- public List<Flavor> getFlavor() {
- if (flavor == null) {
- flavor = new ArrayList<Flavor>();
- }
- return this.flavor;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GenericVnf.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GenericVnf.java
deleted file mode 100644
index c100ee4..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GenericVnf.java
+++ /dev/null
@@ -1,1284 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="vnf-id" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="vnf-name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="vnf-name2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="vnf-type" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="service-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="regional-resource-zone" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="prov-status" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="operational-state" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="license-key" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="equipment-role" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="orchestration-status" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="heat-stack-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="mso-catalog-key" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="management-option" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="ipv4-oam-address" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="ipv4-loopback0-address" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="nm-lan-v6-address" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="management-v6-address" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="vcpu" type="{http://www.w3.org/2001/XMLSchema}unsignedInt" minOccurs="0"/&gt;
- * &lt;element name="vcpu-units" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="vmemory" type="{http://www.w3.org/2001/XMLSchema}unsignedInt" minOccurs="0"/&gt;
- * &lt;element name="vmemory-units" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="vdisk" type="{http://www.w3.org/2001/XMLSchema}unsignedInt" minOccurs="0"/&gt;
- * &lt;element name="vdisk-units" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="in-maint" type="{http://www.w3.org/2001/XMLSchema}boolean"/&gt;
- * &lt;element name="is-closed-loop-disabled" type="{http://www.w3.org/2001/XMLSchema}boolean"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="summary-status" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="encrypted-access-flag" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/&gt;
- * &lt;element name="entitlement-assignment-group-uuid" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="entitlement-resource-uuid" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="license-assignment-group-uuid" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="license-key-uuid" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="persona-model-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="persona-model-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="persona-model-customization-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="widget-model-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="widget-model-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="as-number" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="regional-resource-subzone" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}l-interfaces" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}lag-interfaces" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}vf-modules" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "vnfId",
- "vnfName",
- "vnfName2",
- "vnfType",
- "serviceId",
- "regionalResourceZone",
- "provStatus",
- "operationalState",
- "licenseKey",
- "equipmentRole",
- "orchestrationStatus",
- "heatStackId",
- "msoCatalogKey",
- "managementOption",
- "ipv4OamAddress",
- "ipv4Loopback0Address",
- "nmLanV6Address",
- "managementV6Address",
- "vcpu",
- "vcpuUnits",
- "vmemory",
- "vmemoryUnits",
- "vdisk",
- "vdiskUnits",
- "inMaint",
- "isClosedLoopDisabled",
- "resourceVersion",
- "summaryStatus",
- "encryptedAccessFlag",
- "entitlementAssignmentGroupUuid",
- "entitlementResourceUuid",
- "licenseAssignmentGroupUuid",
- "licenseKeyUuid",
- "personaModelId",
- "personaModelVersion",
- "personaModelCustomizationId",
- "widgetModelId",
- "widgetModelVersion",
- "asNumber",
- "regionalResourceSubzone",
- "relationshipList",
- "lInterfaces",
- "lagInterfaces",
- "vfModules"
-})
-@XmlRootElement(name = "generic-vnf")
-public class GenericVnf
- implements AAIDatum
-{
-
- @XmlElement(name = "vnf-id", required = true)
- protected String vnfId;
- @XmlElement(name = "vnf-name", required = true)
- protected String vnfName;
- @XmlElement(name = "vnf-name2")
- protected String vnfName2;
- @XmlElement(name = "vnf-type", required = true)
- protected String vnfType;
- @XmlElement(name = "service-id")
- protected String serviceId;
- @XmlElement(name = "regional-resource-zone")
- protected String regionalResourceZone;
- @XmlElement(name = "prov-status")
- protected String provStatus;
- @XmlElement(name = "operational-state")
- protected String operationalState;
- @XmlElement(name = "license-key")
- protected String licenseKey;
- @XmlElement(name = "equipment-role")
- protected String equipmentRole;
- @XmlElement(name = "orchestration-status")
- protected String orchestrationStatus;
- @XmlElement(name = "heat-stack-id")
- protected String heatStackId;
- @XmlElement(name = "mso-catalog-key")
- protected String msoCatalogKey;
- @XmlElement(name = "management-option")
- protected String managementOption;
- @XmlElement(name = "ipv4-oam-address")
- protected String ipv4OamAddress;
- @XmlElement(name = "ipv4-loopback0-address")
- protected String ipv4Loopback0Address;
- @XmlElement(name = "nm-lan-v6-address")
- protected String nmLanV6Address;
- @XmlElement(name = "management-v6-address")
- protected String managementV6Address;
- @XmlSchemaType(name = "unsignedInt")
- protected Long vcpu;
- @XmlElement(name = "vcpu-units")
- protected String vcpuUnits;
- @XmlSchemaType(name = "unsignedInt")
- protected Long vmemory;
- @XmlElement(name = "vmemory-units")
- protected String vmemoryUnits;
- @XmlSchemaType(name = "unsignedInt")
- protected Long vdisk;
- @XmlElement(name = "vdisk-units")
- protected String vdiskUnits;
- @XmlElement(name = "in-maint")
- protected boolean inMaint;
- @XmlElement(name = "is-closed-loop-disabled")
- protected boolean isClosedLoopDisabled;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "summary-status")
- protected String summaryStatus;
- @XmlElement(name = "encrypted-access-flag")
- protected Boolean encryptedAccessFlag;
- @XmlElement(name = "entitlement-assignment-group-uuid")
- protected String entitlementAssignmentGroupUuid;
- @XmlElement(name = "entitlement-resource-uuid")
- protected String entitlementResourceUuid;
- @XmlElement(name = "license-assignment-group-uuid")
- protected String licenseAssignmentGroupUuid;
- @XmlElement(name = "license-key-uuid")
- protected String licenseKeyUuid;
- @XmlElement(name = "persona-model-id")
- protected String personaModelId;
- @XmlElement(name = "persona-model-version")
- protected String personaModelVersion;
- @XmlElement(name = "persona-model-customization-id")
- protected String personaModelCustomizationId;
- @XmlElement(name = "widget-model-id")
- protected String widgetModelId;
- @XmlElement(name = "widget-model-version")
- protected String widgetModelVersion;
- @XmlElement(name = "as-number")
- protected String asNumber;
- @XmlElement(name = "regional-resource-subzone")
- protected String regionalResourceSubzone;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
- @XmlElement(name = "l-interfaces")
- protected LInterfaces lInterfaces;
- @XmlElement(name = "lag-interfaces")
- protected LagInterfaces lagInterfaces;
- @XmlElement(name = "vf-modules")
- protected VfModules vfModules;
-
- /**
- * Gets the value of the vnfId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getVnfId() {
- return vnfId;
- }
-
- /**
- * Sets the value of the vnfId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVnfId(String value) {
- this.vnfId = value;
- }
-
- /**
- * Gets the value of the vnfName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getVnfName() {
- return vnfName;
- }
-
- /**
- * Sets the value of the vnfName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVnfName(String value) {
- this.vnfName = value;
- }
-
- /**
- * Gets the value of the vnfName2 property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getVnfName2() {
- return vnfName2;
- }
-
- /**
- * Sets the value of the vnfName2 property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVnfName2(String value) {
- this.vnfName2 = value;
- }
-
- /**
- * Gets the value of the vnfType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getVnfType() {
- return vnfType;
- }
-
- /**
- * Sets the value of the vnfType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVnfType(String value) {
- this.vnfType = value;
- }
-
- /**
- * Gets the value of the serviceId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getServiceId() {
- return serviceId;
- }
-
- /**
- * Sets the value of the serviceId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setServiceId(String value) {
- this.serviceId = value;
- }
-
- /**
- * Gets the value of the regionalResourceZone property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getRegionalResourceZone() {
- return regionalResourceZone;
- }
-
- /**
- * Sets the value of the regionalResourceZone property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setRegionalResourceZone(String value) {
- this.regionalResourceZone = value;
- }
-
- /**
- * Gets the value of the provStatus property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getProvStatus() {
- return provStatus;
- }
-
- /**
- * Sets the value of the provStatus property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setProvStatus(String value) {
- this.provStatus = value;
- }
-
- /**
- * Gets the value of the operationalState property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getOperationalState() {
- return operationalState;
- }
-
- /**
- * Sets the value of the operationalState property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setOperationalState(String value) {
- this.operationalState = value;
- }
-
- /**
- * Gets the value of the licenseKey property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getLicenseKey() {
- return licenseKey;
- }
-
- /**
- * Sets the value of the licenseKey property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setLicenseKey(String value) {
- this.licenseKey = value;
- }
-
- /**
- * Gets the value of the equipmentRole property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getEquipmentRole() {
- return equipmentRole;
- }
-
- /**
- * Sets the value of the equipmentRole property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setEquipmentRole(String value) {
- this.equipmentRole = value;
- }
-
- /**
- * Gets the value of the orchestrationStatus property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getOrchestrationStatus() {
- return orchestrationStatus;
- }
-
- /**
- * Sets the value of the orchestrationStatus property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setOrchestrationStatus(String value) {
- this.orchestrationStatus = value;
- }
-
- /**
- * Gets the value of the heatStackId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getHeatStackId() {
- return heatStackId;
- }
-
- /**
- * Sets the value of the heatStackId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setHeatStackId(String value) {
- this.heatStackId = value;
- }
-
- /**
- * Gets the value of the msoCatalogKey property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getMsoCatalogKey() {
- return msoCatalogKey;
- }
-
- /**
- * Sets the value of the msoCatalogKey property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setMsoCatalogKey(String value) {
- this.msoCatalogKey = value;
- }
-
- /**
- * Gets the value of the managementOption property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getManagementOption() {
- return managementOption;
- }
-
- /**
- * Sets the value of the managementOption property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setManagementOption(String value) {
- this.managementOption = value;
- }
-
- /**
- * Gets the value of the ipv4OamAddress property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getIpv4OamAddress() {
- return ipv4OamAddress;
- }
-
- /**
- * Sets the value of the ipv4OamAddress property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setIpv4OamAddress(String value) {
- this.ipv4OamAddress = value;
- }
-
- /**
- * Gets the value of the ipv4Loopback0Address property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getIpv4Loopback0Address() {
- return ipv4Loopback0Address;
- }
-
- /**
- * Sets the value of the ipv4Loopback0Address property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setIpv4Loopback0Address(String value) {
- this.ipv4Loopback0Address = value;
- }
-
- /**
- * Gets the value of the nmLanV6Address property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getNmLanV6Address() {
- return nmLanV6Address;
- }
-
- /**
- * Sets the value of the nmLanV6Address property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setNmLanV6Address(String value) {
- this.nmLanV6Address = value;
- }
-
- /**
- * Gets the value of the managementV6Address property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getManagementV6Address() {
- return managementV6Address;
- }
-
- /**
- * Sets the value of the managementV6Address property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setManagementV6Address(String value) {
- this.managementV6Address = value;
- }
-
- /**
- * Gets the value of the vcpu property.
- *
- * @return
- * possible object is
- * {@link Long }
- *
- */
- public Long getVcpu() {
- return vcpu;
- }
-
- /**
- * Sets the value of the vcpu property.
- *
- * @param value
- * allowed object is
- * {@link Long }
- *
- */
- public void setVcpu(Long value) {
- this.vcpu = value;
- }
-
- /**
- * Gets the value of the vcpuUnits property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getVcpuUnits() {
- return vcpuUnits;
- }
-
- /**
- * Sets the value of the vcpuUnits property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVcpuUnits(String value) {
- this.vcpuUnits = value;
- }
-
- /**
- * Gets the value of the vmemory property.
- *
- * @return
- * possible object is
- * {@link Long }
- *
- */
- public Long getVmemory() {
- return vmemory;
- }
-
- /**
- * Sets the value of the vmemory property.
- *
- * @param value
- * allowed object is
- * {@link Long }
- *
- */
- public void setVmemory(Long value) {
- this.vmemory = value;
- }
-
- /**
- * Gets the value of the vmemoryUnits property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getVmemoryUnits() {
- return vmemoryUnits;
- }
-
- /**
- * Sets the value of the vmemoryUnits property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVmemoryUnits(String value) {
- this.vmemoryUnits = value;
- }
-
- /**
- * Gets the value of the vdisk property.
- *
- * @return
- * possible object is
- * {@link Long }
- *
- */
- public Long getVdisk() {
- return vdisk;
- }
-
- /**
- * Sets the value of the vdisk property.
- *
- * @param value
- * allowed object is
- * {@link Long }
- *
- */
- public void setVdisk(Long value) {
- this.vdisk = value;
- }
-
- /**
- * Gets the value of the vdiskUnits property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getVdiskUnits() {
- return vdiskUnits;
- }
-
- /**
- * Sets the value of the vdiskUnits property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVdiskUnits(String value) {
- this.vdiskUnits = value;
- }
-
- /**
- * Gets the value of the inMaint property.
- *
- */
- public boolean isInMaint() {
- return inMaint;
- }
-
- /**
- * Sets the value of the inMaint property.
- *
- */
- public void setInMaint(boolean value) {
- this.inMaint = value;
- }
-
- /**
- * Gets the value of the isClosedLoopDisabled property.
- *
- */
- public boolean isIsClosedLoopDisabled() {
- return isClosedLoopDisabled;
- }
-
- /**
- * Sets the value of the isClosedLoopDisabled property.
- *
- */
- public void setIsClosedLoopDisabled(boolean value) {
- this.isClosedLoopDisabled = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the summaryStatus property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSummaryStatus() {
- return summaryStatus;
- }
-
- /**
- * Sets the value of the summaryStatus property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSummaryStatus(String value) {
- this.summaryStatus = value;
- }
-
- /**
- * Gets the value of the encryptedAccessFlag property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public Boolean isEncryptedAccessFlag() {
- return encryptedAccessFlag;
- }
-
- /**
- * Sets the value of the encryptedAccessFlag property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- public void setEncryptedAccessFlag(Boolean value) {
- this.encryptedAccessFlag = value;
- }
-
- /**
- * Gets the value of the entitlementAssignmentGroupUuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getEntitlementAssignmentGroupUuid() {
- return entitlementAssignmentGroupUuid;
- }
-
- /**
- * Sets the value of the entitlementAssignmentGroupUuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setEntitlementAssignmentGroupUuid(String value) {
- this.entitlementAssignmentGroupUuid = value;
- }
-
- /**
- * Gets the value of the entitlementResourceUuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getEntitlementResourceUuid() {
- return entitlementResourceUuid;
- }
-
- /**
- * Sets the value of the entitlementResourceUuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setEntitlementResourceUuid(String value) {
- this.entitlementResourceUuid = value;
- }
-
- /**
- * Gets the value of the licenseAssignmentGroupUuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getLicenseAssignmentGroupUuid() {
- return licenseAssignmentGroupUuid;
- }
-
- /**
- * Sets the value of the licenseAssignmentGroupUuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setLicenseAssignmentGroupUuid(String value) {
- this.licenseAssignmentGroupUuid = value;
- }
-
- /**
- * Gets the value of the licenseKeyUuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getLicenseKeyUuid() {
- return licenseKeyUuid;
- }
-
- /**
- * Sets the value of the licenseKeyUuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setLicenseKeyUuid(String value) {
- this.licenseKeyUuid = value;
- }
-
- /**
- * Gets the value of the personaModelId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPersonaModelId() {
- return personaModelId;
- }
-
- /**
- * Sets the value of the personaModelId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPersonaModelId(String value) {
- this.personaModelId = value;
- }
-
- /**
- * Gets the value of the personaModelVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPersonaModelVersion() {
- return personaModelVersion;
- }
-
- /**
- * Sets the value of the personaModelVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPersonaModelVersion(String value) {
- this.personaModelVersion = value;
- }
-
- /**
- * Gets the value of the personaModelCustomizationId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPersonaModelCustomizationId() {
- return personaModelCustomizationId;
- }
-
- /**
- * Sets the value of the personaModelCustomizationId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPersonaModelCustomizationId(String value) {
- this.personaModelCustomizationId = value;
- }
-
- /**
- * Gets the value of the widgetModelId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getWidgetModelId() {
- return widgetModelId;
- }
-
- /**
- * Sets the value of the widgetModelId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setWidgetModelId(String value) {
- this.widgetModelId = value;
- }
-
- /**
- * Gets the value of the widgetModelVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getWidgetModelVersion() {
- return widgetModelVersion;
- }
-
- /**
- * Sets the value of the widgetModelVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setWidgetModelVersion(String value) {
- this.widgetModelVersion = value;
- }
-
- /**
- * Gets the value of the asNumber property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getAsNumber() {
- return asNumber;
- }
-
- /**
- * Sets the value of the asNumber property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setAsNumber(String value) {
- this.asNumber = value;
- }
-
- /**
- * Gets the value of the regionalResourceSubzone property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getRegionalResourceSubzone() {
- return regionalResourceSubzone;
- }
-
- /**
- * Sets the value of the regionalResourceSubzone property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setRegionalResourceSubzone(String value) {
- this.regionalResourceSubzone = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
- /**
- * Gets the value of the lInterfaces property.
- *
- * @return
- * possible object is
- * {@link LInterfaces }
- *
- */
- public LInterfaces getLInterfaces() {
- return lInterfaces;
- }
-
- /**
- * Sets the value of the lInterfaces property.
- *
- * @param value
- * allowed object is
- * {@link LInterfaces }
- *
- */
- public void setLInterfaces(LInterfaces value) {
- this.lInterfaces = value;
- }
-
- /**
- * Gets the value of the lagInterfaces property.
- *
- * @return
- * possible object is
- * {@link LagInterfaces }
- *
- */
- public LagInterfaces getLagInterfaces() {
- return lagInterfaces;
- }
-
- /**
- * Sets the value of the lagInterfaces property.
- *
- * @param value
- * allowed object is
- * {@link LagInterfaces }
- *
- */
- public void setLagInterfaces(LagInterfaces value) {
- this.lagInterfaces = value;
- }
-
- /**
- * Gets the value of the vfModules property.
- *
- * @return
- * possible object is
- * {@link VfModules }
- *
- */
- public VfModules getVfModules() {
- return vfModules;
- }
-
- /**
- * Sets the value of the vfModules property.
- *
- * @param value
- * allowed object is
- * {@link VfModules }
- *
- */
- public void setVfModules(VfModules value) {
- this.vfModules = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GenericVnfs.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GenericVnfs.java
deleted file mode 100644
index 98c1b74..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GenericVnfs.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}generic-vnf" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "genericVnf"
-})
-@XmlRootElement(name = "generic-vnfs")
-public class GenericVnfs
- implements AAIDatum
-{
-
- @XmlElement(name = "generic-vnf")
- protected List<GenericVnf> genericVnf;
-
- /**
- * Gets the value of the genericVnf property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the genericVnf property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getGenericVnf().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link GenericVnf }
- *
- *
- */
- public List<GenericVnf> getGenericVnf() {
- if (genericVnf == null) {
- genericVnf = new ArrayList<GenericVnf>();
- }
- return this.genericVnf;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GroupAssignment.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GroupAssignment.java
deleted file mode 100644
index cd5dd56..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GroupAssignment.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="group-id" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="group-type" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="group-name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="group-description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "groupId",
- "groupType",
- "groupName",
- "groupDescription",
- "resourceVersion",
- "relationshipList"
-})
-@XmlRootElement(name = "group-assignment")
-public class GroupAssignment
- implements AAIDatum
-{
-
- @XmlElement(name = "group-id", required = true)
- protected String groupId;
- @XmlElement(name = "group-type", required = true)
- protected String groupType;
- @XmlElement(name = "group-name", required = true)
- protected String groupName;
- @XmlElement(name = "group-description")
- protected String groupDescription;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the groupId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getGroupId() {
- return groupId;
- }
-
- /**
- * Sets the value of the groupId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setGroupId(String value) {
- this.groupId = value;
- }
-
- /**
- * Gets the value of the groupType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getGroupType() {
- return groupType;
- }
-
- /**
- * Sets the value of the groupType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setGroupType(String value) {
- this.groupType = value;
- }
-
- /**
- * Gets the value of the groupName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getGroupName() {
- return groupName;
- }
-
- /**
- * Sets the value of the groupName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setGroupName(String value) {
- this.groupName = value;
- }
-
- /**
- * Gets the value of the groupDescription property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getGroupDescription() {
- return groupDescription;
- }
-
- /**
- * Sets the value of the groupDescription property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setGroupDescription(String value) {
- this.groupDescription = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GroupAssignments.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GroupAssignments.java
deleted file mode 100644
index 6e5d249..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GroupAssignments.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}group-assignment" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "groupAssignment"
-})
-@XmlRootElement(name = "group-assignments")
-public class GroupAssignments
- implements AAIDatum
-{
-
- @XmlElement(name = "group-assignment")
- protected List<GroupAssignment> groupAssignment;
-
- /**
- * Gets the value of the groupAssignment property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the groupAssignment property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getGroupAssignment().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link GroupAssignment }
- *
- *
- */
- public List<GroupAssignment> getGroupAssignment() {
- if (groupAssignment == null) {
- groupAssignment = new ArrayList<GroupAssignment>();
- }
- return this.groupAssignment;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Image.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Image.java
deleted file mode 100644
index f7a792a..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Image.java
+++ /dev/null
@@ -1,401 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="image-id" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="image-name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="image-architecture" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="image-os-distro" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="image-os-version" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="application" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="application-vendor" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="application-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="image-selflink" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}metadata" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "imageId",
- "imageName",
- "imageArchitecture",
- "imageOsDistro",
- "imageOsVersion",
- "application",
- "applicationVendor",
- "applicationVersion",
- "imageSelflink",
- "resourceVersion",
- "relationshipList",
- "metadata"
-})
-@XmlRootElement(name = "image")
-public class Image
- implements AAIDatum
-{
-
- @XmlElement(name = "image-id", required = true)
- protected String imageId;
- @XmlElement(name = "image-name", required = true)
- protected String imageName;
- @XmlElement(name = "image-architecture")
- protected String imageArchitecture;
- @XmlElement(name = "image-os-distro", required = true)
- protected String imageOsDistro;
- @XmlElement(name = "image-os-version", required = true)
- protected String imageOsVersion;
- protected String application;
- @XmlElement(name = "application-vendor")
- protected String applicationVendor;
- @XmlElement(name = "application-version")
- protected String applicationVersion;
- @XmlElement(name = "image-selflink", required = true)
- protected String imageSelflink;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
- protected Metadata metadata;
-
- /**
- * Gets the value of the imageId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getImageId() {
- return imageId;
- }
-
- /**
- * Sets the value of the imageId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setImageId(String value) {
- this.imageId = value;
- }
-
- /**
- * Gets the value of the imageName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getImageName() {
- return imageName;
- }
-
- /**
- * Sets the value of the imageName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setImageName(String value) {
- this.imageName = value;
- }
-
- /**
- * Gets the value of the imageArchitecture property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getImageArchitecture() {
- return imageArchitecture;
- }
-
- /**
- * Sets the value of the imageArchitecture property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setImageArchitecture(String value) {
- this.imageArchitecture = value;
- }
-
- /**
- * Gets the value of the imageOsDistro property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getImageOsDistro() {
- return imageOsDistro;
- }
-
- /**
- * Sets the value of the imageOsDistro property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setImageOsDistro(String value) {
- this.imageOsDistro = value;
- }
-
- /**
- * Gets the value of the imageOsVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getImageOsVersion() {
- return imageOsVersion;
- }
-
- /**
- * Sets the value of the imageOsVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setImageOsVersion(String value) {
- this.imageOsVersion = value;
- }
-
- /**
- * Gets the value of the application property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getApplication() {
- return application;
- }
-
- /**
- * Sets the value of the application property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setApplication(String value) {
- this.application = value;
- }
-
- /**
- * Gets the value of the applicationVendor property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getApplicationVendor() {
- return applicationVendor;
- }
-
- /**
- * Sets the value of the applicationVendor property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setApplicationVendor(String value) {
- this.applicationVendor = value;
- }
-
- /**
- * Gets the value of the applicationVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getApplicationVersion() {
- return applicationVersion;
- }
-
- /**
- * Sets the value of the applicationVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setApplicationVersion(String value) {
- this.applicationVersion = value;
- }
-
- /**
- * Gets the value of the imageSelflink property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getImageSelflink() {
- return imageSelflink;
- }
-
- /**
- * Sets the value of the imageSelflink property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setImageSelflink(String value) {
- this.imageSelflink = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
- /**
- * Gets the value of the metadata property.
- *
- * @return
- * possible object is
- * {@link Metadata }
- *
- */
- public Metadata getMetadata() {
- return metadata;
- }
-
- /**
- * Sets the value of the metadata property.
- *
- * @param value
- * allowed object is
- * {@link Metadata }
- *
- */
- public void setMetadata(Metadata value) {
- this.metadata = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Images.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Images.java
deleted file mode 100644
index f616213..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Images.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}image" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "image"
-})
-@XmlRootElement(name = "images")
-public class Images
- implements AAIDatum
-{
-
- protected List<Image> image;
-
- /**
- * Gets the value of the image property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the image property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getImage().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Image }
- *
- *
- */
- public List<Image> getImage() {
- if (image == null) {
- image = new ArrayList<Image>();
- }
- return this.image;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/IncludeNodeFilter.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/IncludeNodeFilter.java
deleted file mode 100644
index 41b46c1..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/IncludeNodeFilter.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="include-node-type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "includeNodeType"
-})
-@XmlRootElement(name = "include-node-filter")
-public class IncludeNodeFilter
- implements AAIDatum
-{
-
- @XmlElement(name = "include-node-type")
- protected String includeNodeType;
-
- /**
- * Gets the value of the includeNodeType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getIncludeNodeType() {
- return includeNodeType;
- }
-
- /**
- * Sets the value of the includeNodeType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setIncludeNodeType(String value) {
- this.includeNodeType = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InstanceFilter.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InstanceFilter.java
deleted file mode 100644
index 5077c48..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InstanceFilter.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "")
-@XmlRootElement(name = "instance-filter")
-public class InstanceFilter
- implements AAIDatum
-{
-
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InstanceFilters.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InstanceFilters.java
deleted file mode 100644
index 4d4b9cc..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InstanceFilters.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}instance-filter" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "instanceFilter"
-})
-@XmlRootElement(name = "instance-filters")
-public class InstanceFilters
- implements AAIDatum
-{
-
- @XmlElement(name = "instance-filter")
- protected List<InstanceFilter> instanceFilter;
-
- /**
- * Gets the value of the instanceFilter property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the instanceFilter property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getInstanceFilter().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link InstanceFilter }
- *
- *
- */
- public List<InstanceFilter> getInstanceFilter() {
- if (instanceFilter == null) {
- instanceFilter = new ArrayList<InstanceFilter>();
- }
- return this.instanceFilter;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Inventory.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Inventory.java
deleted file mode 100644
index 4ad1de1..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Inventory.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}search" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}actions" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}cloud-infrastructure" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}business" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}service-design-and-creation" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}network" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}aai-internal" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "search",
- "actions",
- "cloudInfrastructure",
- "business",
- "serviceDesignAndCreation",
- "network",
- "aaiInternal"
-})
-@XmlRootElement(name = "inventory")
-public class Inventory
- implements AAIDatum
-{
-
- protected Search search;
- protected Actions actions;
- @XmlElement(name = "cloud-infrastructure")
- protected CloudInfrastructure cloudInfrastructure;
- protected Business business;
- @XmlElement(name = "service-design-and-creation")
- protected ServiceDesignAndCreation serviceDesignAndCreation;
- protected Network network;
- @XmlElement(name = "aai-internal")
- protected AaiInternal aaiInternal;
-
- /**
- * Gets the value of the search property.
- *
- * @return
- * possible object is
- * {@link Search }
- *
- */
- public Search getSearch() {
- return search;
- }
-
- /**
- * Sets the value of the search property.
- *
- * @param value
- * allowed object is
- * {@link Search }
- *
- */
- public void setSearch(Search value) {
- this.search = value;
- }
-
- /**
- * Gets the value of the actions property.
- *
- * @return
- * possible object is
- * {@link Actions }
- *
- */
- public Actions getActions() {
- return actions;
- }
-
- /**
- * Sets the value of the actions property.
- *
- * @param value
- * allowed object is
- * {@link Actions }
- *
- */
- public void setActions(Actions value) {
- this.actions = value;
- }
-
- /**
- * Gets the value of the cloudInfrastructure property.
- *
- * @return
- * possible object is
- * {@link CloudInfrastructure }
- *
- */
- public CloudInfrastructure getCloudInfrastructure() {
- return cloudInfrastructure;
- }
-
- /**
- * Sets the value of the cloudInfrastructure property.
- *
- * @param value
- * allowed object is
- * {@link CloudInfrastructure }
- *
- */
- public void setCloudInfrastructure(CloudInfrastructure value) {
- this.cloudInfrastructure = value;
- }
-
- /**
- * Gets the value of the business property.
- *
- * @return
- * possible object is
- * {@link Business }
- *
- */
- public Business getBusiness() {
- return business;
- }
-
- /**
- * Sets the value of the business property.
- *
- * @param value
- * allowed object is
- * {@link Business }
- *
- */
- public void setBusiness(Business value) {
- this.business = value;
- }
-
- /**
- * Gets the value of the serviceDesignAndCreation property.
- *
- * @return
- * possible object is
- * {@link ServiceDesignAndCreation }
- *
- */
- public ServiceDesignAndCreation getServiceDesignAndCreation() {
- return serviceDesignAndCreation;
- }
-
- /**
- * Sets the value of the serviceDesignAndCreation property.
- *
- * @param value
- * allowed object is
- * {@link ServiceDesignAndCreation }
- *
- */
- public void setServiceDesignAndCreation(ServiceDesignAndCreation value) {
- this.serviceDesignAndCreation = value;
- }
-
- /**
- * Gets the value of the network property.
- *
- * @return
- * possible object is
- * {@link Network }
- *
- */
- public Network getNetwork() {
- return network;
- }
-
- /**
- * Sets the value of the network property.
- *
- * @param value
- * allowed object is
- * {@link Network }
- *
- */
- public void setNetwork(Network value) {
- this.network = value;
- }
-
- /**
- * Gets the value of the aaiInternal property.
- *
- * @return
- * possible object is
- * {@link AaiInternal }
- *
- */
- public AaiInternal getAaiInternal() {
- return aaiInternal;
- }
-
- /**
- * Sets the value of the aaiInternal property.
- *
- * @param value
- * allowed object is
- * {@link AaiInternal }
- *
- */
- public void setAaiInternal(AaiInternal value) {
- this.aaiInternal = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryItem.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryItem.java
deleted file mode 100644
index ad34c65..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryItem.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="inventory-item-type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="inventory-item-link" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}inventory-item-data" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}tagged-inventory-item-list" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "inventoryItemType",
- "inventoryItemLink",
- "inventoryItemData",
- "taggedInventoryItemList"
-})
-@XmlRootElement(name = "inventory-item")
-public class InventoryItem
- implements AAIDatum
-{
-
- @XmlElement(name = "inventory-item-type")
- protected String inventoryItemType;
- @XmlElement(name = "inventory-item-link")
- protected String inventoryItemLink;
- @XmlElement(name = "inventory-item-data")
- protected List<InventoryItemData> inventoryItemData;
- @XmlElement(name = "tagged-inventory-item-list")
- protected List<TaggedInventoryItemList> taggedInventoryItemList;
-
- /**
- * Gets the value of the inventoryItemType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getInventoryItemType() {
- return inventoryItemType;
- }
-
- /**
- * Sets the value of the inventoryItemType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setInventoryItemType(String value) {
- this.inventoryItemType = value;
- }
-
- /**
- * Gets the value of the inventoryItemLink property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getInventoryItemLink() {
- return inventoryItemLink;
- }
-
- /**
- * Sets the value of the inventoryItemLink property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setInventoryItemLink(String value) {
- this.inventoryItemLink = value;
- }
-
- /**
- * Gets the value of the inventoryItemData property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the inventoryItemData property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getInventoryItemData().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link InventoryItemData }
- *
- *
- */
- public List<InventoryItemData> getInventoryItemData() {
- if (inventoryItemData == null) {
- inventoryItemData = new ArrayList<InventoryItemData>();
- }
- return this.inventoryItemData;
- }
-
- /**
- * Gets the value of the taggedInventoryItemList property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the taggedInventoryItemList property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getTaggedInventoryItemList().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link TaggedInventoryItemList }
- *
- *
- */
- public List<TaggedInventoryItemList> getTaggedInventoryItemList() {
- if (taggedInventoryItemList == null) {
- taggedInventoryItemList = new ArrayList<TaggedInventoryItemList>();
- }
- return this.taggedInventoryItemList;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryItemData.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryItemData.java
deleted file mode 100644
index 633e331..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryItemData.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="property-name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="property-value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "propertyName",
- "propertyValue"
-})
-@XmlRootElement(name = "inventory-item-data")
-public class InventoryItemData
- implements AAIDatum
-{
-
- @XmlElement(name = "property-name")
- protected String propertyName;
- @XmlElement(name = "property-value")
- protected String propertyValue;
-
- /**
- * Gets the value of the propertyName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPropertyName() {
- return propertyName;
- }
-
- /**
- * Sets the value of the propertyName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPropertyName(String value) {
- this.propertyName = value;
- }
-
- /**
- * Gets the value of the propertyValue property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPropertyValue() {
- return propertyValue;
- }
-
- /**
- * Sets the value of the propertyValue property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPropertyValue(String value) {
- this.propertyValue = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryResponseItem.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryResponseItem.java
deleted file mode 100644
index f6db4e2..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryResponseItem.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="model-name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}extra-properties" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}inventory-response-items" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "modelName",
- "extraProperties",
- "inventoryResponseItems"
-})
-@XmlRootElement(name = "inventory-response-item")
-public class InventoryResponseItem
- implements AAIDatum
-{
-
- @XmlElement(name = "model-name")
- protected String modelName;
- @XmlElement(name = "extra-properties")
- protected ExtraProperties extraProperties;
- @XmlElement(name = "inventory-response-items")
- protected InventoryResponseItems inventoryResponseItems;
-
- /**
- * Gets the value of the modelName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getModelName() {
- return modelName;
- }
-
- /**
- * Sets the value of the modelName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setModelName(String value) {
- this.modelName = value;
- }
-
- /**
- * Gets the value of the extraProperties property.
- *
- * @return
- * possible object is
- * {@link ExtraProperties }
- *
- */
- public ExtraProperties getExtraProperties() {
- return extraProperties;
- }
-
- /**
- * Sets the value of the extraProperties property.
- *
- * @param value
- * allowed object is
- * {@link ExtraProperties }
- *
- */
- public void setExtraProperties(ExtraProperties value) {
- this.extraProperties = value;
- }
-
- /**
- * Gets the value of the inventoryResponseItems property.
- *
- * @return
- * possible object is
- * {@link InventoryResponseItems }
- *
- */
- public InventoryResponseItems getInventoryResponseItems() {
- return inventoryResponseItems;
- }
-
- /**
- * Sets the value of the inventoryResponseItems property.
- *
- * @param value
- * allowed object is
- * {@link InventoryResponseItems }
- *
- */
- public void setInventoryResponseItems(InventoryResponseItems value) {
- this.inventoryResponseItems = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryResponseItems.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryResponseItems.java
deleted file mode 100644
index 4495909..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryResponseItems.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}inventory-response-item" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "inventoryResponseItem"
-})
-@XmlRootElement(name = "inventory-response-items")
-public class InventoryResponseItems
- implements AAIDatum
-{
-
- @XmlElement(name = "inventory-response-item")
- protected List<InventoryResponseItem> inventoryResponseItem;
-
- /**
- * Gets the value of the inventoryResponseItem property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the inventoryResponseItem property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getInventoryResponseItem().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link InventoryResponseItem }
- *
- *
- */
- public List<InventoryResponseItem> getInventoryResponseItem() {
- if (inventoryResponseItem == null) {
- inventoryResponseItem = new ArrayList<InventoryResponseItem>();
- }
- return this.inventoryResponseItem;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/KeyData.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/KeyData.java
deleted file mode 100644
index fa194c0..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/KeyData.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="key-name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="key-value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "keyName",
- "keyValue"
-})
-@XmlRootElement(name = "key-data")
-public class KeyData
- implements AAIDatum
-{
-
- @XmlElement(name = "key-name")
- protected String keyName;
- @XmlElement(name = "key-value")
- protected String keyValue;
-
- /**
- * Gets the value of the keyName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getKeyName() {
- return keyName;
- }
-
- /**
- * Sets the value of the keyName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setKeyName(String value) {
- this.keyName = value;
- }
-
- /**
- * Gets the value of the keyValue property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getKeyValue() {
- return keyValue;
- }
-
- /**
- * Sets the value of the keyValue property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setKeyValue(String value) {
- this.keyValue = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3InterfaceIpv4AddressList.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3InterfaceIpv4AddressList.java
deleted file mode 100644
index 4c214bb..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3InterfaceIpv4AddressList.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="l3-interface-ipv4-address" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="l3-interface-ipv4-prefix-length" type="{http://www.w3.org/2001/XMLSchema}unsignedInt" minOccurs="0"/&gt;
- * &lt;element name="vlan-id-inner" type="{http://www.w3.org/2001/XMLSchema}unsignedInt" minOccurs="0"/&gt;
- * &lt;element name="vlan-id-outer" type="{http://www.w3.org/2001/XMLSchema}unsignedInt" minOccurs="0"/&gt;
- * &lt;element name="is-floating" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="neutron-network-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="neutron-subnet-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "l3InterfaceIpv4Address",
- "l3InterfaceIpv4PrefixLength",
- "vlanIdInner",
- "vlanIdOuter",
- "isFloating",
- "resourceVersion",
- "neutronNetworkId",
- "neutronSubnetId",
- "relationshipList"
-})
-@XmlRootElement(name = "l3-interface-ipv4-address-list")
-public class L3InterfaceIpv4AddressList
- implements AAIDatum
-{
-
- @XmlElement(name = "l3-interface-ipv4-address", required = true)
- protected String l3InterfaceIpv4Address;
- @XmlElement(name = "l3-interface-ipv4-prefix-length")
- @XmlSchemaType(name = "unsignedInt")
- protected Long l3InterfaceIpv4PrefixLength;
- @XmlElement(name = "vlan-id-inner")
- @XmlSchemaType(name = "unsignedInt")
- protected Long vlanIdInner;
- @XmlElement(name = "vlan-id-outer")
- @XmlSchemaType(name = "unsignedInt")
- protected Long vlanIdOuter;
- @XmlElement(name = "is-floating")
- protected Boolean isFloating;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "neutron-network-id")
- protected String neutronNetworkId;
- @XmlElement(name = "neutron-subnet-id")
- protected String neutronSubnetId;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the l3InterfaceIpv4Address property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getL3InterfaceIpv4Address() {
- return l3InterfaceIpv4Address;
- }
-
- /**
- * Sets the value of the l3InterfaceIpv4Address property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setL3InterfaceIpv4Address(String value) {
- this.l3InterfaceIpv4Address = value;
- }
-
- /**
- * Gets the value of the l3InterfaceIpv4PrefixLength property.
- *
- * @return
- * possible object is
- * {@link Long }
- *
- */
- public Long getL3InterfaceIpv4PrefixLength() {
- return l3InterfaceIpv4PrefixLength;
- }
-
- /**
- * Sets the value of the l3InterfaceIpv4PrefixLength property.
- *
- * @param value
- * allowed object is
- * {@link Long }
- *
- */
- public void setL3InterfaceIpv4PrefixLength(Long value) {
- this.l3InterfaceIpv4PrefixLength = value;
- }
-
- /**
- * Gets the value of the vlanIdInner property.
- *
- * @return
- * possible object is
- * {@link Long }
- *
- */
- public Long getVlanIdInner() {
- return vlanIdInner;
- }
-
- /**
- * Sets the value of the vlanIdInner property.
- *
- * @param value
- * allowed object is
- * {@link Long }
- *
- */
- public void setVlanIdInner(Long value) {
- this.vlanIdInner = value;
- }
-
- /**
- * Gets the value of the vlanIdOuter property.
- *
- * @return
- * possible object is
- * {@link Long }
- *
- */
- public Long getVlanIdOuter() {
- return vlanIdOuter;
- }
-
- /**
- * Sets the value of the vlanIdOuter property.
- *
- * @param value
- * allowed object is
- * {@link Long }
- *
- */
- public void setVlanIdOuter(Long value) {
- this.vlanIdOuter = value;
- }
-
- /**
- * Gets the value of the isFloating property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public Boolean isIsFloating() {
- return isFloating;
- }
-
- /**
- * Sets the value of the isFloating property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- public void setIsFloating(Boolean value) {
- this.isFloating = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the neutronNetworkId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getNeutronNetworkId() {
- return neutronNetworkId;
- }
-
- /**
- * Sets the value of the neutronNetworkId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setNeutronNetworkId(String value) {
- this.neutronNetworkId = value;
- }
-
- /**
- * Gets the value of the neutronSubnetId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getNeutronSubnetId() {
- return neutronSubnetId;
- }
-
- /**
- * Sets the value of the neutronSubnetId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setNeutronSubnetId(String value) {
- this.neutronSubnetId = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3InterfaceIpv6AddressList.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3InterfaceIpv6AddressList.java
deleted file mode 100644
index 4088ee7..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3InterfaceIpv6AddressList.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="l3-interface-ipv6-address" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="l3-interface-ipv6-prefix-length" type="{http://www.w3.org/2001/XMLSchema}unsignedInt" minOccurs="0"/&gt;
- * &lt;element name="vlan-id-inner" type="{http://www.w3.org/2001/XMLSchema}unsignedInt" minOccurs="0"/&gt;
- * &lt;element name="vlan-id-outer" type="{http://www.w3.org/2001/XMLSchema}unsignedInt" minOccurs="0"/&gt;
- * &lt;element name="is-floating" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="neutron-network-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="neutron-subnet-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "l3InterfaceIpv6Address",
- "l3InterfaceIpv6PrefixLength",
- "vlanIdInner",
- "vlanIdOuter",
- "isFloating",
- "resourceVersion",
- "neutronNetworkId",
- "neutronSubnetId",
- "relationshipList"
-})
-@XmlRootElement(name = "l3-interface-ipv6-address-list")
-public class L3InterfaceIpv6AddressList
- implements AAIDatum
-{
-
- @XmlElement(name = "l3-interface-ipv6-address", required = true)
- protected String l3InterfaceIpv6Address;
- @XmlElement(name = "l3-interface-ipv6-prefix-length")
- @XmlSchemaType(name = "unsignedInt")
- protected Long l3InterfaceIpv6PrefixLength;
- @XmlElement(name = "vlan-id-inner")
- @XmlSchemaType(name = "unsignedInt")
- protected Long vlanIdInner;
- @XmlElement(name = "vlan-id-outer")
- @XmlSchemaType(name = "unsignedInt")
- protected Long vlanIdOuter;
- @XmlElement(name = "is-floating")
- protected Boolean isFloating;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "neutron-network-id")
- protected String neutronNetworkId;
- @XmlElement(name = "neutron-subnet-id")
- protected String neutronSubnetId;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the l3InterfaceIpv6Address property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getL3InterfaceIpv6Address() {
- return l3InterfaceIpv6Address;
- }
-
- /**
- * Sets the value of the l3InterfaceIpv6Address property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setL3InterfaceIpv6Address(String value) {
- this.l3InterfaceIpv6Address = value;
- }
-
- /**
- * Gets the value of the l3InterfaceIpv6PrefixLength property.
- *
- * @return
- * possible object is
- * {@link Long }
- *
- */
- public Long getL3InterfaceIpv6PrefixLength() {
- return l3InterfaceIpv6PrefixLength;
- }
-
- /**
- * Sets the value of the l3InterfaceIpv6PrefixLength property.
- *
- * @param value
- * allowed object is
- * {@link Long }
- *
- */
- public void setL3InterfaceIpv6PrefixLength(Long value) {
- this.l3InterfaceIpv6PrefixLength = value;
- }
-
- /**
- * Gets the value of the vlanIdInner property.
- *
- * @return
- * possible object is
- * {@link Long }
- *
- */
- public Long getVlanIdInner() {
- return vlanIdInner;
- }
-
- /**
- * Sets the value of the vlanIdInner property.
- *
- * @param value
- * allowed object is
- * {@link Long }
- *
- */
- public void setVlanIdInner(Long value) {
- this.vlanIdInner = value;
- }
-
- /**
- * Gets the value of the vlanIdOuter property.
- *
- * @return
- * possible object is
- * {@link Long }
- *
- */
- public Long getVlanIdOuter() {
- return vlanIdOuter;
- }
-
- /**
- * Sets the value of the vlanIdOuter property.
- *
- * @param value
- * allowed object is
- * {@link Long }
- *
- */
- public void setVlanIdOuter(Long value) {
- this.vlanIdOuter = value;
- }
-
- /**
- * Gets the value of the isFloating property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public Boolean isIsFloating() {
- return isFloating;
- }
-
- /**
- * Sets the value of the isFloating property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- public void setIsFloating(Boolean value) {
- this.isFloating = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the neutronNetworkId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getNeutronNetworkId() {
- return neutronNetworkId;
- }
-
- /**
- * Sets the value of the neutronNetworkId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setNeutronNetworkId(String value) {
- this.neutronNetworkId = value;
- }
-
- /**
- * Gets the value of the neutronSubnetId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getNeutronSubnetId() {
- return neutronSubnetId;
- }
-
- /**
- * Sets the value of the neutronSubnetId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setNeutronSubnetId(String value) {
- this.neutronSubnetId = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3Network.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3Network.java
deleted file mode 100644
index e1de3ba..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3Network.java
+++ /dev/null
@@ -1,764 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="network-id" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="network-name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="network-type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="network-role" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="network-technology" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="neutron-network-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="is-bound-to-vpn" type="{http://www.w3.org/2001/XMLSchema}boolean"/&gt;
- * &lt;element name="service-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="network-role-instance" type="{http://www.w3.org/2001/XMLSchema}unsignedInt" minOccurs="0"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="orchestration-status" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="heat-stack-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="mso-catalog-key" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="contrail-network-fqdn" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="persona-model-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="persona-model-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="widget-model-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="widget-model-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="physical-network-name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="is-provider-network" type="{http://www.w3.org/2001/XMLSchema}boolean"/&gt;
- * &lt;element name="is-shared-network" type="{http://www.w3.org/2001/XMLSchema}boolean"/&gt;
- * &lt;element name="is-external-network" type="{http://www.w3.org/2001/XMLSchema}boolean"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}subnets" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}ctag-assignments" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}segmentation-assignments" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "networkId",
- "networkName",
- "networkType",
- "networkRole",
- "networkTechnology",
- "neutronNetworkId",
- "isBoundToVpn",
- "serviceId",
- "networkRoleInstance",
- "resourceVersion",
- "orchestrationStatus",
- "heatStackId",
- "msoCatalogKey",
- "contrailNetworkFqdn",
- "personaModelId",
- "personaModelVersion",
- "widgetModelId",
- "widgetModelVersion",
- "physicalNetworkName",
- "isProviderNetwork",
- "isSharedNetwork",
- "isExternalNetwork",
- "subnets",
- "ctagAssignments",
- "segmentationAssignments",
- "relationshipList"
-})
-@XmlRootElement(name = "l3-network")
-public class L3Network
- implements AAIDatum
-{
-
- @XmlElement(name = "network-id", required = true)
- protected String networkId;
- @XmlElement(name = "network-name", required = true)
- protected String networkName;
- @XmlElement(name = "network-type")
- protected String networkType;
- @XmlElement(name = "network-role")
- protected String networkRole;
- @XmlElement(name = "network-technology")
- protected String networkTechnology;
- @XmlElement(name = "neutron-network-id")
- protected String neutronNetworkId;
- @XmlElement(name = "is-bound-to-vpn")
- protected boolean isBoundToVpn;
- @XmlElement(name = "service-id")
- protected String serviceId;
- @XmlElement(name = "network-role-instance")
- @XmlSchemaType(name = "unsignedInt")
- protected Long networkRoleInstance;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "orchestration-status")
- protected String orchestrationStatus;
- @XmlElement(name = "heat-stack-id")
- protected String heatStackId;
- @XmlElement(name = "mso-catalog-key")
- protected String msoCatalogKey;
- @XmlElement(name = "contrail-network-fqdn")
- protected String contrailNetworkFqdn;
- @XmlElement(name = "persona-model-id")
- protected String personaModelId;
- @XmlElement(name = "persona-model-version")
- protected String personaModelVersion;
- @XmlElement(name = "widget-model-id")
- protected String widgetModelId;
- @XmlElement(name = "widget-model-version")
- protected String widgetModelVersion;
- @XmlElement(name = "physical-network-name")
- protected String physicalNetworkName;
- @XmlElement(name = "is-provider-network")
- protected boolean isProviderNetwork;
- @XmlElement(name = "is-shared-network")
- protected boolean isSharedNetwork;
- @XmlElement(name = "is-external-network")
- protected boolean isExternalNetwork;
- protected Subnets subnets;
- @XmlElement(name = "ctag-assignments")
- protected CtagAssignments ctagAssignments;
- @XmlElement(name = "segmentation-assignments")
- protected SegmentationAssignments segmentationAssignments;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the networkId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getNetworkId() {
- return networkId;
- }
-
- /**
- * Sets the value of the networkId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setNetworkId(String value) {
- this.networkId = value;
- }
-
- /**
- * Gets the value of the networkName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getNetworkName() {
- return networkName;
- }
-
- /**
- * Sets the value of the networkName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setNetworkName(String value) {
- this.networkName = value;
- }
-
- /**
- * Gets the value of the networkType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getNetworkType() {
- return networkType;
- }
-
- /**
- * Sets the value of the networkType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setNetworkType(String value) {
- this.networkType = value;
- }
-
- /**
- * Gets the value of the networkRole property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getNetworkRole() {
- return networkRole;
- }
-
- /**
- * Sets the value of the networkRole property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setNetworkRole(String value) {
- this.networkRole = value;
- }
-
- /**
- * Gets the value of the networkTechnology property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getNetworkTechnology() {
- return networkTechnology;
- }
-
- /**
- * Sets the value of the networkTechnology property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setNetworkTechnology(String value) {
- this.networkTechnology = value;
- }
-
- /**
- * Gets the value of the neutronNetworkId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getNeutronNetworkId() {
- return neutronNetworkId;
- }
-
- /**
- * Sets the value of the neutronNetworkId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setNeutronNetworkId(String value) {
- this.neutronNetworkId = value;
- }
-
- /**
- * Gets the value of the isBoundToVpn property.
- *
- */
- public boolean isIsBoundToVpn() {
- return isBoundToVpn;
- }
-
- /**
- * Sets the value of the isBoundToVpn property.
- *
- */
- public void setIsBoundToVpn(boolean value) {
- this.isBoundToVpn = value;
- }
-
- /**
- * Gets the value of the serviceId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getServiceId() {
- return serviceId;
- }
-
- /**
- * Sets the value of the serviceId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setServiceId(String value) {
- this.serviceId = value;
- }
-
- /**
- * Gets the value of the networkRoleInstance property.
- *
- * @return
- * possible object is
- * {@link Long }
- *
- */
- public Long getNetworkRoleInstance() {
- return networkRoleInstance;
- }
-
- /**
- * Sets the value of the networkRoleInstance property.
- *
- * @param value
- * allowed object is
- * {@link Long }
- *
- */
- public void setNetworkRoleInstance(Long value) {
- this.networkRoleInstance = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the orchestrationStatus property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getOrchestrationStatus() {
- return orchestrationStatus;
- }
-
- /**
- * Sets the value of the orchestrationStatus property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setOrchestrationStatus(String value) {
- this.orchestrationStatus = value;
- }
-
- /**
- * Gets the value of the heatStackId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getHeatStackId() {
- return heatStackId;
- }
-
- /**
- * Sets the value of the heatStackId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setHeatStackId(String value) {
- this.heatStackId = value;
- }
-
- /**
- * Gets the value of the msoCatalogKey property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getMsoCatalogKey() {
- return msoCatalogKey;
- }
-
- /**
- * Sets the value of the msoCatalogKey property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setMsoCatalogKey(String value) {
- this.msoCatalogKey = value;
- }
-
- /**
- * Gets the value of the contrailNetworkFqdn property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getContrailNetworkFqdn() {
- return contrailNetworkFqdn;
- }
-
- /**
- * Sets the value of the contrailNetworkFqdn property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setContrailNetworkFqdn(String value) {
- this.contrailNetworkFqdn = value;
- }
-
- /**
- * Gets the value of the personaModelId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPersonaModelId() {
- return personaModelId;
- }
-
- /**
- * Sets the value of the personaModelId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPersonaModelId(String value) {
- this.personaModelId = value;
- }
-
- /**
- * Gets the value of the personaModelVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPersonaModelVersion() {
- return personaModelVersion;
- }
-
- /**
- * Sets the value of the personaModelVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPersonaModelVersion(String value) {
- this.personaModelVersion = value;
- }
-
- /**
- * Gets the value of the widgetModelId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getWidgetModelId() {
- return widgetModelId;
- }
-
- /**
- * Sets the value of the widgetModelId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setWidgetModelId(String value) {
- this.widgetModelId = value;
- }
-
- /**
- * Gets the value of the widgetModelVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getWidgetModelVersion() {
- return widgetModelVersion;
- }
-
- /**
- * Sets the value of the widgetModelVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setWidgetModelVersion(String value) {
- this.widgetModelVersion = value;
- }
-
- /**
- * Gets the value of the physicalNetworkName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPhysicalNetworkName() {
- return physicalNetworkName;
- }
-
- /**
- * Sets the value of the physicalNetworkName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPhysicalNetworkName(String value) {
- this.physicalNetworkName = value;
- }
-
- /**
- * Gets the value of the isProviderNetwork property.
- *
- */
- public boolean isIsProviderNetwork() {
- return isProviderNetwork;
- }
-
- /**
- * Sets the value of the isProviderNetwork property.
- *
- */
- public void setIsProviderNetwork(boolean value) {
- this.isProviderNetwork = value;
- }
-
- /**
- * Gets the value of the isSharedNetwork property.
- *
- */
- public boolean isIsSharedNetwork() {
- return isSharedNetwork;
- }
-
- /**
- * Sets the value of the isSharedNetwork property.
- *
- */
- public void setIsSharedNetwork(boolean value) {
- this.isSharedNetwork = value;
- }
-
- /**
- * Gets the value of the isExternalNetwork property.
- *
- */
- public boolean isIsExternalNetwork() {
- return isExternalNetwork;
- }
-
- /**
- * Sets the value of the isExternalNetwork property.
- *
- */
- public void setIsExternalNetwork(boolean value) {
- this.isExternalNetwork = value;
- }
-
- /**
- * Gets the value of the subnets property.
- *
- * @return
- * possible object is
- * {@link Subnets }
- *
- */
- public Subnets getSubnets() {
- return subnets;
- }
-
- /**
- * Sets the value of the subnets property.
- *
- * @param value
- * allowed object is
- * {@link Subnets }
- *
- */
- public void setSubnets(Subnets value) {
- this.subnets = value;
- }
-
- /**
- * Gets the value of the ctagAssignments property.
- *
- * @return
- * possible object is
- * {@link CtagAssignments }
- *
- */
- public CtagAssignments getCtagAssignments() {
- return ctagAssignments;
- }
-
- /**
- * Sets the value of the ctagAssignments property.
- *
- * @param value
- * allowed object is
- * {@link CtagAssignments }
- *
- */
- public void setCtagAssignments(CtagAssignments value) {
- this.ctagAssignments = value;
- }
-
- /**
- * Gets the value of the segmentationAssignments property.
- *
- * @return
- * possible object is
- * {@link SegmentationAssignments }
- *
- */
- public SegmentationAssignments getSegmentationAssignments() {
- return segmentationAssignments;
- }
-
- /**
- * Sets the value of the segmentationAssignments property.
- *
- * @param value
- * allowed object is
- * {@link SegmentationAssignments }
- *
- */
- public void setSegmentationAssignments(SegmentationAssignments value) {
- this.segmentationAssignments = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3Networks.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3Networks.java
deleted file mode 100644
index 7545e28..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3Networks.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}l3-network" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "l3Network"
-})
-@XmlRootElement(name = "l3-networks")
-public class L3Networks
- implements AAIDatum
-{
-
- @XmlElement(name = "l3-network")
- protected List<L3Network> l3Network;
-
- /**
- * Gets the value of the l3Network property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the l3Network property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getL3Network().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link L3Network }
- *
- *
- */
- public List<L3Network> getL3Network() {
- if (l3Network == null) {
- l3Network = new ArrayList<L3Network>();
- }
- return this.l3Network;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LInterface.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LInterface.java
deleted file mode 100644
index 4f8d28d..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LInterface.java
+++ /dev/null
@@ -1,440 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="interface-name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="interface-role" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="v6-wan-link-ip" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="selflink" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="interface-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="macaddr" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="network-name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="management-option" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}vlans" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}l3-interface-ipv4-address-list" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}l3-interface-ipv6-address-list" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "interfaceName",
- "interfaceRole",
- "v6WanLinkIp",
- "selflink",
- "interfaceId",
- "macaddr",
- "networkName",
- "managementOption",
- "resourceVersion",
- "vlans",
- "relationshipList",
- "l3InterfaceIpv4AddressList",
- "l3InterfaceIpv6AddressList"
-})
-@XmlRootElement(name = "l-interface")
-public class LInterface
- implements AAIDatum
-{
-
- @XmlElement(name = "interface-name", required = true)
- protected String interfaceName;
- @XmlElement(name = "interface-role")
- protected String interfaceRole;
- @XmlElement(name = "v6-wan-link-ip")
- protected String v6WanLinkIp;
- protected String selflink;
- @XmlElement(name = "interface-id")
- protected String interfaceId;
- protected String macaddr;
- @XmlElement(name = "network-name")
- protected String networkName;
- @XmlElement(name = "management-option")
- protected String managementOption;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- protected Vlans vlans;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
- @XmlElement(name = "l3-interface-ipv4-address-list")
- protected List<L3InterfaceIpv4AddressList> l3InterfaceIpv4AddressList;
- @XmlElement(name = "l3-interface-ipv6-address-list")
- protected List<L3InterfaceIpv6AddressList> l3InterfaceIpv6AddressList;
-
- /**
- * Gets the value of the interfaceName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getInterfaceName() {
- return interfaceName;
- }
-
- /**
- * Sets the value of the interfaceName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setInterfaceName(String value) {
- this.interfaceName = value;
- }
-
- /**
- * Gets the value of the interfaceRole property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getInterfaceRole() {
- return interfaceRole;
- }
-
- /**
- * Sets the value of the interfaceRole property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setInterfaceRole(String value) {
- this.interfaceRole = value;
- }
-
- /**
- * Gets the value of the v6WanLinkIp property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getV6WanLinkIp() {
- return v6WanLinkIp;
- }
-
- /**
- * Sets the value of the v6WanLinkIp property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setV6WanLinkIp(String value) {
- this.v6WanLinkIp = value;
- }
-
- /**
- * Gets the value of the selflink property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSelflink() {
- return selflink;
- }
-
- /**
- * Sets the value of the selflink property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSelflink(String value) {
- this.selflink = value;
- }
-
- /**
- * Gets the value of the interfaceId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getInterfaceId() {
- return interfaceId;
- }
-
- /**
- * Sets the value of the interfaceId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setInterfaceId(String value) {
- this.interfaceId = value;
- }
-
- /**
- * Gets the value of the macaddr property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getMacaddr() {
- return macaddr;
- }
-
- /**
- * Sets the value of the macaddr property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setMacaddr(String value) {
- this.macaddr = value;
- }
-
- /**
- * Gets the value of the networkName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getNetworkName() {
- return networkName;
- }
-
- /**
- * Sets the value of the networkName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setNetworkName(String value) {
- this.networkName = value;
- }
-
- /**
- * Gets the value of the managementOption property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getManagementOption() {
- return managementOption;
- }
-
- /**
- * Sets the value of the managementOption property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setManagementOption(String value) {
- this.managementOption = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the vlans property.
- *
- * @return
- * possible object is
- * {@link Vlans }
- *
- */
- public Vlans getVlans() {
- return vlans;
- }
-
- /**
- * Sets the value of the vlans property.
- *
- * @param value
- * allowed object is
- * {@link Vlans }
- *
- */
- public void setVlans(Vlans value) {
- this.vlans = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
- /**
- * Gets the value of the l3InterfaceIpv4AddressList property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the l3InterfaceIpv4AddressList property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getL3InterfaceIpv4AddressList().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link L3InterfaceIpv4AddressList }
- *
- *
- */
- public List<L3InterfaceIpv4AddressList> getL3InterfaceIpv4AddressList() {
- if (l3InterfaceIpv4AddressList == null) {
- l3InterfaceIpv4AddressList = new ArrayList<L3InterfaceIpv4AddressList>();
- }
- return this.l3InterfaceIpv4AddressList;
- }
-
- /**
- * Gets the value of the l3InterfaceIpv6AddressList property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the l3InterfaceIpv6AddressList property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getL3InterfaceIpv6AddressList().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link L3InterfaceIpv6AddressList }
- *
- *
- */
- public List<L3InterfaceIpv6AddressList> getL3InterfaceIpv6AddressList() {
- if (l3InterfaceIpv6AddressList == null) {
- l3InterfaceIpv6AddressList = new ArrayList<L3InterfaceIpv6AddressList>();
- }
- return this.l3InterfaceIpv6AddressList;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LInterfaces.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LInterfaces.java
deleted file mode 100644
index 3609909..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LInterfaces.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}l-interface" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "lInterface"
-})
-@XmlRootElement(name = "l-interfaces")
-public class LInterfaces
- implements AAIDatum
-{
-
- @XmlElement(name = "l-interface")
- protected List<LInterface> lInterface;
-
- /**
- * Gets the value of the lInterface property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the lInterface property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getLInterface().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link LInterface }
- *
- *
- */
- public List<LInterface> getLInterface() {
- if (lInterface == null) {
- lInterface = new ArrayList<LInterface>();
- }
- return this.lInterface;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LagInterface.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LagInterface.java
deleted file mode 100644
index fb8f0ab..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LagInterface.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="interface-name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="speed-value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="speed-units" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}l-interfaces" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "interfaceName",
- "resourceVersion",
- "speedValue",
- "speedUnits",
- "relationshipList",
- "lInterfaces"
-})
-@XmlRootElement(name = "lag-interface")
-public class LagInterface
- implements AAIDatum
-{
-
- @XmlElement(name = "interface-name", required = true)
- protected String interfaceName;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "speed-value")
- protected String speedValue;
- @XmlElement(name = "speed-units")
- protected String speedUnits;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
- @XmlElement(name = "l-interfaces")
- protected LInterfaces lInterfaces;
-
- /**
- * Gets the value of the interfaceName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getInterfaceName() {
- return interfaceName;
- }
-
- /**
- * Sets the value of the interfaceName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setInterfaceName(String value) {
- this.interfaceName = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the speedValue property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSpeedValue() {
- return speedValue;
- }
-
- /**
- * Sets the value of the speedValue property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSpeedValue(String value) {
- this.speedValue = value;
- }
-
- /**
- * Gets the value of the speedUnits property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSpeedUnits() {
- return speedUnits;
- }
-
- /**
- * Sets the value of the speedUnits property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSpeedUnits(String value) {
- this.speedUnits = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
- /**
- * Gets the value of the lInterfaces property.
- *
- * @return
- * possible object is
- * {@link LInterfaces }
- *
- */
- public LInterfaces getLInterfaces() {
- return lInterfaces;
- }
-
- /**
- * Sets the value of the lInterfaces property.
- *
- * @param value
- * allowed object is
- * {@link LInterfaces }
- *
- */
- public void setLInterfaces(LInterfaces value) {
- this.lInterfaces = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LagInterfaces.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LagInterfaces.java
deleted file mode 100644
index 8edd6b7..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LagInterfaces.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}lag-interface" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "lagInterface"
-})
-@XmlRootElement(name = "lag-interfaces")
-public class LagInterfaces
- implements AAIDatum
-{
-
- @XmlElement(name = "lag-interface")
- protected List<LagInterface> lagInterface;
-
- /**
- * Gets the value of the lagInterface property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the lagInterface property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getLagInterface().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link LagInterface }
- *
- *
- */
- public List<LagInterface> getLagInterface() {
- if (lagInterface == null) {
- lagInterface = new ArrayList<LagInterface>();
- }
- return this.lagInterface;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LogicalLink.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LogicalLink.java
deleted file mode 100644
index 5bb3c95..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LogicalLink.java
+++ /dev/null
@@ -1,515 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="link-name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="link-type" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="speed-value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="speed-units" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="ip-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="routing-protocol" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="persona-model-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="persona-model-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="widget-model-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="widget-model-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="operational-status" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="link-role" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="link-name2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="link-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "linkName",
- "linkType",
- "speedValue",
- "speedUnits",
- "ipVersion",
- "routingProtocol",
- "resourceVersion",
- "personaModelId",
- "personaModelVersion",
- "widgetModelId",
- "widgetModelVersion",
- "operationalStatus",
- "linkRole",
- "linkName2",
- "linkId",
- "relationshipList"
-})
-@XmlRootElement(name = "logical-link")
-public class LogicalLink
- implements AAIDatum
-{
-
- @XmlElement(name = "link-name", required = true)
- protected String linkName;
- @XmlElement(name = "link-type", required = true)
- protected String linkType;
- @XmlElement(name = "speed-value")
- protected String speedValue;
- @XmlElement(name = "speed-units")
- protected String speedUnits;
- @XmlElement(name = "ip-version")
- protected String ipVersion;
- @XmlElement(name = "routing-protocol")
- protected String routingProtocol;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "persona-model-id")
- protected String personaModelId;
- @XmlElement(name = "persona-model-version")
- protected String personaModelVersion;
- @XmlElement(name = "widget-model-id")
- protected String widgetModelId;
- @XmlElement(name = "widget-model-version")
- protected String widgetModelVersion;
- @XmlElement(name = "operational-status")
- protected String operationalStatus;
- @XmlElement(name = "link-role")
- protected String linkRole;
- @XmlElement(name = "link-name2")
- protected String linkName2;
- @XmlElement(name = "link-id")
- protected String linkId;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the linkName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getLinkName() {
- return linkName;
- }
-
- /**
- * Sets the value of the linkName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setLinkName(String value) {
- this.linkName = value;
- }
-
- /**
- * Gets the value of the linkType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getLinkType() {
- return linkType;
- }
-
- /**
- * Sets the value of the linkType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setLinkType(String value) {
- this.linkType = value;
- }
-
- /**
- * Gets the value of the speedValue property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSpeedValue() {
- return speedValue;
- }
-
- /**
- * Sets the value of the speedValue property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSpeedValue(String value) {
- this.speedValue = value;
- }
-
- /**
- * Gets the value of the speedUnits property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSpeedUnits() {
- return speedUnits;
- }
-
- /**
- * Sets the value of the speedUnits property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSpeedUnits(String value) {
- this.speedUnits = value;
- }
-
- /**
- * Gets the value of the ipVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getIpVersion() {
- return ipVersion;
- }
-
- /**
- * Sets the value of the ipVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setIpVersion(String value) {
- this.ipVersion = value;
- }
-
- /**
- * Gets the value of the routingProtocol property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getRoutingProtocol() {
- return routingProtocol;
- }
-
- /**
- * Sets the value of the routingProtocol property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setRoutingProtocol(String value) {
- this.routingProtocol = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the personaModelId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPersonaModelId() {
- return personaModelId;
- }
-
- /**
- * Sets the value of the personaModelId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPersonaModelId(String value) {
- this.personaModelId = value;
- }
-
- /**
- * Gets the value of the personaModelVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPersonaModelVersion() {
- return personaModelVersion;
- }
-
- /**
- * Sets the value of the personaModelVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPersonaModelVersion(String value) {
- this.personaModelVersion = value;
- }
-
- /**
- * Gets the value of the widgetModelId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getWidgetModelId() {
- return widgetModelId;
- }
-
- /**
- * Sets the value of the widgetModelId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setWidgetModelId(String value) {
- this.widgetModelId = value;
- }
-
- /**
- * Gets the value of the widgetModelVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getWidgetModelVersion() {
- return widgetModelVersion;
- }
-
- /**
- * Sets the value of the widgetModelVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setWidgetModelVersion(String value) {
- this.widgetModelVersion = value;
- }
-
- /**
- * Gets the value of the operationalStatus property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getOperationalStatus() {
- return operationalStatus;
- }
-
- /**
- * Sets the value of the operationalStatus property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setOperationalStatus(String value) {
- this.operationalStatus = value;
- }
-
- /**
- * Gets the value of the linkRole property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getLinkRole() {
- return linkRole;
- }
-
- /**
- * Sets the value of the linkRole property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setLinkRole(String value) {
- this.linkRole = value;
- }
-
- /**
- * Gets the value of the linkName2 property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getLinkName2() {
- return linkName2;
- }
-
- /**
- * Sets the value of the linkName2 property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setLinkName2(String value) {
- this.linkName2 = value;
- }
-
- /**
- * Gets the value of the linkId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getLinkId() {
- return linkId;
- }
-
- /**
- * Sets the value of the linkId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setLinkId(String value) {
- this.linkId = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LogicalLinks.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LogicalLinks.java
deleted file mode 100644
index 916a012..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LogicalLinks.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}logical-link" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "logicalLink"
-})
-@XmlRootElement(name = "logical-links")
-public class LogicalLinks
- implements AAIDatum
-{
-
- @XmlElement(name = "logical-link")
- protected List<LogicalLink> logicalLink;
-
- /**
- * Gets the value of the logicalLink property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the logicalLink property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getLogicalLink().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link LogicalLink }
- *
- *
- */
- public List<LogicalLink> getLogicalLink() {
- if (logicalLink == null) {
- logicalLink = new ArrayList<LogicalLink>();
- }
- return this.logicalLink;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Metadata.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Metadata.java
deleted file mode 100644
index 512cc83..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Metadata.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}metadatum" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "metadatum"
-})
-@XmlRootElement(name = "metadata")
-public class Metadata
- implements AAIDatum
-{
-
- protected List<Metadatum> metadatum;
-
- /**
- * Gets the value of the metadatum property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the metadatum property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getMetadatum().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Metadatum }
- *
- *
- */
- public List<Metadatum> getMetadatum() {
- if (metadatum == null) {
- metadatum = new ArrayList<Metadatum>();
- }
- return this.metadatum;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Metadatum.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Metadatum.java
deleted file mode 100644
index 2d407ef..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Metadatum.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="metaname" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="metaval" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "metaname",
- "metaval",
- "resourceVersion"
-})
-@XmlRootElement(name = "metadatum")
-public class Metadatum
- implements AAIDatum
-{
-
- @XmlElement(required = true)
- protected String metaname;
- @XmlElement(required = true)
- protected String metaval;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
-
- /**
- * Gets the value of the metaname property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getMetaname() {
- return metaname;
- }
-
- /**
- * Sets the value of the metaname property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setMetaname(String value) {
- this.metaname = value;
- }
-
- /**
- * Gets the value of the metaval property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getMetaval() {
- return metaval;
- }
-
- /**
- * Sets the value of the metaval property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setMetaval(String value) {
- this.metaval = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Model.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Model.java
deleted file mode 100644
index f802b11..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Model.java
+++ /dev/null
@@ -1,346 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="model-name-version-id" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="model-type" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="model-name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="model-id" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="model-version" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="model-description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}model-elements" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}metadata" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "modelNameVersionId",
- "modelType",
- "modelName",
- "modelId",
- "modelVersion",
- "modelDescription",
- "resourceVersion",
- "modelElements",
- "metadata",
- "relationshipList"
-})
-@XmlRootElement(name = "model")
-public class Model
- implements AAIDatum
-{
-
- @XmlElement(name = "model-name-version-id", required = true)
- protected String modelNameVersionId;
- @XmlElement(name = "model-type", required = true)
- protected String modelType;
- @XmlElement(name = "model-name", required = true)
- protected String modelName;
- @XmlElement(name = "model-id", required = true)
- protected String modelId;
- @XmlElement(name = "model-version", required = true)
- protected String modelVersion;
- @XmlElement(name = "model-description")
- protected String modelDescription;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "model-elements")
- protected ModelElements modelElements;
- protected Metadata metadata;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the modelNameVersionId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getModelNameVersionId() {
- return modelNameVersionId;
- }
-
- /**
- * Sets the value of the modelNameVersionId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setModelNameVersionId(String value) {
- this.modelNameVersionId = value;
- }
-
- /**
- * Gets the value of the modelType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getModelType() {
- return modelType;
- }
-
- /**
- * Sets the value of the modelType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setModelType(String value) {
- this.modelType = value;
- }
-
- /**
- * Gets the value of the modelName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getModelName() {
- return modelName;
- }
-
- /**
- * Sets the value of the modelName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setModelName(String value) {
- this.modelName = value;
- }
-
- /**
- * Gets the value of the modelId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getModelId() {
- return modelId;
- }
-
- /**
- * Sets the value of the modelId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setModelId(String value) {
- this.modelId = value;
- }
-
- /**
- * Gets the value of the modelVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getModelVersion() {
- return modelVersion;
- }
-
- /**
- * Sets the value of the modelVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setModelVersion(String value) {
- this.modelVersion = value;
- }
-
- /**
- * Gets the value of the modelDescription property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getModelDescription() {
- return modelDescription;
- }
-
- /**
- * Sets the value of the modelDescription property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setModelDescription(String value) {
- this.modelDescription = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the modelElements property.
- *
- * @return
- * possible object is
- * {@link ModelElements }
- *
- */
- public ModelElements getModelElements() {
- return modelElements;
- }
-
- /**
- * Sets the value of the modelElements property.
- *
- * @param value
- * allowed object is
- * {@link ModelElements }
- *
- */
- public void setModelElements(ModelElements value) {
- this.modelElements = value;
- }
-
- /**
- * Gets the value of the metadata property.
- *
- * @return
- * possible object is
- * {@link Metadata }
- *
- */
- public Metadata getMetadata() {
- return metadata;
- }
-
- /**
- * Sets the value of the metadata property.
- *
- * @param value
- * allowed object is
- * {@link Metadata }
- *
- */
- public void setMetadata(Metadata value) {
- this.metadata = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelAndNamedQuerySearch.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelAndNamedQuerySearch.java
deleted file mode 100644
index 89581aa..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelAndNamedQuerySearch.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}query-parameters" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}instance-filters" minOccurs="0"/&gt;
- * &lt;element name="top-node-type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "queryParameters",
- "instanceFilters",
- "topNodeType"
-})
-@XmlRootElement(name = "model-and-named-query-search")
-public class ModelAndNamedQuerySearch
- implements AAIDatum
-{
-
- @XmlElement(name = "query-parameters")
- protected QueryParameters queryParameters;
- @XmlElement(name = "instance-filters")
- protected InstanceFilters instanceFilters;
- @XmlElement(name = "top-node-type")
- protected String topNodeType;
-
- /**
- * Gets the value of the queryParameters property.
- *
- * @return
- * possible object is
- * {@link QueryParameters }
- *
- */
- public QueryParameters getQueryParameters() {
- return queryParameters;
- }
-
- /**
- * Sets the value of the queryParameters property.
- *
- * @param value
- * allowed object is
- * {@link QueryParameters }
- *
- */
- public void setQueryParameters(QueryParameters value) {
- this.queryParameters = value;
- }
-
- /**
- * Gets the value of the instanceFilters property.
- *
- * @return
- * possible object is
- * {@link InstanceFilters }
- *
- */
- public InstanceFilters getInstanceFilters() {
- return instanceFilters;
- }
-
- /**
- * Sets the value of the instanceFilters property.
- *
- * @param value
- * allowed object is
- * {@link InstanceFilters }
- *
- */
- public void setInstanceFilters(InstanceFilters value) {
- this.instanceFilters = value;
- }
-
- /**
- * Gets the value of the topNodeType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getTopNodeType() {
- return topNodeType;
- }
-
- /**
- * Sets the value of the topNodeType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setTopNodeType(String value) {
- this.topNodeType = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelConstraint.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelConstraint.java
deleted file mode 100644
index f93d14b..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelConstraint.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="model-constraint-uuid" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="constrained-element-set-uuid-to-replace" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}constrained-element-sets" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "modelConstraintUuid",
- "constrainedElementSetUuidToReplace",
- "constrainedElementSets"
-})
-@XmlRootElement(name = "model-constraint")
-public class ModelConstraint
- implements AAIDatum
-{
-
- @XmlElement(name = "model-constraint-uuid", required = true)
- protected String modelConstraintUuid;
- @XmlElement(name = "constrained-element-set-uuid-to-replace", required = true)
- protected String constrainedElementSetUuidToReplace;
- @XmlElement(name = "constrained-element-sets")
- protected ConstrainedElementSets constrainedElementSets;
-
- /**
- * Gets the value of the modelConstraintUuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getModelConstraintUuid() {
- return modelConstraintUuid;
- }
-
- /**
- * Sets the value of the modelConstraintUuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setModelConstraintUuid(String value) {
- this.modelConstraintUuid = value;
- }
-
- /**
- * Gets the value of the constrainedElementSetUuidToReplace property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getConstrainedElementSetUuidToReplace() {
- return constrainedElementSetUuidToReplace;
- }
-
- /**
- * Sets the value of the constrainedElementSetUuidToReplace property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setConstrainedElementSetUuidToReplace(String value) {
- this.constrainedElementSetUuidToReplace = value;
- }
-
- /**
- * Gets the value of the constrainedElementSets property.
- *
- * @return
- * possible object is
- * {@link ConstrainedElementSets }
- *
- */
- public ConstrainedElementSets getConstrainedElementSets() {
- return constrainedElementSets;
- }
-
- /**
- * Sets the value of the constrainedElementSets property.
- *
- * @param value
- * allowed object is
- * {@link ConstrainedElementSets }
- *
- */
- public void setConstrainedElementSets(ConstrainedElementSets value) {
- this.constrainedElementSets = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelConstraints.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelConstraints.java
deleted file mode 100644
index 8b17467..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelConstraints.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}model-constraint" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "modelConstraint"
-})
-@XmlRootElement(name = "model-constraints")
-public class ModelConstraints
- implements AAIDatum
-{
-
- @XmlElement(name = "model-constraint")
- protected List<ModelConstraint> modelConstraint;
-
- /**
- * Gets the value of the modelConstraint property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the modelConstraint property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getModelConstraint().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link ModelConstraint }
- *
- *
- */
- public List<ModelConstraint> getModelConstraint() {
- if (modelConstraint == null) {
- modelConstraint = new ArrayList<ModelConstraint>();
- }
- return this.modelConstraint;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelElement.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelElement.java
deleted file mode 100644
index 819bbd9..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelElement.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="model-element-uuid" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="new-data-del-flag" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="cardinality" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="linkage-points" minOccurs="0"&gt;
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="linkage-point" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * &lt;/element&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}model-elements" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}model-constraints" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "modelElementUuid",
- "newDataDelFlag",
- "cardinality",
- "linkagePoints",
- "resourceVersion",
- "modelElements",
- "modelConstraints",
- "relationshipList"
-})
-@XmlRootElement(name = "model-element")
-public class ModelElement
- implements AAIDatum
-{
-
- @XmlElement(name = "model-element-uuid", required = true)
- protected String modelElementUuid;
- @XmlElement(name = "new-data-del-flag", required = true)
- protected String newDataDelFlag;
- @XmlElement(required = true)
- protected String cardinality;
- @XmlElement(name = "linkage-points")
- protected ModelElement.LinkagePoints linkagePoints;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "model-elements")
- protected ModelElements modelElements;
- @XmlElement(name = "model-constraints")
- protected ModelConstraints modelConstraints;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the modelElementUuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getModelElementUuid() {
- return modelElementUuid;
- }
-
- /**
- * Sets the value of the modelElementUuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setModelElementUuid(String value) {
- this.modelElementUuid = value;
- }
-
- /**
- * Gets the value of the newDataDelFlag property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getNewDataDelFlag() {
- return newDataDelFlag;
- }
-
- /**
- * Sets the value of the newDataDelFlag property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setNewDataDelFlag(String value) {
- this.newDataDelFlag = value;
- }
-
- /**
- * Gets the value of the cardinality property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getCardinality() {
- return cardinality;
- }
-
- /**
- * Sets the value of the cardinality property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setCardinality(String value) {
- this.cardinality = value;
- }
-
- /**
- * Gets the value of the linkagePoints property.
- *
- * @return
- * possible object is
- * {@link ModelElement.LinkagePoints }
- *
- */
- public ModelElement.LinkagePoints getLinkagePoints() {
- return linkagePoints;
- }
-
- /**
- * Sets the value of the linkagePoints property.
- *
- * @param value
- * allowed object is
- * {@link ModelElement.LinkagePoints }
- *
- */
- public void setLinkagePoints(ModelElement.LinkagePoints value) {
- this.linkagePoints = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the modelElements property.
- *
- * @return
- * possible object is
- * {@link ModelElements }
- *
- */
- public ModelElements getModelElements() {
- return modelElements;
- }
-
- /**
- * Sets the value of the modelElements property.
- *
- * @param value
- * allowed object is
- * {@link ModelElements }
- *
- */
- public void setModelElements(ModelElements value) {
- this.modelElements = value;
- }
-
- /**
- * Gets the value of the modelConstraints property.
- *
- * @return
- * possible object is
- * {@link ModelConstraints }
- *
- */
- public ModelConstraints getModelConstraints() {
- return modelConstraints;
- }
-
- /**
- * Sets the value of the modelConstraints property.
- *
- * @param value
- * allowed object is
- * {@link ModelConstraints }
- *
- */
- public void setModelConstraints(ModelConstraints value) {
- this.modelConstraints = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-
- /**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="linkage-point" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
- @XmlAccessorType(XmlAccessType.FIELD)
- @XmlType(name = "", propOrder = {
- "linkagePoint"
- })
- public static class LinkagePoints
- implements AAIDatum
- {
-
- @XmlElement(name = "linkage-point")
- protected List<String> linkagePoint;
-
- /**
- * Gets the value of the linkagePoint property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the linkagePoint property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getLinkagePoint().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link String }
- *
- *
- */
- public List<String> getLinkagePoint() {
- if (linkagePoint == null) {
- linkagePoint = new ArrayList<String>();
- }
- return this.linkagePoint;
- }
-
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelElements.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelElements.java
deleted file mode 100644
index c6d6056..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelElements.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}model-element" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "modelElement"
-})
-@XmlRootElement(name = "model-elements")
-public class ModelElements
- implements AAIDatum
-{
-
- @XmlElement(name = "model-element")
- protected List<ModelElement> modelElement;
-
- /**
- * Gets the value of the modelElement property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the modelElement property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getModelElement().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link ModelElement }
- *
- *
- */
- public List<ModelElement> getModelElement() {
- if (modelElement == null) {
- modelElement = new ArrayList<ModelElement>();
- }
- return this.modelElement;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Models.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Models.java
deleted file mode 100644
index 628dfe1..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Models.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}model" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "model"
-})
-@XmlRootElement(name = "models")
-public class Models
- implements AAIDatum
-{
-
- protected List<Model> model;
-
- /**
- * Gets the value of the model property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the model property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getModel().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Model }
- *
- *
- */
- public List<Model> getModel() {
- if (model == null) {
- model = new ArrayList<Model>();
- }
- return this.model;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQueries.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQueries.java
deleted file mode 100644
index 057dd6b..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQueries.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}named-query" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "namedQuery"
-})
-@XmlRootElement(name = "named-queries")
-public class NamedQueries
- implements AAIDatum
-{
-
- @XmlElement(name = "named-query")
- protected List<NamedQuery> namedQuery;
-
- /**
- * Gets the value of the namedQuery property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the namedQuery property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getNamedQuery().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link NamedQuery }
- *
- *
- */
- public List<NamedQuery> getNamedQuery() {
- if (namedQuery == null) {
- namedQuery = new ArrayList<NamedQuery>();
- }
- return this.namedQuery;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQuery.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQuery.java
deleted file mode 100644
index e5cbfc6..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQuery.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="named-query-uuid" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="named-query-name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="named-query-version" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="required-input-params" minOccurs="0"&gt;
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="required-input-param" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * &lt;/element&gt;
- * &lt;element name="description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}named-query-elements" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "namedQueryUuid",
- "namedQueryName",
- "namedQueryVersion",
- "requiredInputParams",
- "description",
- "resourceVersion",
- "namedQueryElements",
- "relationshipList"
-})
-@XmlRootElement(name = "named-query")
-public class NamedQuery
- implements AAIDatum
-{
-
- @XmlElement(name = "named-query-uuid", required = true)
- protected String namedQueryUuid;
- @XmlElement(name = "named-query-name", required = true)
- protected String namedQueryName;
- @XmlElement(name = "named-query-version", required = true)
- protected String namedQueryVersion;
- @XmlElement(name = "required-input-params")
- protected NamedQuery.RequiredInputParams requiredInputParams;
- protected String description;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "named-query-elements")
- protected NamedQueryElements namedQueryElements;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the namedQueryUuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getNamedQueryUuid() {
- return namedQueryUuid;
- }
-
- /**
- * Sets the value of the namedQueryUuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setNamedQueryUuid(String value) {
- this.namedQueryUuid = value;
- }
-
- /**
- * Gets the value of the namedQueryName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getNamedQueryName() {
- return namedQueryName;
- }
-
- /**
- * Sets the value of the namedQueryName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setNamedQueryName(String value) {
- this.namedQueryName = value;
- }
-
- /**
- * Gets the value of the namedQueryVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getNamedQueryVersion() {
- return namedQueryVersion;
- }
-
- /**
- * Sets the value of the namedQueryVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setNamedQueryVersion(String value) {
- this.namedQueryVersion = value;
- }
-
- /**
- * Gets the value of the requiredInputParams property.
- *
- * @return
- * possible object is
- * {@link NamedQuery.RequiredInputParams }
- *
- */
- public NamedQuery.RequiredInputParams getRequiredInputParams() {
- return requiredInputParams;
- }
-
- /**
- * Sets the value of the requiredInputParams property.
- *
- * @param value
- * allowed object is
- * {@link NamedQuery.RequiredInputParams }
- *
- */
- public void setRequiredInputParams(NamedQuery.RequiredInputParams value) {
- this.requiredInputParams = value;
- }
-
- /**
- * Gets the value of the description property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Sets the value of the description property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setDescription(String value) {
- this.description = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the namedQueryElements property.
- *
- * @return
- * possible object is
- * {@link NamedQueryElements }
- *
- */
- public NamedQueryElements getNamedQueryElements() {
- return namedQueryElements;
- }
-
- /**
- * Sets the value of the namedQueryElements property.
- *
- * @param value
- * allowed object is
- * {@link NamedQueryElements }
- *
- */
- public void setNamedQueryElements(NamedQueryElements value) {
- this.namedQueryElements = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-
- /**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="required-input-param" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
- @XmlAccessorType(XmlAccessType.FIELD)
- @XmlType(name = "", propOrder = {
- "requiredInputParam"
- })
- public static class RequiredInputParams
- implements AAIDatum
- {
-
- @XmlElement(name = "required-input-param")
- protected List<String> requiredInputParam;
-
- /**
- * Gets the value of the requiredInputParam property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the requiredInputParam property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getRequiredInputParam().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link String }
- *
- *
- */
- public List<String> getRequiredInputParam() {
- if (requiredInputParam == null) {
- requiredInputParam = new ArrayList<String>();
- }
- return this.requiredInputParam;
- }
-
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQueryElement.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQueryElement.java
deleted file mode 100644
index 0cf4a84..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQueryElement.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="named-query-element-uuid" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="property-collect-list" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="property-limit-desc" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="do-not-output" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}named-query-elements" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}related-lookups" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}property-constraints" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "namedQueryElementUuid",
- "propertyCollectList",
- "resourceVersion",
- "propertyLimitDesc",
- "doNotOutput",
- "namedQueryElements",
- "relatedLookups",
- "propertyConstraints",
- "relationshipList"
-})
-@XmlRootElement(name = "named-query-element")
-public class NamedQueryElement
- implements AAIDatum
-{
-
- @XmlElement(name = "named-query-element-uuid", required = true)
- protected String namedQueryElementUuid;
- @XmlElement(name = "property-collect-list")
- protected List<String> propertyCollectList;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "property-limit-desc")
- protected String propertyLimitDesc;
- @XmlElement(name = "do-not-output")
- protected String doNotOutput;
- @XmlElement(name = "named-query-elements")
- protected NamedQueryElements namedQueryElements;
- @XmlElement(name = "related-lookups")
- protected RelatedLookups relatedLookups;
- @XmlElement(name = "property-constraints")
- protected PropertyConstraints propertyConstraints;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the namedQueryElementUuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getNamedQueryElementUuid() {
- return namedQueryElementUuid;
- }
-
- /**
- * Sets the value of the namedQueryElementUuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setNamedQueryElementUuid(String value) {
- this.namedQueryElementUuid = value;
- }
-
- /**
- * Gets the value of the propertyCollectList property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the propertyCollectList property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getPropertyCollectList().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link String }
- *
- *
- */
- public List<String> getPropertyCollectList() {
- if (propertyCollectList == null) {
- propertyCollectList = new ArrayList<String>();
- }
- return this.propertyCollectList;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the propertyLimitDesc property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPropertyLimitDesc() {
- return propertyLimitDesc;
- }
-
- /**
- * Sets the value of the propertyLimitDesc property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPropertyLimitDesc(String value) {
- this.propertyLimitDesc = value;
- }
-
- /**
- * Gets the value of the doNotOutput property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getDoNotOutput() {
- return doNotOutput;
- }
-
- /**
- * Sets the value of the doNotOutput property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setDoNotOutput(String value) {
- this.doNotOutput = value;
- }
-
- /**
- * Gets the value of the namedQueryElements property.
- *
- * @return
- * possible object is
- * {@link NamedQueryElements }
- *
- */
- public NamedQueryElements getNamedQueryElements() {
- return namedQueryElements;
- }
-
- /**
- * Sets the value of the namedQueryElements property.
- *
- * @param value
- * allowed object is
- * {@link NamedQueryElements }
- *
- */
- public void setNamedQueryElements(NamedQueryElements value) {
- this.namedQueryElements = value;
- }
-
- /**
- * Gets the value of the relatedLookups property.
- *
- * @return
- * possible object is
- * {@link RelatedLookups }
- *
- */
- public RelatedLookups getRelatedLookups() {
- return relatedLookups;
- }
-
- /**
- * Sets the value of the relatedLookups property.
- *
- * @param value
- * allowed object is
- * {@link RelatedLookups }
- *
- */
- public void setRelatedLookups(RelatedLookups value) {
- this.relatedLookups = value;
- }
-
- /**
- * Gets the value of the propertyConstraints property.
- *
- * @return
- * possible object is
- * {@link PropertyConstraints }
- *
- */
- public PropertyConstraints getPropertyConstraints() {
- return propertyConstraints;
- }
-
- /**
- * Sets the value of the propertyConstraints property.
- *
- * @param value
- * allowed object is
- * {@link PropertyConstraints }
- *
- */
- public void setPropertyConstraints(PropertyConstraints value) {
- this.propertyConstraints = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQueryElements.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQueryElements.java
deleted file mode 100644
index 5f0cfc8..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQueryElements.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}named-query-element" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "namedQueryElement"
-})
-@XmlRootElement(name = "named-query-elements")
-public class NamedQueryElements
- implements AAIDatum
-{
-
- @XmlElement(name = "named-query-element")
- protected List<NamedQueryElement> namedQueryElement;
-
- /**
- * Gets the value of the namedQueryElement property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the namedQueryElement property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getNamedQueryElement().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link NamedQueryElement }
- *
- *
- */
- public List<NamedQueryElement> getNamedQueryElement() {
- if (namedQueryElement == null) {
- namedQueryElement = new ArrayList<NamedQueryElement>();
- }
- return this.namedQueryElement;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Network.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Network.java
deleted file mode 100644
index daf0bcd..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Network.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}logical-links" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}vnfcs" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}l3-networks" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}generic-vnfs" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}pnfs" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}physical-links" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "logicalLinks",
- "vnfcs",
- "l3Networks",
- "genericVnfs",
- "pnfs",
- "physicalLinks"
-})
-@XmlRootElement(name = "network")
-public class Network
- implements AAIDatum
-{
-
- @XmlElement(name = "logical-links")
- protected LogicalLinks logicalLinks;
- protected Vnfcs vnfcs;
- @XmlElement(name = "l3-networks")
- protected L3Networks l3Networks;
- @XmlElement(name = "generic-vnfs")
- protected GenericVnfs genericVnfs;
- protected Pnfs pnfs;
- @XmlElement(name = "physical-links")
- protected PhysicalLinks physicalLinks;
-
- /**
- * Gets the value of the logicalLinks property.
- *
- * @return
- * possible object is
- * {@link LogicalLinks }
- *
- */
- public LogicalLinks getLogicalLinks() {
- return logicalLinks;
- }
-
- /**
- * Sets the value of the logicalLinks property.
- *
- * @param value
- * allowed object is
- * {@link LogicalLinks }
- *
- */
- public void setLogicalLinks(LogicalLinks value) {
- this.logicalLinks = value;
- }
-
- /**
- * Gets the value of the vnfcs property.
- *
- * @return
- * possible object is
- * {@link Vnfcs }
- *
- */
- public Vnfcs getVnfcs() {
- return vnfcs;
- }
-
- /**
- * Sets the value of the vnfcs property.
- *
- * @param value
- * allowed object is
- * {@link Vnfcs }
- *
- */
- public void setVnfcs(Vnfcs value) {
- this.vnfcs = value;
- }
-
- /**
- * Gets the value of the l3Networks property.
- *
- * @return
- * possible object is
- * {@link L3Networks }
- *
- */
- public L3Networks getL3Networks() {
- return l3Networks;
- }
-
- /**
- * Sets the value of the l3Networks property.
- *
- * @param value
- * allowed object is
- * {@link L3Networks }
- *
- */
- public void setL3Networks(L3Networks value) {
- this.l3Networks = value;
- }
-
- /**
- * Gets the value of the genericVnfs property.
- *
- * @return
- * possible object is
- * {@link GenericVnfs }
- *
- */
- public GenericVnfs getGenericVnfs() {
- return genericVnfs;
- }
-
- /**
- * Sets the value of the genericVnfs property.
- *
- * @param value
- * allowed object is
- * {@link GenericVnfs }
- *
- */
- public void setGenericVnfs(GenericVnfs value) {
- this.genericVnfs = value;
- }
-
- /**
- * Gets the value of the pnfs property.
- *
- * @return
- * possible object is
- * {@link Pnfs }
- *
- */
- public Pnfs getPnfs() {
- return pnfs;
- }
-
- /**
- * Sets the value of the pnfs property.
- *
- * @param value
- * allowed object is
- * {@link Pnfs }
- *
- */
- public void setPnfs(Pnfs value) {
- this.pnfs = value;
- }
-
- /**
- * Gets the value of the physicalLinks property.
- *
- * @return
- * possible object is
- * {@link PhysicalLinks }
- *
- */
- public PhysicalLinks getPhysicalLinks() {
- return physicalLinks;
- }
-
- /**
- * Sets the value of the physicalLinks property.
- *
- * @param value
- * allowed object is
- * {@link PhysicalLinks }
- *
- */
- public void setPhysicalLinks(PhysicalLinks value) {
- this.physicalLinks = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NotificationEvent.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NotificationEvent.java
deleted file mode 100644
index d3fac56..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NotificationEvent.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="cambria.partition" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}notification-event-header" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "cambriaPartition",
- "notificationEventHeader"
-})
-@XmlRootElement(name = "notification-event")
-public class NotificationEvent
- implements AAIDatum
-{
-
- @XmlElement(name = "cambria.partition")
- protected String cambriaPartition;
- @XmlElement(name = "notification-event-header")
- protected NotificationEventHeader notificationEventHeader;
-
- /**
- * Gets the value of the cambriaPartition property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getCambriaPartition() {
- return cambriaPartition;
- }
-
- /**
- * Sets the value of the cambriaPartition property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setCambriaPartition(String value) {
- this.cambriaPartition = value;
- }
-
- /**
- * Gets the value of the notificationEventHeader property.
- *
- * @return
- * possible object is
- * {@link NotificationEventHeader }
- *
- */
- public NotificationEventHeader getNotificationEventHeader() {
- return notificationEventHeader;
- }
-
- /**
- * Sets the value of the notificationEventHeader property.
- *
- * @param value
- * allowed object is
- * {@link NotificationEventHeader }
- *
- */
- public void setNotificationEventHeader(NotificationEventHeader value) {
- this.notificationEventHeader = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NotificationEventHeader.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NotificationEventHeader.java
deleted file mode 100644
index 8d1ff21..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NotificationEventHeader.java
+++ /dev/null
@@ -1,424 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="timestamp" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="source-name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="domain" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="sequence-number" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="severity" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="event-type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="action" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="entity-type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="top-entity-type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="entity-link" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="status" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "id",
- "timestamp",
- "sourceName",
- "domain",
- "sequenceNumber",
- "severity",
- "eventType",
- "version",
- "action",
- "entityType",
- "topEntityType",
- "entityLink",
- "status"
-})
-@XmlRootElement(name = "notification-event-header")
-public class NotificationEventHeader
- implements AAIDatum
-{
-
- protected String id;
- protected String timestamp;
- @XmlElement(name = "source-name")
- protected String sourceName;
- protected String domain;
- @XmlElement(name = "sequence-number")
- protected String sequenceNumber;
- protected String severity;
- @XmlElement(name = "event-type")
- protected String eventType;
- protected String version;
- protected String action;
- @XmlElement(name = "entity-type")
- protected String entityType;
- @XmlElement(name = "top-entity-type")
- protected String topEntityType;
- @XmlElement(name = "entity-link")
- protected String entityLink;
- protected String status;
-
- /**
- * Gets the value of the id property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getId() {
- return id;
- }
-
- /**
- * Sets the value of the id property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setId(String value) {
- this.id = value;
- }
-
- /**
- * Gets the value of the timestamp property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getTimestamp() {
- return timestamp;
- }
-
- /**
- * Sets the value of the timestamp property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setTimestamp(String value) {
- this.timestamp = value;
- }
-
- /**
- * Gets the value of the sourceName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSourceName() {
- return sourceName;
- }
-
- /**
- * Sets the value of the sourceName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSourceName(String value) {
- this.sourceName = value;
- }
-
- /**
- * Gets the value of the domain property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getDomain() {
- return domain;
- }
-
- /**
- * Sets the value of the domain property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setDomain(String value) {
- this.domain = value;
- }
-
- /**
- * Gets the value of the sequenceNumber property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSequenceNumber() {
- return sequenceNumber;
- }
-
- /**
- * Sets the value of the sequenceNumber property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSequenceNumber(String value) {
- this.sequenceNumber = value;
- }
-
- /**
- * Gets the value of the severity property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSeverity() {
- return severity;
- }
-
- /**
- * Sets the value of the severity property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSeverity(String value) {
- this.severity = value;
- }
-
- /**
- * Gets the value of the eventType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getEventType() {
- return eventType;
- }
-
- /**
- * Sets the value of the eventType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setEventType(String value) {
- this.eventType = value;
- }
-
- /**
- * Gets the value of the version property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getVersion() {
- return version;
- }
-
- /**
- * Sets the value of the version property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVersion(String value) {
- this.version = value;
- }
-
- /**
- * Gets the value of the action property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getAction() {
- return action;
- }
-
- /**
- * Sets the value of the action property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setAction(String value) {
- this.action = value;
- }
-
- /**
- * Gets the value of the entityType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getEntityType() {
- return entityType;
- }
-
- /**
- * Sets the value of the entityType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setEntityType(String value) {
- this.entityType = value;
- }
-
- /**
- * Gets the value of the topEntityType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getTopEntityType() {
- return topEntityType;
- }
-
- /**
- * Sets the value of the topEntityType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setTopEntityType(String value) {
- this.topEntityType = value;
- }
-
- /**
- * Gets the value of the entityLink property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getEntityLink() {
- return entityLink;
- }
-
- /**
- * Sets the value of the entityLink property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setEntityLink(String value) {
- this.entityLink = value;
- }
-
- /**
- * Gets the value of the status property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getStatus() {
- return status;
- }
-
- /**
- * Sets the value of the status property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setStatus(String value) {
- this.status = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Notify.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Notify.java
deleted file mode 100644
index da1ccb6..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Notify.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="event-id" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="node-type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="event-trigger" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}key-data" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;element name="selflink" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "eventId",
- "nodeType",
- "eventTrigger",
- "keyData",
- "selflink"
-})
-@XmlRootElement(name = "notify")
-public class Notify
- implements AAIDatum
-{
-
- @XmlElement(name = "event-id", required = true)
- protected String eventId;
- @XmlElement(name = "node-type")
- protected String nodeType;
- @XmlElement(name = "event-trigger")
- protected String eventTrigger;
- @XmlElement(name = "key-data")
- protected List<KeyData> keyData;
- protected String selflink;
-
- /**
- * Gets the value of the eventId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getEventId() {
- return eventId;
- }
-
- /**
- * Sets the value of the eventId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setEventId(String value) {
- this.eventId = value;
- }
-
- /**
- * Gets the value of the nodeType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getNodeType() {
- return nodeType;
- }
-
- /**
- * Sets the value of the nodeType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setNodeType(String value) {
- this.nodeType = value;
- }
-
- /**
- * Gets the value of the eventTrigger property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getEventTrigger() {
- return eventTrigger;
- }
-
- /**
- * Sets the value of the eventTrigger property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setEventTrigger(String value) {
- this.eventTrigger = value;
- }
-
- /**
- * Gets the value of the keyData property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the keyData property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getKeyData().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link KeyData }
- *
- *
- */
- public List<KeyData> getKeyData() {
- if (keyData == null) {
- keyData = new ArrayList<KeyData>();
- }
- return this.keyData;
- }
-
- /**
- * Gets the value of the selflink property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSelflink() {
- return selflink;
- }
-
- /**
- * Sets the value of the selflink property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSelflink(String value) {
- this.selflink = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ObjectFactory.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ObjectFactory.java
deleted file mode 100644
index 37786a7..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ObjectFactory.java
+++ /dev/null
@@ -1,1036 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlRegistry;
-
-
-/**
- * This object contains factory methods for each
- * Java content interface and Java element interface
- * generated in the org.openecomp.aai.inventory.v8 package.
- * <p>An ObjectFactory allows you to programatically
- * construct new instances of the Java representation
- * for XML content. The Java representation of XML
- * content can consist of schema derived interfaces
- * and classes representing the binding of schema
- * type definitions, element declarations and model
- * groups. Factory methods for each of these are
- * provided in this class.
- *
- */
-@XmlRegistry
-public class ObjectFactory {
-
-
- /**
- * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.openecomp.aai.inventory.v8
- *
- */
- public ObjectFactory() {
- }
-
- /**
- * Create an instance of {@link ModelElement }
- *
- */
- public ModelElement createModelElement() {
- return new ModelElement();
- }
-
- /**
- * Create an instance of {@link NamedQuery }
- *
- */
- public NamedQuery createNamedQuery() {
- return new NamedQuery();
- }
-
- /**
- * Create an instance of {@link ResultData }
- *
- */
- public ResultData createResultData() {
- return new ResultData();
- }
-
- /**
- * Create an instance of {@link SearchResults }
- *
- */
- public SearchResults createSearchResults() {
- return new SearchResults();
- }
-
- /**
- * Create an instance of {@link Search }
- *
- */
- public Search createSearch() {
- return new Search();
- }
-
- /**
- * Create an instance of {@link UpdateNodeKey }
- *
- */
- public UpdateNodeKey createUpdateNodeKey() {
- return new UpdateNodeKey();
- }
-
- /**
- * Create an instance of {@link ActionData }
- *
- */
- public ActionData createActionData() {
- return new ActionData();
- }
-
- /**
- * Create an instance of {@link Action }
- *
- */
- public Action createAction() {
- return new Action();
- }
-
- /**
- * Create an instance of {@link Update }
- *
- */
- public Update createUpdate() {
- return new Update();
- }
-
- /**
- * Create an instance of {@link KeyData }
- *
- */
- public KeyData createKeyData() {
- return new KeyData();
- }
-
- /**
- * Create an instance of {@link Notify }
- *
- */
- public Notify createNotify() {
- return new Notify();
- }
-
- /**
- * Create an instance of {@link Actions }
- *
- */
- public Actions createActions() {
- return new Actions();
- }
-
- /**
- * Create an instance of {@link RelationshipData }
- *
- */
- public RelationshipData createRelationshipData() {
- return new RelationshipData();
- }
-
- /**
- * Create an instance of {@link RelatedToProperty }
- *
- */
- public RelatedToProperty createRelatedToProperty() {
- return new RelatedToProperty();
- }
-
- /**
- * Create an instance of {@link Relationship }
- *
- */
- public Relationship createRelationship() {
- return new Relationship();
- }
-
- /**
- * Create an instance of {@link RelationshipList }
- *
- */
- public RelationshipList createRelationshipList() {
- return new RelationshipList();
- }
-
- /**
- * Create an instance of {@link VolumeGroup }
- *
- */
- public VolumeGroup createVolumeGroup() {
- return new VolumeGroup();
- }
-
- /**
- * Create an instance of {@link VolumeGroups }
- *
- */
- public VolumeGroups createVolumeGroups() {
- return new VolumeGroups();
- }
-
- /**
- * Create an instance of {@link Volume }
- *
- */
- public Volume createVolume() {
- return new Volume();
- }
-
- /**
- * Create an instance of {@link Volumes }
- *
- */
- public Volumes createVolumes() {
- return new Volumes();
- }
-
- /**
- * Create an instance of {@link L3InterfaceIpv4AddressList }
- *
- */
- public L3InterfaceIpv4AddressList createL3InterfaceIpv4AddressList() {
- return new L3InterfaceIpv4AddressList();
- }
-
- /**
- * Create an instance of {@link L3InterfaceIpv6AddressList }
- *
- */
- public L3InterfaceIpv6AddressList createL3InterfaceIpv6AddressList() {
- return new L3InterfaceIpv6AddressList();
- }
-
- /**
- * Create an instance of {@link Vlan }
- *
- */
- public Vlan createVlan() {
- return new Vlan();
- }
-
- /**
- * Create an instance of {@link Vlans }
- *
- */
- public Vlans createVlans() {
- return new Vlans();
- }
-
- /**
- * Create an instance of {@link LInterface }
- *
- */
- public LInterface createLInterface() {
- return new LInterface();
- }
-
- /**
- * Create an instance of {@link LInterfaces }
- *
- */
- public LInterfaces createLInterfaces() {
- return new LInterfaces();
- }
-
- /**
- * Create an instance of {@link Vserver }
- *
- */
- public Vserver createVserver() {
- return new Vserver();
- }
-
- /**
- * Create an instance of {@link Vservers }
- *
- */
- public Vservers createVservers() {
- return new Vservers();
- }
-
- /**
- * Create an instance of {@link Tenant }
- *
- */
- public Tenant createTenant() {
- return new Tenant();
- }
-
- /**
- * Create an instance of {@link Tenants }
- *
- */
- public Tenants createTenants() {
- return new Tenants();
- }
-
- /**
- * Create an instance of {@link Flavor }
- *
- */
- public Flavor createFlavor() {
- return new Flavor();
- }
-
- /**
- * Create an instance of {@link Flavors }
- *
- */
- public Flavors createFlavors() {
- return new Flavors();
- }
-
- /**
- * Create an instance of {@link GroupAssignment }
- *
- */
- public GroupAssignment createGroupAssignment() {
- return new GroupAssignment();
- }
-
- /**
- * Create an instance of {@link GroupAssignments }
- *
- */
- public GroupAssignments createGroupAssignments() {
- return new GroupAssignments();
- }
-
- /**
- * Create an instance of {@link Snapshot }
- *
- */
- public Snapshot createSnapshot() {
- return new Snapshot();
- }
-
- /**
- * Create an instance of {@link Snapshots }
- *
- */
- public Snapshots createSnapshots() {
- return new Snapshots();
- }
-
- /**
- * Create an instance of {@link Metadatum }
- *
- */
- public Metadatum createMetadatum() {
- return new Metadatum();
- }
-
- /**
- * Create an instance of {@link Metadata }
- *
- */
- public Metadata createMetadata() {
- return new Metadata();
- }
-
- /**
- * Create an instance of {@link Image }
- *
- */
- public Image createImage() {
- return new Image();
- }
-
- /**
- * Create an instance of {@link Images }
- *
- */
- public Images createImages() {
- return new Images();
- }
-
- /**
- * Create an instance of {@link AvailabilityZone }
- *
- */
- public AvailabilityZone createAvailabilityZone() {
- return new AvailabilityZone();
- }
-
- /**
- * Create an instance of {@link AvailabilityZones }
- *
- */
- public AvailabilityZones createAvailabilityZones() {
- return new AvailabilityZones();
- }
-
- /**
- * Create an instance of {@link CloudRegion }
- *
- */
- public CloudRegion createCloudRegion() {
- return new CloudRegion();
- }
-
- /**
- * Create an instance of {@link CloudRegions }
- *
- */
- public CloudRegions createCloudRegions() {
- return new CloudRegions();
- }
-
- /**
- * Create an instance of {@link PInterface }
- *
- */
- public PInterface createPInterface() {
- return new PInterface();
- }
-
- /**
- * Create an instance of {@link PInterfaces }
- *
- */
- public PInterfaces createPInterfaces() {
- return new PInterfaces();
- }
-
- /**
- * Create an instance of {@link LagInterface }
- *
- */
- public LagInterface createLagInterface() {
- return new LagInterface();
- }
-
- /**
- * Create an instance of {@link LagInterfaces }
- *
- */
- public LagInterfaces createLagInterfaces() {
- return new LagInterfaces();
- }
-
- /**
- * Create an instance of {@link Pserver }
- *
- */
- public Pserver createPserver() {
- return new Pserver();
- }
-
- /**
- * Create an instance of {@link Pservers }
- *
- */
- public Pservers createPservers() {
- return new Pservers();
- }
-
- /**
- * Create an instance of {@link CloudInfrastructure }
- *
- */
- public CloudInfrastructure createCloudInfrastructure() {
- return new CloudInfrastructure();
- }
-
- /**
- * Create an instance of {@link ServiceInstance }
- *
- */
- public ServiceInstance createServiceInstance() {
- return new ServiceInstance();
- }
-
- /**
- * Create an instance of {@link ServiceInstances }
- *
- */
- public ServiceInstances createServiceInstances() {
- return new ServiceInstances();
- }
-
- /**
- * Create an instance of {@link ServiceSubscription }
- *
- */
- public ServiceSubscription createServiceSubscription() {
- return new ServiceSubscription();
- }
-
- /**
- * Create an instance of {@link ServiceSubscriptions }
- *
- */
- public ServiceSubscriptions createServiceSubscriptions() {
- return new ServiceSubscriptions();
- }
-
- /**
- * Create an instance of {@link Customer }
- *
- */
- public Customer createCustomer() {
- return new Customer();
- }
-
- /**
- * Create an instance of {@link Customers }
- *
- */
- public Customers createCustomers() {
- return new Customers();
- }
-
- /**
- * Create an instance of {@link Business }
- *
- */
- public Business createBusiness() {
- return new Business();
- }
-
- /**
- * Create an instance of {@link Service }
- *
- */
- public Service createService() {
- return new Service();
- }
-
- /**
- * Create an instance of {@link Services }
- *
- */
- public Services createServices() {
- return new Services();
- }
-
- /**
- * Create an instance of {@link ElementChoiceSet }
- *
- */
- public ElementChoiceSet createElementChoiceSet() {
- return new ElementChoiceSet();
- }
-
- /**
- * Create an instance of {@link ModelElements }
- *
- */
- public ModelElements createModelElements() {
- return new ModelElements();
- }
-
- /**
- * Create an instance of {@link ModelElement.LinkagePoints }
- *
- */
- public ModelElement.LinkagePoints createModelElementLinkagePoints() {
- return new ModelElement.LinkagePoints();
- }
-
- /**
- * Create an instance of {@link ModelConstraints }
- *
- */
- public ModelConstraints createModelConstraints() {
- return new ModelConstraints();
- }
-
- /**
- * Create an instance of {@link ModelConstraint }
- *
- */
- public ModelConstraint createModelConstraint() {
- return new ModelConstraint();
- }
-
- /**
- * Create an instance of {@link ConstrainedElementSets }
- *
- */
- public ConstrainedElementSets createConstrainedElementSets() {
- return new ConstrainedElementSets();
- }
-
- /**
- * Create an instance of {@link ConstrainedElementSet }
- *
- */
- public ConstrainedElementSet createConstrainedElementSet() {
- return new ConstrainedElementSet();
- }
-
- /**
- * Create an instance of {@link ElementChoiceSets }
- *
- */
- public ElementChoiceSets createElementChoiceSets() {
- return new ElementChoiceSets();
- }
-
- /**
- * Create an instance of {@link Model }
- *
- */
- public Model createModel() {
- return new Model();
- }
-
- /**
- * Create an instance of {@link Models }
- *
- */
- public Models createModels() {
- return new Models();
- }
-
- /**
- * Create an instance of {@link RelatedLookup }
- *
- */
- public RelatedLookup createRelatedLookup() {
- return new RelatedLookup();
- }
-
- /**
- * Create an instance of {@link RelatedLookups }
- *
- */
- public RelatedLookups createRelatedLookups() {
- return new RelatedLookups();
- }
-
- /**
- * Create an instance of {@link PropertyConstraint }
- *
- */
- public PropertyConstraint createPropertyConstraint() {
- return new PropertyConstraint();
- }
-
- /**
- * Create an instance of {@link PropertyConstraints }
- *
- */
- public PropertyConstraints createPropertyConstraints() {
- return new PropertyConstraints();
- }
-
- /**
- * Create an instance of {@link NamedQueryElement }
- *
- */
- public NamedQueryElement createNamedQueryElement() {
- return new NamedQueryElement();
- }
-
- /**
- * Create an instance of {@link NamedQueryElements }
- *
- */
- public NamedQueryElements createNamedQueryElements() {
- return new NamedQueryElements();
- }
-
- /**
- * Create an instance of {@link NamedQuery.RequiredInputParams }
- *
- */
- public NamedQuery.RequiredInputParams createNamedQueryRequiredInputParams() {
- return new NamedQuery.RequiredInputParams();
- }
-
- /**
- * Create an instance of {@link NamedQueries }
- *
- */
- public NamedQueries createNamedQueries() {
- return new NamedQueries();
- }
-
- /**
- * Create an instance of {@link ServiceDesignAndCreation }
- *
- */
- public ServiceDesignAndCreation createServiceDesignAndCreation() {
- return new ServiceDesignAndCreation();
- }
-
- /**
- * Create an instance of {@link LogicalLink }
- *
- */
- public LogicalLink createLogicalLink() {
- return new LogicalLink();
- }
-
- /**
- * Create an instance of {@link LogicalLinks }
- *
- */
- public LogicalLinks createLogicalLinks() {
- return new LogicalLinks();
- }
-
- /**
- * Create an instance of {@link Vnfc }
- *
- */
- public Vnfc createVnfc() {
- return new Vnfc();
- }
-
- /**
- * Create an instance of {@link Vnfcs }
- *
- */
- public Vnfcs createVnfcs() {
- return new Vnfcs();
- }
-
- /**
- * Create an instance of {@link Subnet }
- *
- */
- public Subnet createSubnet() {
- return new Subnet();
- }
-
- /**
- * Create an instance of {@link Subnets }
- *
- */
- public Subnets createSubnets() {
- return new Subnets();
- }
-
- /**
- * Create an instance of {@link CtagAssignment }
- *
- */
- public CtagAssignment createCtagAssignment() {
- return new CtagAssignment();
- }
-
- /**
- * Create an instance of {@link CtagAssignments }
- *
- */
- public CtagAssignments createCtagAssignments() {
- return new CtagAssignments();
- }
-
- /**
- * Create an instance of {@link SegmentationAssignment }
- *
- */
- public SegmentationAssignment createSegmentationAssignment() {
- return new SegmentationAssignment();
- }
-
- /**
- * Create an instance of {@link SegmentationAssignments }
- *
- */
- public SegmentationAssignments createSegmentationAssignments() {
- return new SegmentationAssignments();
- }
-
- /**
- * Create an instance of {@link L3Network }
- *
- */
- public L3Network createL3Network() {
- return new L3Network();
- }
-
- /**
- * Create an instance of {@link L3Networks }
- *
- */
- public L3Networks createL3Networks() {
- return new L3Networks();
- }
-
- /**
- * Create an instance of {@link VfModule }
- *
- */
- public VfModule createVfModule() {
- return new VfModule();
- }
-
- /**
- * Create an instance of {@link VfModules }
- *
- */
- public VfModules createVfModules() {
- return new VfModules();
- }
-
- /**
- * Create an instance of {@link GenericVnf }
- *
- */
- public GenericVnf createGenericVnf() {
- return new GenericVnf();
- }
-
- /**
- * Create an instance of {@link GenericVnfs }
- *
- */
- public GenericVnfs createGenericVnfs() {
- return new GenericVnfs();
- }
-
- /**
- * Create an instance of {@link Pnf }
- *
- */
- public Pnf createPnf() {
- return new Pnf();
- }
-
- /**
- * Create an instance of {@link Pnfs }
- *
- */
- public Pnfs createPnfs() {
- return new Pnfs();
- }
-
- /**
- * Create an instance of {@link PhysicalLink }
- *
- */
- public PhysicalLink createPhysicalLink() {
- return new PhysicalLink();
- }
-
- /**
- * Create an instance of {@link PhysicalLinks }
- *
- */
- public PhysicalLinks createPhysicalLinks() {
- return new PhysicalLinks();
- }
-
- /**
- * Create an instance of {@link Network }
- *
- */
- public Network createNetwork() {
- return new Network();
- }
-
- /**
- * Create an instance of {@link ReservedPropNames }
- *
- */
- public ReservedPropNames createReservedPropNames() {
- return new ReservedPropNames();
- }
-
- /**
- * Create an instance of {@link EdgePropNames }
- *
- */
- public EdgePropNames createEdgePropNames() {
- return new EdgePropNames();
- }
-
- /**
- * Create an instance of {@link AaiInternal }
- *
- */
- public AaiInternal createAaiInternal() {
- return new AaiInternal();
- }
-
- /**
- * Create an instance of {@link Inventory }
- *
- */
- public Inventory createInventory() {
- return new Inventory();
- }
-
- /**
- * Create an instance of {@link InventoryItemData }
- *
- */
- public InventoryItemData createInventoryItemData() {
- return new InventoryItemData();
- }
-
- /**
- * Create an instance of {@link InventoryItem }
- *
- */
- public InventoryItem createInventoryItem() {
- return new InventoryItem();
- }
-
- /**
- * Create an instance of {@link TaggedInventoryItemList }
- *
- */
- public TaggedInventoryItemList createTaggedInventoryItemList() {
- return new TaggedInventoryItemList();
- }
-
- /**
- * Create an instance of {@link StartNodeFilter }
- *
- */
- public StartNodeFilter createStartNodeFilter() {
- return new StartNodeFilter();
- }
-
- /**
- * Create an instance of {@link IncludeNodeFilter }
- *
- */
- public IncludeNodeFilter createIncludeNodeFilter() {
- return new IncludeNodeFilter();
- }
-
- /**
- * Create an instance of {@link SecondaryFilter }
- *
- */
- public SecondaryFilter createSecondaryFilter() {
- return new SecondaryFilter();
- }
-
- /**
- * Create an instance of {@link NotificationEventHeader }
- *
- */
- public NotificationEventHeader createNotificationEventHeader() {
- return new NotificationEventHeader();
- }
-
- /**
- * Create an instance of {@link NotificationEvent }
- *
- */
- public NotificationEvent createNotificationEvent() {
- return new NotificationEvent();
- }
-
- /**
- * Create an instance of {@link QueryParameters }
- *
- */
- public QueryParameters createQueryParameters() {
- return new QueryParameters();
- }
-
- /**
- * Create an instance of {@link InstanceFilter }
- *
- */
- public InstanceFilter createInstanceFilter() {
- return new InstanceFilter();
- }
-
- /**
- * Create an instance of {@link InstanceFilters }
- *
- */
- public InstanceFilters createInstanceFilters() {
- return new InstanceFilters();
- }
-
- /**
- * Create an instance of {@link ModelAndNamedQuerySearch }
- *
- */
- public ModelAndNamedQuerySearch createModelAndNamedQuerySearch() {
- return new ModelAndNamedQuerySearch();
- }
-
- /**
- * Create an instance of {@link Properties }
- *
- */
- public Properties createProperties() {
- return new Properties();
- }
-
- /**
- * Create an instance of {@link ExtraProperties }
- *
- */
- public ExtraProperties createExtraProperties() {
- return new ExtraProperties();
- }
-
- /**
- * Create an instance of {@link InventoryResponseItem }
- *
- */
- public InventoryResponseItem createInventoryResponseItem() {
- return new InventoryResponseItem();
- }
-
- /**
- * Create an instance of {@link InventoryResponseItems }
- *
- */
- public InventoryResponseItems createInventoryResponseItems() {
- return new InventoryResponseItems();
- }
-
- /**
- * Create an instance of {@link ResponseList }
- *
- */
- public ResponseList createResponseList() {
- return new ResponseList();
- }
-
- /**
- * Create an instance of {@link ExtraProperty }
- *
- */
- public ExtraProperty createExtraProperty() {
- return new ExtraProperty();
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PInterface.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PInterface.java
deleted file mode 100644
index 8052b95..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PInterface.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="interface-name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="speed-value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="speed-units" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="port-description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="equipment-identifier" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="interface-role" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="interface-type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}l-interfaces" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "interfaceName",
- "speedValue",
- "speedUnits",
- "portDescription",
- "equipmentIdentifier",
- "interfaceRole",
- "interfaceType",
- "resourceVersion",
- "relationshipList",
- "lInterfaces"
-})
-@XmlRootElement(name = "p-interface")
-public class PInterface
- implements AAIDatum
-{
-
- @XmlElement(name = "interface-name", required = true)
- protected String interfaceName;
- @XmlElement(name = "speed-value")
- protected String speedValue;
- @XmlElement(name = "speed-units")
- protected String speedUnits;
- @XmlElement(name = "port-description")
- protected String portDescription;
- @XmlElement(name = "equipment-identifier")
- protected String equipmentIdentifier;
- @XmlElement(name = "interface-role")
- protected String interfaceRole;
- @XmlElement(name = "interface-type")
- protected String interfaceType;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
- @XmlElement(name = "l-interfaces")
- protected LInterfaces lInterfaces;
-
- /**
- * Gets the value of the interfaceName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getInterfaceName() {
- return interfaceName;
- }
-
- /**
- * Sets the value of the interfaceName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setInterfaceName(String value) {
- this.interfaceName = value;
- }
-
- /**
- * Gets the value of the speedValue property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSpeedValue() {
- return speedValue;
- }
-
- /**
- * Sets the value of the speedValue property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSpeedValue(String value) {
- this.speedValue = value;
- }
-
- /**
- * Gets the value of the speedUnits property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSpeedUnits() {
- return speedUnits;
- }
-
- /**
- * Sets the value of the speedUnits property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSpeedUnits(String value) {
- this.speedUnits = value;
- }
-
- /**
- * Gets the value of the portDescription property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPortDescription() {
- return portDescription;
- }
-
- /**
- * Sets the value of the portDescription property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPortDescription(String value) {
- this.portDescription = value;
- }
-
- /**
- * Gets the value of the equipmentIdentifier property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getEquipmentIdentifier() {
- return equipmentIdentifier;
- }
-
- /**
- * Sets the value of the equipmentIdentifier property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setEquipmentIdentifier(String value) {
- this.equipmentIdentifier = value;
- }
-
- /**
- * Gets the value of the interfaceRole property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getInterfaceRole() {
- return interfaceRole;
- }
-
- /**
- * Sets the value of the interfaceRole property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setInterfaceRole(String value) {
- this.interfaceRole = value;
- }
-
- /**
- * Gets the value of the interfaceType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getInterfaceType() {
- return interfaceType;
- }
-
- /**
- * Sets the value of the interfaceType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setInterfaceType(String value) {
- this.interfaceType = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
- /**
- * Gets the value of the lInterfaces property.
- *
- * @return
- * possible object is
- * {@link LInterfaces }
- *
- */
- public LInterfaces getLInterfaces() {
- return lInterfaces;
- }
-
- /**
- * Sets the value of the lInterfaces property.
- *
- * @param value
- * allowed object is
- * {@link LInterfaces }
- *
- */
- public void setLInterfaces(LInterfaces value) {
- this.lInterfaces = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PInterfaces.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PInterfaces.java
deleted file mode 100644
index f1d79a7..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PInterfaces.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}p-interface" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "pInterface"
-})
-@XmlRootElement(name = "p-interfaces")
-public class PInterfaces
- implements AAIDatum
-{
-
- @XmlElement(name = "p-interface")
- protected List<PInterface> pInterface;
-
- /**
- * Gets the value of the pInterface property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the pInterface property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getPInterface().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link PInterface }
- *
- *
- */
- public List<PInterface> getPInterface() {
- if (pInterface == null) {
- pInterface = new ArrayList<PInterface>();
- }
- return this.pInterface;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PhysicalLink.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PhysicalLink.java
deleted file mode 100644
index 102ccdf..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PhysicalLink.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="link-name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="speed-value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="speed-units" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="circuit-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="dual-mode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="management-option" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="service-provider-name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "linkName",
- "speedValue",
- "speedUnits",
- "circuitId",
- "dualMode",
- "managementOption",
- "serviceProviderName",
- "resourceVersion",
- "relationshipList"
-})
-@XmlRootElement(name = "physical-link")
-public class PhysicalLink
- implements AAIDatum
-{
-
- @XmlElement(name = "link-name", required = true)
- protected String linkName;
- @XmlElement(name = "speed-value")
- protected String speedValue;
- @XmlElement(name = "speed-units")
- protected String speedUnits;
- @XmlElement(name = "circuit-id")
- protected String circuitId;
- @XmlElement(name = "dual-mode")
- protected String dualMode;
- @XmlElement(name = "management-option")
- protected String managementOption;
- @XmlElement(name = "service-provider-name")
- protected String serviceProviderName;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the linkName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getLinkName() {
- return linkName;
- }
-
- /**
- * Sets the value of the linkName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setLinkName(String value) {
- this.linkName = value;
- }
-
- /**
- * Gets the value of the speedValue property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSpeedValue() {
- return speedValue;
- }
-
- /**
- * Sets the value of the speedValue property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSpeedValue(String value) {
- this.speedValue = value;
- }
-
- /**
- * Gets the value of the speedUnits property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSpeedUnits() {
- return speedUnits;
- }
-
- /**
- * Sets the value of the speedUnits property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSpeedUnits(String value) {
- this.speedUnits = value;
- }
-
- /**
- * Gets the value of the circuitId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getCircuitId() {
- return circuitId;
- }
-
- /**
- * Sets the value of the circuitId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setCircuitId(String value) {
- this.circuitId = value;
- }
-
- /**
- * Gets the value of the dualMode property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getDualMode() {
- return dualMode;
- }
-
- /**
- * Sets the value of the dualMode property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setDualMode(String value) {
- this.dualMode = value;
- }
-
- /**
- * Gets the value of the managementOption property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getManagementOption() {
- return managementOption;
- }
-
- /**
- * Sets the value of the managementOption property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setManagementOption(String value) {
- this.managementOption = value;
- }
-
- /**
- * Gets the value of the serviceProviderName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getServiceProviderName() {
- return serviceProviderName;
- }
-
- /**
- * Sets the value of the serviceProviderName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setServiceProviderName(String value) {
- this.serviceProviderName = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PhysicalLinks.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PhysicalLinks.java
deleted file mode 100644
index 32d469e..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PhysicalLinks.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}physical-link" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "physicalLink"
-})
-@XmlRootElement(name = "physical-links")
-public class PhysicalLinks
- implements AAIDatum
-{
-
- @XmlElement(name = "physical-link")
- protected List<PhysicalLink> physicalLink;
-
- /**
- * Gets the value of the physicalLink property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the physicalLink property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getPhysicalLink().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link PhysicalLink }
- *
- *
- */
- public List<PhysicalLink> getPhysicalLink() {
- if (physicalLink == null) {
- physicalLink = new ArrayList<PhysicalLink>();
- }
- return this.physicalLink;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pnf.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pnf.java
deleted file mode 100644
index 7b6d5f0..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pnf.java
+++ /dev/null
@@ -1,535 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="pnf-name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="pnf-name2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="pnf-name2-source" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="pnf-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="equip-type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="equip-vendor" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="equip-model" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="management-option" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="ipaddress-v4-oam" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="sw-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="orchestration-status" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="in-maint" type="{http://www.w3.org/2001/XMLSchema}boolean"/&gt;
- * &lt;element name="frame-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}p-interfaces" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}lag-interfaces" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "pnfName",
- "pnfName2",
- "pnfName2Source",
- "pnfId",
- "equipType",
- "equipVendor",
- "equipModel",
- "managementOption",
- "ipaddressV4Oam",
- "swVersion",
- "orchestrationStatus",
- "inMaint",
- "frameId",
- "resourceVersion",
- "relationshipList",
- "pInterfaces",
- "lagInterfaces"
-})
-@XmlRootElement(name = "pnf")
-public class Pnf
- implements AAIDatum
-{
-
- @XmlElement(name = "pnf-name", required = true)
- protected String pnfName;
- @XmlElement(name = "pnf-name2")
- protected String pnfName2;
- @XmlElement(name = "pnf-name2-source")
- protected String pnfName2Source;
- @XmlElement(name = "pnf-id")
- protected String pnfId;
- @XmlElement(name = "equip-type")
- protected String equipType;
- @XmlElement(name = "equip-vendor")
- protected String equipVendor;
- @XmlElement(name = "equip-model")
- protected String equipModel;
- @XmlElement(name = "management-option")
- protected String managementOption;
- @XmlElement(name = "ipaddress-v4-oam")
- protected String ipaddressV4Oam;
- @XmlElement(name = "sw-version")
- protected String swVersion;
- @XmlElement(name = "orchestration-status")
- protected String orchestrationStatus;
- @XmlElement(name = "in-maint")
- protected boolean inMaint;
- @XmlElement(name = "frame-id")
- protected String frameId;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
- @XmlElement(name = "p-interfaces")
- protected PInterfaces pInterfaces;
- @XmlElement(name = "lag-interfaces")
- protected LagInterfaces lagInterfaces;
-
- /**
- * Gets the value of the pnfName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPnfName() {
- return pnfName;
- }
-
- /**
- * Sets the value of the pnfName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPnfName(String value) {
- this.pnfName = value;
- }
-
- /**
- * Gets the value of the pnfName2 property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPnfName2() {
- return pnfName2;
- }
-
- /**
- * Sets the value of the pnfName2 property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPnfName2(String value) {
- this.pnfName2 = value;
- }
-
- /**
- * Gets the value of the pnfName2Source property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPnfName2Source() {
- return pnfName2Source;
- }
-
- /**
- * Sets the value of the pnfName2Source property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPnfName2Source(String value) {
- this.pnfName2Source = value;
- }
-
- /**
- * Gets the value of the pnfId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPnfId() {
- return pnfId;
- }
-
- /**
- * Sets the value of the pnfId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPnfId(String value) {
- this.pnfId = value;
- }
-
- /**
- * Gets the value of the equipType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getEquipType() {
- return equipType;
- }
-
- /**
- * Sets the value of the equipType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setEquipType(String value) {
- this.equipType = value;
- }
-
- /**
- * Gets the value of the equipVendor property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getEquipVendor() {
- return equipVendor;
- }
-
- /**
- * Sets the value of the equipVendor property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setEquipVendor(String value) {
- this.equipVendor = value;
- }
-
- /**
- * Gets the value of the equipModel property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getEquipModel() {
- return equipModel;
- }
-
- /**
- * Sets the value of the equipModel property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setEquipModel(String value) {
- this.equipModel = value;
- }
-
- /**
- * Gets the value of the managementOption property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getManagementOption() {
- return managementOption;
- }
-
- /**
- * Sets the value of the managementOption property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setManagementOption(String value) {
- this.managementOption = value;
- }
-
- /**
- * Gets the value of the ipaddressV4Oam property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getIpaddressV4Oam() {
- return ipaddressV4Oam;
- }
-
- /**
- * Sets the value of the ipaddressV4Oam property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setIpaddressV4Oam(String value) {
- this.ipaddressV4Oam = value;
- }
-
- /**
- * Gets the value of the swVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSwVersion() {
- return swVersion;
- }
-
- /**
- * Sets the value of the swVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSwVersion(String value) {
- this.swVersion = value;
- }
-
- /**
- * Gets the value of the orchestrationStatus property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getOrchestrationStatus() {
- return orchestrationStatus;
- }
-
- /**
- * Sets the value of the orchestrationStatus property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setOrchestrationStatus(String value) {
- this.orchestrationStatus = value;
- }
-
- /**
- * Gets the value of the inMaint property.
- *
- */
- public boolean isInMaint() {
- return inMaint;
- }
-
- /**
- * Sets the value of the inMaint property.
- *
- */
- public void setInMaint(boolean value) {
- this.inMaint = value;
- }
-
- /**
- * Gets the value of the frameId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getFrameId() {
- return frameId;
- }
-
- /**
- * Sets the value of the frameId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setFrameId(String value) {
- this.frameId = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
- /**
- * Gets the value of the pInterfaces property.
- *
- * @return
- * possible object is
- * {@link PInterfaces }
- *
- */
- public PInterfaces getPInterfaces() {
- return pInterfaces;
- }
-
- /**
- * Sets the value of the pInterfaces property.
- *
- * @param value
- * allowed object is
- * {@link PInterfaces }
- *
- */
- public void setPInterfaces(PInterfaces value) {
- this.pInterfaces = value;
- }
-
- /**
- * Gets the value of the lagInterfaces property.
- *
- * @return
- * possible object is
- * {@link LagInterfaces }
- *
- */
- public LagInterfaces getLagInterfaces() {
- return lagInterfaces;
- }
-
- /**
- * Sets the value of the lagInterfaces property.
- *
- * @param value
- * allowed object is
- * {@link LagInterfaces }
- *
- */
- public void setLagInterfaces(LagInterfaces value) {
- this.lagInterfaces = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pnfs.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pnfs.java
deleted file mode 100644
index 59001be..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pnfs.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}pnf" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "pnf"
-})
-@XmlRootElement(name = "pnfs")
-public class Pnfs
- implements AAIDatum
-{
-
- protected List<Pnf> pnf;
-
- /**
- * Gets the value of the pnf property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the pnf property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getPnf().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Pnf }
- *
- *
- */
- public List<Pnf> getPnf() {
- if (pnf == null) {
- pnf = new ArrayList<Pnf>();
- }
- return this.pnf;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Properties.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Properties.java
deleted file mode 100644
index c4bc0b1..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Properties.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="property-name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="property-value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "propertyName",
- "propertyValue"
-})
-@XmlRootElement(name = "properties")
-public class Properties
- implements AAIDatum
-{
-
- @XmlElement(name = "property-name")
- protected String propertyName;
- @XmlElement(name = "property-value")
- protected String propertyValue;
-
- /**
- * Gets the value of the propertyName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPropertyName() {
- return propertyName;
- }
-
- /**
- * Sets the value of the propertyName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPropertyName(String value) {
- this.propertyName = value;
- }
-
- /**
- * Gets the value of the propertyValue property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPropertyValue() {
- return propertyValue;
- }
-
- /**
- * Sets the value of the propertyValue property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPropertyValue(String value) {
- this.propertyValue = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PropertyConstraint.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PropertyConstraint.java
deleted file mode 100644
index 3cc45e9..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PropertyConstraint.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="property-constraint-uuid" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="constraint-type" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="property-name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="property-value" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "propertyConstraintUuid",
- "constraintType",
- "propertyName",
- "propertyValue",
- "resourceVersion"
-})
-@XmlRootElement(name = "property-constraint")
-public class PropertyConstraint
- implements AAIDatum
-{
-
- @XmlElement(name = "property-constraint-uuid", required = true)
- protected String propertyConstraintUuid;
- @XmlElement(name = "constraint-type", required = true)
- protected String constraintType;
- @XmlElement(name = "property-name", required = true)
- protected String propertyName;
- @XmlElement(name = "property-value", required = true)
- protected String propertyValue;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
-
- /**
- * Gets the value of the propertyConstraintUuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPropertyConstraintUuid() {
- return propertyConstraintUuid;
- }
-
- /**
- * Sets the value of the propertyConstraintUuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPropertyConstraintUuid(String value) {
- this.propertyConstraintUuid = value;
- }
-
- /**
- * Gets the value of the constraintType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getConstraintType() {
- return constraintType;
- }
-
- /**
- * Sets the value of the constraintType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setConstraintType(String value) {
- this.constraintType = value;
- }
-
- /**
- * Gets the value of the propertyName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPropertyName() {
- return propertyName;
- }
-
- /**
- * Sets the value of the propertyName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPropertyName(String value) {
- this.propertyName = value;
- }
-
- /**
- * Gets the value of the propertyValue property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPropertyValue() {
- return propertyValue;
- }
-
- /**
- * Sets the value of the propertyValue property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPropertyValue(String value) {
- this.propertyValue = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PropertyConstraints.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PropertyConstraints.java
deleted file mode 100644
index 52e5e11..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PropertyConstraints.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}property-constraint" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "propertyConstraint"
-})
-@XmlRootElement(name = "property-constraints")
-public class PropertyConstraints
- implements AAIDatum
-{
-
- @XmlElement(name = "property-constraint")
- protected List<PropertyConstraint> propertyConstraint;
-
- /**
- * Gets the value of the propertyConstraint property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the propertyConstraint property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getPropertyConstraint().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link PropertyConstraint }
- *
- *
- */
- public List<PropertyConstraint> getPropertyConstraint() {
- if (propertyConstraint == null) {
- propertyConstraint = new ArrayList<PropertyConstraint>();
- }
- return this.propertyConstraint;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pserver.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pserver.java
deleted file mode 100644
index 24afe93..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pserver.java
+++ /dev/null
@@ -1,645 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="hostname" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="ptnii-equip-name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="number-of-cpus" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/&gt;
- * &lt;element name="disk-in-gigabytes" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/&gt;
- * &lt;element name="ram-in-megabytes" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/&gt;
- * &lt;element name="equip-type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="equip-vendor" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="equip-model" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="fqdn" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="pserver-selflink" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="ipv4-oam-address" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="serial-number" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="pserver-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="internet-topology" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="in-maint" type="{http://www.w3.org/2001/XMLSchema}boolean"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="pserver-name2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="purpose" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}p-interfaces" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}lag-interfaces" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "hostname",
- "ptniiEquipName",
- "numberOfCpus",
- "diskInGigabytes",
- "ramInMegabytes",
- "equipType",
- "equipVendor",
- "equipModel",
- "fqdn",
- "pserverSelflink",
- "ipv4OamAddress",
- "serialNumber",
- "pserverId",
- "internetTopology",
- "inMaint",
- "resourceVersion",
- "pserverName2",
- "purpose",
- "relationshipList",
- "pInterfaces",
- "lagInterfaces"
-})
-@XmlRootElement(name = "pserver")
-public class Pserver
- implements AAIDatum
-{
-
- @XmlElement(required = true)
- protected String hostname;
- @XmlElement(name = "ptnii-equip-name")
- protected String ptniiEquipName;
- @XmlElement(name = "number-of-cpus")
- protected Integer numberOfCpus;
- @XmlElement(name = "disk-in-gigabytes")
- protected Integer diskInGigabytes;
- @XmlElement(name = "ram-in-megabytes")
- protected Integer ramInMegabytes;
- @XmlElement(name = "equip-type")
- protected String equipType;
- @XmlElement(name = "equip-vendor")
- protected String equipVendor;
- @XmlElement(name = "equip-model")
- protected String equipModel;
- protected String fqdn;
- @XmlElement(name = "pserver-selflink")
- protected String pserverSelflink;
- @XmlElement(name = "ipv4-oam-address")
- protected String ipv4OamAddress;
- @XmlElement(name = "serial-number")
- protected String serialNumber;
- @XmlElement(name = "pserver-id")
- protected String pserverId;
- @XmlElement(name = "internet-topology")
- protected String internetTopology;
- @XmlElement(name = "in-maint")
- protected boolean inMaint;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "pserver-name2")
- protected String pserverName2;
- protected String purpose;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
- @XmlElement(name = "p-interfaces")
- protected PInterfaces pInterfaces;
- @XmlElement(name = "lag-interfaces")
- protected LagInterfaces lagInterfaces;
-
- /**
- * Gets the value of the hostname property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getHostname() {
- return hostname;
- }
-
- /**
- * Sets the value of the hostname property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setHostname(String value) {
- this.hostname = value;
- }
-
- /**
- * Gets the value of the ptniiEquipName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPtniiEquipName() {
- return ptniiEquipName;
- }
-
- /**
- * Sets the value of the ptniiEquipName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPtniiEquipName(String value) {
- this.ptniiEquipName = value;
- }
-
- /**
- * Gets the value of the numberOfCpus property.
- *
- * @return
- * possible object is
- * {@link Integer }
- *
- */
- public Integer getNumberOfCpus() {
- return numberOfCpus;
- }
-
- /**
- * Sets the value of the numberOfCpus property.
- *
- * @param value
- * allowed object is
- * {@link Integer }
- *
- */
- public void setNumberOfCpus(Integer value) {
- this.numberOfCpus = value;
- }
-
- /**
- * Gets the value of the diskInGigabytes property.
- *
- * @return
- * possible object is
- * {@link Integer }
- *
- */
- public Integer getDiskInGigabytes() {
- return diskInGigabytes;
- }
-
- /**
- * Sets the value of the diskInGigabytes property.
- *
- * @param value
- * allowed object is
- * {@link Integer }
- *
- */
- public void setDiskInGigabytes(Integer value) {
- this.diskInGigabytes = value;
- }
-
- /**
- * Gets the value of the ramInMegabytes property.
- *
- * @return
- * possible object is
- * {@link Integer }
- *
- */
- public Integer getRamInMegabytes() {
- return ramInMegabytes;
- }
-
- /**
- * Sets the value of the ramInMegabytes property.
- *
- * @param value
- * allowed object is
- * {@link Integer }
- *
- */
- public void setRamInMegabytes(Integer value) {
- this.ramInMegabytes = value;
- }
-
- /**
- * Gets the value of the equipType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getEquipType() {
- return equipType;
- }
-
- /**
- * Sets the value of the equipType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setEquipType(String value) {
- this.equipType = value;
- }
-
- /**
- * Gets the value of the equipVendor property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getEquipVendor() {
- return equipVendor;
- }
-
- /**
- * Sets the value of the equipVendor property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setEquipVendor(String value) {
- this.equipVendor = value;
- }
-
- /**
- * Gets the value of the equipModel property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getEquipModel() {
- return equipModel;
- }
-
- /**
- * Sets the value of the equipModel property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setEquipModel(String value) {
- this.equipModel = value;
- }
-
- /**
- * Gets the value of the fqdn property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getFqdn() {
- return fqdn;
- }
-
- /**
- * Sets the value of the fqdn property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setFqdn(String value) {
- this.fqdn = value;
- }
-
- /**
- * Gets the value of the pserverSelflink property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPserverSelflink() {
- return pserverSelflink;
- }
-
- /**
- * Sets the value of the pserverSelflink property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPserverSelflink(String value) {
- this.pserverSelflink = value;
- }
-
- /**
- * Gets the value of the ipv4OamAddress property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getIpv4OamAddress() {
- return ipv4OamAddress;
- }
-
- /**
- * Sets the value of the ipv4OamAddress property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setIpv4OamAddress(String value) {
- this.ipv4OamAddress = value;
- }
-
- /**
- * Gets the value of the serialNumber property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSerialNumber() {
- return serialNumber;
- }
-
- /**
- * Sets the value of the serialNumber property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSerialNumber(String value) {
- this.serialNumber = value;
- }
-
- /**
- * Gets the value of the pserverId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPserverId() {
- return pserverId;
- }
-
- /**
- * Sets the value of the pserverId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPserverId(String value) {
- this.pserverId = value;
- }
-
- /**
- * Gets the value of the internetTopology property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getInternetTopology() {
- return internetTopology;
- }
-
- /**
- * Sets the value of the internetTopology property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setInternetTopology(String value) {
- this.internetTopology = value;
- }
-
- /**
- * Gets the value of the inMaint property.
- *
- */
- public boolean isInMaint() {
- return inMaint;
- }
-
- /**
- * Sets the value of the inMaint property.
- *
- */
- public void setInMaint(boolean value) {
- this.inMaint = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the pserverName2 property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPserverName2() {
- return pserverName2;
- }
-
- /**
- * Sets the value of the pserverName2 property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPserverName2(String value) {
- this.pserverName2 = value;
- }
-
- /**
- * Gets the value of the purpose property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPurpose() {
- return purpose;
- }
-
- /**
- * Sets the value of the purpose property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPurpose(String value) {
- this.purpose = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
- /**
- * Gets the value of the pInterfaces property.
- *
- * @return
- * possible object is
- * {@link PInterfaces }
- *
- */
- public PInterfaces getPInterfaces() {
- return pInterfaces;
- }
-
- /**
- * Sets the value of the pInterfaces property.
- *
- * @param value
- * allowed object is
- * {@link PInterfaces }
- *
- */
- public void setPInterfaces(PInterfaces value) {
- this.pInterfaces = value;
- }
-
- /**
- * Gets the value of the lagInterfaces property.
- *
- * @return
- * possible object is
- * {@link LagInterfaces }
- *
- */
- public LagInterfaces getLagInterfaces() {
- return lagInterfaces;
- }
-
- /**
- * Sets the value of the lagInterfaces property.
- *
- * @param value
- * allowed object is
- * {@link LagInterfaces }
- *
- */
- public void setLagInterfaces(LagInterfaces value) {
- this.lagInterfaces = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pservers.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pservers.java
deleted file mode 100644
index 93fe9dc..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pservers.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}pserver" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "pserver"
-})
-@XmlRootElement(name = "pservers")
-public class Pservers
- implements AAIDatum
-{
-
- protected List<Pserver> pserver;
-
- /**
- * Gets the value of the pserver property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the pserver property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getPserver().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Pserver }
- *
- *
- */
- public List<Pserver> getPserver() {
- if (pserver == null) {
- pserver = new ArrayList<Pserver>();
- }
- return this.pserver;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/QueryParameters.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/QueryParameters.java
deleted file mode 100644
index 1126b2e..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/QueryParameters.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}named-query" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}model" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "namedQuery",
- "model"
-})
-@XmlRootElement(name = "query-parameters")
-public class QueryParameters
- implements AAIDatum
-{
-
- @XmlElement(name = "named-query")
- protected NamedQuery namedQuery;
- protected Model model;
-
- /**
- * Gets the value of the namedQuery property.
- *
- * @return
- * possible object is
- * {@link NamedQuery }
- *
- */
- public NamedQuery getNamedQuery() {
- return namedQuery;
- }
-
- /**
- * Sets the value of the namedQuery property.
- *
- * @param value
- * allowed object is
- * {@link NamedQuery }
- *
- */
- public void setNamedQuery(NamedQuery value) {
- this.namedQuery = value;
- }
-
- /**
- * Gets the value of the model property.
- *
- * @return
- * possible object is
- * {@link Model }
- *
- */
- public Model getModel() {
- return model;
- }
-
- /**
- * Sets the value of the model property.
- *
- * @param value
- * allowed object is
- * {@link Model }
- *
- */
- public void setModel(Model value) {
- this.model = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelatedLookup.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelatedLookup.java
deleted file mode 100644
index 89874c9..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelatedLookup.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="related-lookup-uuid" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="source-node-type" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="source-node-property" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="target-node-type" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="target-node-property" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="property-collect-list" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "relatedLookupUuid",
- "sourceNodeType",
- "sourceNodeProperty",
- "targetNodeType",
- "targetNodeProperty",
- "propertyCollectList",
- "resourceVersion",
- "relationshipList"
-})
-@XmlRootElement(name = "related-lookup")
-public class RelatedLookup
- implements AAIDatum
-{
-
- @XmlElement(name = "related-lookup-uuid", required = true)
- protected String relatedLookupUuid;
- @XmlElement(name = "source-node-type", required = true)
- protected String sourceNodeType;
- @XmlElement(name = "source-node-property", required = true)
- protected String sourceNodeProperty;
- @XmlElement(name = "target-node-type", required = true)
- protected String targetNodeType;
- @XmlElement(name = "target-node-property", required = true)
- protected String targetNodeProperty;
- @XmlElement(name = "property-collect-list")
- protected List<String> propertyCollectList;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the relatedLookupUuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getRelatedLookupUuid() {
- return relatedLookupUuid;
- }
-
- /**
- * Sets the value of the relatedLookupUuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setRelatedLookupUuid(String value) {
- this.relatedLookupUuid = value;
- }
-
- /**
- * Gets the value of the sourceNodeType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSourceNodeType() {
- return sourceNodeType;
- }
-
- /**
- * Sets the value of the sourceNodeType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSourceNodeType(String value) {
- this.sourceNodeType = value;
- }
-
- /**
- * Gets the value of the sourceNodeProperty property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSourceNodeProperty() {
- return sourceNodeProperty;
- }
-
- /**
- * Sets the value of the sourceNodeProperty property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSourceNodeProperty(String value) {
- this.sourceNodeProperty = value;
- }
-
- /**
- * Gets the value of the targetNodeType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getTargetNodeType() {
- return targetNodeType;
- }
-
- /**
- * Sets the value of the targetNodeType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setTargetNodeType(String value) {
- this.targetNodeType = value;
- }
-
- /**
- * Gets the value of the targetNodeProperty property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getTargetNodeProperty() {
- return targetNodeProperty;
- }
-
- /**
- * Sets the value of the targetNodeProperty property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setTargetNodeProperty(String value) {
- this.targetNodeProperty = value;
- }
-
- /**
- * Gets the value of the propertyCollectList property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the propertyCollectList property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getPropertyCollectList().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link String }
- *
- *
- */
- public List<String> getPropertyCollectList() {
- if (propertyCollectList == null) {
- propertyCollectList = new ArrayList<String>();
- }
- return this.propertyCollectList;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelatedLookups.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelatedLookups.java
deleted file mode 100644
index 1b9cc91..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelatedLookups.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}related-lookup" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "relatedLookup"
-})
-@XmlRootElement(name = "related-lookups")
-public class RelatedLookups
- implements AAIDatum
-{
-
- @XmlElement(name = "related-lookup")
- protected List<RelatedLookup> relatedLookup;
-
- /**
- * Gets the value of the relatedLookup property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the relatedLookup property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getRelatedLookup().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link RelatedLookup }
- *
- *
- */
- public List<RelatedLookup> getRelatedLookup() {
- if (relatedLookup == null) {
- relatedLookup = new ArrayList<RelatedLookup>();
- }
- return this.relatedLookup;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelatedToProperty.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelatedToProperty.java
deleted file mode 100644
index 7bddd00..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelatedToProperty.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="property-key" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="property-value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "propertyKey",
- "propertyValue"
-})
-@XmlRootElement(name = "related-to-property")
-public class RelatedToProperty
- implements AAIDatum
-{
-
- @XmlElement(name = "property-key")
- protected String propertyKey;
- @XmlElement(name = "property-value")
- protected String propertyValue;
-
- /**
- * Gets the value of the propertyKey property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPropertyKey() {
- return propertyKey;
- }
-
- /**
- * Sets the value of the propertyKey property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPropertyKey(String value) {
- this.propertyKey = value;
- }
-
- /**
- * Gets the value of the propertyValue property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPropertyValue() {
- return propertyValue;
- }
-
- /**
- * Sets the value of the propertyValue property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPropertyValue(String value) {
- this.propertyValue = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Relationship.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Relationship.java
deleted file mode 100644
index 83a2634..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Relationship.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="related-to" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="related-link" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-data" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}related-to-property" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "relatedTo",
- "relatedLink",
- "relationshipData",
- "relatedToProperty"
-})
-@XmlRootElement(name = "relationship")
-public class Relationship
- implements AAIDatum
-{
-
- @XmlElement(name = "related-to")
- protected String relatedTo;
- @XmlElement(name = "related-link")
- protected String relatedLink;
- @XmlElement(name = "relationship-data")
- protected List<RelationshipData> relationshipData;
- @XmlElement(name = "related-to-property")
- protected List<RelatedToProperty> relatedToProperty;
-
- /**
- * Gets the value of the relatedTo property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getRelatedTo() {
- return relatedTo;
- }
-
- /**
- * Sets the value of the relatedTo property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setRelatedTo(String value) {
- this.relatedTo = value;
- }
-
- /**
- * Gets the value of the relatedLink property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getRelatedLink() {
- return relatedLink;
- }
-
- /**
- * Sets the value of the relatedLink property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setRelatedLink(String value) {
- this.relatedLink = value;
- }
-
- /**
- * Gets the value of the relationshipData property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the relationshipData property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getRelationshipData().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link RelationshipData }
- *
- *
- */
- public List<RelationshipData> getRelationshipData() {
- if (relationshipData == null) {
- relationshipData = new ArrayList<RelationshipData>();
- }
- return this.relationshipData;
- }
-
- /**
- * Gets the value of the relatedToProperty property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the relatedToProperty property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getRelatedToProperty().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link RelatedToProperty }
- *
- *
- */
- public List<RelatedToProperty> getRelatedToProperty() {
- if (relatedToProperty == null) {
- relatedToProperty = new ArrayList<RelatedToProperty>();
- }
- return this.relatedToProperty;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelationshipData.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelationshipData.java
deleted file mode 100644
index 7dd9e79..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelationshipData.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="relationship-key" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="relationship-value" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "relationshipKey",
- "relationshipValue"
-})
-@XmlRootElement(name = "relationship-data")
-public class RelationshipData
- implements AAIDatum
-{
-
- @XmlElement(name = "relationship-key", required = true)
- protected String relationshipKey;
- @XmlElement(name = "relationship-value", required = true)
- protected String relationshipValue;
-
- /**
- * Gets the value of the relationshipKey property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getRelationshipKey() {
- return relationshipKey;
- }
-
- /**
- * Sets the value of the relationshipKey property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setRelationshipKey(String value) {
- this.relationshipKey = value;
- }
-
- /**
- * Gets the value of the relationshipValue property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getRelationshipValue() {
- return relationshipValue;
- }
-
- /**
- * Sets the value of the relationshipValue property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setRelationshipValue(String value) {
- this.relationshipValue = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelationshipList.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelationshipList.java
deleted file mode 100644
index 704e2d0..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelationshipList.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "relationship"
-})
-@XmlRootElement(name = "relationship-list")
-public class RelationshipList
- implements AAIDatum
-{
-
- protected List<Relationship> relationship;
-
- /**
- * Gets the value of the relationship property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the relationship property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getRelationship().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Relationship }
- *
- *
- */
- public List<Relationship> getRelationship() {
- if (relationship == null) {
- relationship = new ArrayList<Relationship>();
- }
- return this.relationship;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ReservedPropNames.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ReservedPropNames.java
deleted file mode 100644
index 31ae96d..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ReservedPropNames.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="last-mod-source-of-truth" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="aai-node-type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="aai-created-ts" type="{http://www.w3.org/2001/XMLSchema}unsignedInt" minOccurs="0"/&gt;
- * &lt;element name="aai-unique-key" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="aai-last-mod-ts" type="{http://www.w3.org/2001/XMLSchema}unsignedInt" minOccurs="0"/&gt;
- * &lt;element name="source-of-truth" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "lastModSourceOfTruth",
- "aaiNodeType",
- "aaiCreatedTs",
- "aaiUniqueKey",
- "aaiLastModTs",
- "sourceOfTruth"
-})
-@XmlRootElement(name = "reserved-prop-names")
-public class ReservedPropNames
- implements AAIDatum
-{
-
- @XmlElement(name = "last-mod-source-of-truth")
- protected String lastModSourceOfTruth;
- @XmlElement(name = "aai-node-type")
- protected String aaiNodeType;
- @XmlElement(name = "aai-created-ts")
- @XmlSchemaType(name = "unsignedInt")
- protected Long aaiCreatedTs;
- @XmlElement(name = "aai-unique-key")
- protected String aaiUniqueKey;
- @XmlElement(name = "aai-last-mod-ts")
- @XmlSchemaType(name = "unsignedInt")
- protected Long aaiLastModTs;
- @XmlElement(name = "source-of-truth")
- protected String sourceOfTruth;
-
- /**
- * Gets the value of the lastModSourceOfTruth property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getLastModSourceOfTruth() {
- return lastModSourceOfTruth;
- }
-
- /**
- * Sets the value of the lastModSourceOfTruth property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setLastModSourceOfTruth(String value) {
- this.lastModSourceOfTruth = value;
- }
-
- /**
- * Gets the value of the aaiNodeType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getAaiNodeType() {
- return aaiNodeType;
- }
-
- /**
- * Sets the value of the aaiNodeType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setAaiNodeType(String value) {
- this.aaiNodeType = value;
- }
-
- /**
- * Gets the value of the aaiCreatedTs property.
- *
- * @return
- * possible object is
- * {@link Long }
- *
- */
- public Long getAaiCreatedTs() {
- return aaiCreatedTs;
- }
-
- /**
- * Sets the value of the aaiCreatedTs property.
- *
- * @param value
- * allowed object is
- * {@link Long }
- *
- */
- public void setAaiCreatedTs(Long value) {
- this.aaiCreatedTs = value;
- }
-
- /**
- * Gets the value of the aaiUniqueKey property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getAaiUniqueKey() {
- return aaiUniqueKey;
- }
-
- /**
- * Sets the value of the aaiUniqueKey property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setAaiUniqueKey(String value) {
- this.aaiUniqueKey = value;
- }
-
- /**
- * Gets the value of the aaiLastModTs property.
- *
- * @return
- * possible object is
- * {@link Long }
- *
- */
- public Long getAaiLastModTs() {
- return aaiLastModTs;
- }
-
- /**
- * Sets the value of the aaiLastModTs property.
- *
- * @param value
- * allowed object is
- * {@link Long }
- *
- */
- public void setAaiLastModTs(Long value) {
- this.aaiLastModTs = value;
- }
-
- /**
- * Gets the value of the sourceOfTruth property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSourceOfTruth() {
- return sourceOfTruth;
- }
-
- /**
- * Sets the value of the sourceOfTruth property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSourceOfTruth(String value) {
- this.sourceOfTruth = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ResponseList.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ResponseList.java
deleted file mode 100644
index dc9d22a..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ResponseList.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}inventory-response-items" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "inventoryResponseItems"
-})
-@XmlRootElement(name = "response-list")
-public class ResponseList
- implements AAIDatum
-{
-
- @XmlElement(name = "inventory-response-items")
- protected InventoryResponseItems inventoryResponseItems;
-
- /**
- * Gets the value of the inventoryResponseItems property.
- *
- * @return
- * possible object is
- * {@link InventoryResponseItems }
- *
- */
- public InventoryResponseItems getInventoryResponseItems() {
- return inventoryResponseItems;
- }
-
- /**
- * Sets the value of the inventoryResponseItems property.
- *
- * @param value
- * allowed object is
- * {@link InventoryResponseItems }
- *
- */
- public void setInventoryResponseItems(InventoryResponseItems value) {
- this.inventoryResponseItems = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ResultData.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ResultData.java
deleted file mode 100644
index 619ed94..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ResultData.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="resource-type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="resource-link" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "resourceType",
- "resourceLink"
-})
-@XmlRootElement(name = "result-data")
-public class ResultData
- implements AAIDatum
-{
-
- @XmlElement(name = "resource-type")
- protected String resourceType;
- @XmlElement(name = "resource-link")
- protected String resourceLink;
-
- /**
- * Gets the value of the resourceType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceType() {
- return resourceType;
- }
-
- /**
- * Sets the value of the resourceType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceType(String value) {
- this.resourceType = value;
- }
-
- /**
- * Gets the value of the resourceLink property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceLink() {
- return resourceLink;
- }
-
- /**
- * Sets the value of the resourceLink property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceLink(String value) {
- this.resourceLink = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Search.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Search.java
deleted file mode 100644
index 8b1d3a9..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Search.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}search-results" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "searchResults"
-})
-@XmlRootElement(name = "search")
-public class Search
- implements AAIDatum
-{
-
- @XmlElement(name = "search-results")
- protected SearchResults searchResults;
-
- /**
- * Gets the value of the searchResults property.
- *
- * @return
- * possible object is
- * {@link SearchResults }
- *
- */
- public SearchResults getSearchResults() {
- return searchResults;
- }
-
- /**
- * Sets the value of the searchResults property.
- *
- * @param value
- * allowed object is
- * {@link SearchResults }
- *
- */
- public void setSearchResults(SearchResults value) {
- this.searchResults = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SearchResults.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SearchResults.java
deleted file mode 100644
index dbaaf93..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SearchResults.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}result-data" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "resultData"
-})
-@XmlRootElement(name = "search-results")
-public class SearchResults
- implements AAIDatum
-{
-
- @XmlElement(name = "result-data")
- protected List<ResultData> resultData;
-
- /**
- * Gets the value of the resultData property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the resultData property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getResultData().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link ResultData }
- *
- *
- */
- public List<ResultData> getResultData() {
- if (resultData == null) {
- resultData = new ArrayList<ResultData>();
- }
- return this.resultData;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SecondaryFilter.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SecondaryFilter.java
deleted file mode 100644
index c5096c6..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SecondaryFilter.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="property-name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="filter-type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="property-value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "propertyName",
- "filterType",
- "propertyValue"
-})
-@XmlRootElement(name = "secondary-filter")
-public class SecondaryFilter
- implements AAIDatum
-{
-
- @XmlElement(name = "property-name")
- protected String propertyName;
- @XmlElement(name = "filter-type")
- protected String filterType;
- @XmlElement(name = "property-value")
- protected String propertyValue;
-
- /**
- * Gets the value of the propertyName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPropertyName() {
- return propertyName;
- }
-
- /**
- * Sets the value of the propertyName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPropertyName(String value) {
- this.propertyName = value;
- }
-
- /**
- * Gets the value of the filterType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getFilterType() {
- return filterType;
- }
-
- /**
- * Sets the value of the filterType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setFilterType(String value) {
- this.filterType = value;
- }
-
- /**
- * Gets the value of the propertyValue property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPropertyValue() {
- return propertyValue;
- }
-
- /**
- * Sets the value of the propertyValue property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPropertyValue(String value) {
- this.propertyValue = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SegmentationAssignment.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SegmentationAssignment.java
deleted file mode 100644
index 0221cf2..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SegmentationAssignment.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="segmentation-id" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "segmentationId",
- "resourceVersion",
- "relationshipList"
-})
-@XmlRootElement(name = "segmentation-assignment")
-public class SegmentationAssignment
- implements AAIDatum
-{
-
- @XmlElement(name = "segmentation-id", required = true)
- protected String segmentationId;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the segmentationId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSegmentationId() {
- return segmentationId;
- }
-
- /**
- * Sets the value of the segmentationId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSegmentationId(String value) {
- this.segmentationId = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SegmentationAssignments.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SegmentationAssignments.java
deleted file mode 100644
index b5fe544..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SegmentationAssignments.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}segmentation-assignment" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "segmentationAssignment"
-})
-@XmlRootElement(name = "segmentation-assignments")
-public class SegmentationAssignments
- implements AAIDatum
-{
-
- @XmlElement(name = "segmentation-assignment")
- protected List<SegmentationAssignment> segmentationAssignment;
-
- /**
- * Gets the value of the segmentationAssignment property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the segmentationAssignment property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getSegmentationAssignment().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link SegmentationAssignment }
- *
- *
- */
- public List<SegmentationAssignment> getSegmentationAssignment() {
- if (segmentationAssignment == null) {
- segmentationAssignment = new ArrayList<SegmentationAssignment>();
- }
- return this.segmentationAssignment;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Service.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Service.java
deleted file mode 100644
index 963e31e..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Service.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="service-id" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="service-description" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="service-selflink" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="service-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "serviceId",
- "serviceDescription",
- "serviceSelflink",
- "resourceVersion",
- "serviceVersion",
- "relationshipList"
-})
-@XmlRootElement(name = "service")
-public class Service
- implements AAIDatum
-{
-
- @XmlElement(name = "service-id", required = true)
- protected String serviceId;
- @XmlElement(name = "service-description", required = true)
- protected String serviceDescription;
- @XmlElement(name = "service-selflink")
- protected String serviceSelflink;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "service-version")
- protected String serviceVersion;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the serviceId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getServiceId() {
- return serviceId;
- }
-
- /**
- * Sets the value of the serviceId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setServiceId(String value) {
- this.serviceId = value;
- }
-
- /**
- * Gets the value of the serviceDescription property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getServiceDescription() {
- return serviceDescription;
- }
-
- /**
- * Sets the value of the serviceDescription property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setServiceDescription(String value) {
- this.serviceDescription = value;
- }
-
- /**
- * Gets the value of the serviceSelflink property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getServiceSelflink() {
- return serviceSelflink;
- }
-
- /**
- * Sets the value of the serviceSelflink property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setServiceSelflink(String value) {
- this.serviceSelflink = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the serviceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getServiceVersion() {
- return serviceVersion;
- }
-
- /**
- * Sets the value of the serviceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setServiceVersion(String value) {
- this.serviceVersion = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceDesignAndCreation.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceDesignAndCreation.java
deleted file mode 100644
index e0cd458..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceDesignAndCreation.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}services" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}models" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}named-queries" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "services",
- "models",
- "namedQueries"
-})
-@XmlRootElement(name = "service-design-and-creation")
-public class ServiceDesignAndCreation
- implements AAIDatum
-{
-
- protected Services services;
- protected Models models;
- @XmlElement(name = "named-queries")
- protected NamedQueries namedQueries;
-
- /**
- * Gets the value of the services property.
- *
- * @return
- * possible object is
- * {@link Services }
- *
- */
- public Services getServices() {
- return services;
- }
-
- /**
- * Sets the value of the services property.
- *
- * @param value
- * allowed object is
- * {@link Services }
- *
- */
- public void setServices(Services value) {
- this.services = value;
- }
-
- /**
- * Gets the value of the models property.
- *
- * @return
- * possible object is
- * {@link Models }
- *
- */
- public Models getModels() {
- return models;
- }
-
- /**
- * Sets the value of the models property.
- *
- * @param value
- * allowed object is
- * {@link Models }
- *
- */
- public void setModels(Models value) {
- this.models = value;
- }
-
- /**
- * Gets the value of the namedQueries property.
- *
- * @return
- * possible object is
- * {@link NamedQueries }
- *
- */
- public NamedQueries getNamedQueries() {
- return namedQueries;
- }
-
- /**
- * Sets the value of the namedQueries property.
- *
- * @param value
- * allowed object is
- * {@link NamedQueries }
- *
- */
- public void setNamedQueries(NamedQueries value) {
- this.namedQueries = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceInstance.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceInstance.java
deleted file mode 100644
index 4b26d84..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceInstance.java
+++ /dev/null
@@ -1,542 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="service-instance-id" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="service-instance-name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="persona-model-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="persona-model-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="widget-model-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="widget-model-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="bandwidth-total" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="bandwidth-up-wan1" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="bandwidth-down-wan1" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="bandwidth-up-wan2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="bandwidth-down-wan2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="vhn-portal-url" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="operational-status" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="service-instance-location-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}metadata" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "serviceInstanceId",
- "serviceInstanceName",
- "personaModelId",
- "personaModelVersion",
- "widgetModelId",
- "widgetModelVersion",
- "bandwidthTotal",
- "bandwidthUpWan1",
- "bandwidthDownWan1",
- "bandwidthUpWan2",
- "bandwidthDownWan2",
- "vhnPortalUrl",
- "operationalStatus",
- "serviceInstanceLocationId",
- "resourceVersion",
- "relationshipList",
- "metadata"
-})
-@XmlRootElement(name = "service-instance")
-public class ServiceInstance
- implements AAIDatum
-{
-
- @XmlElement(name = "service-instance-id", required = true)
- protected String serviceInstanceId;
- @XmlElement(name = "service-instance-name")
- protected String serviceInstanceName;
- @XmlElement(name = "persona-model-id")
- protected String personaModelId;
- @XmlElement(name = "persona-model-version")
- protected String personaModelVersion;
- @XmlElement(name = "widget-model-id")
- protected String widgetModelId;
- @XmlElement(name = "widget-model-version")
- protected String widgetModelVersion;
- @XmlElement(name = "bandwidth-total")
- protected String bandwidthTotal;
- @XmlElement(name = "bandwidth-up-wan1")
- protected String bandwidthUpWan1;
- @XmlElement(name = "bandwidth-down-wan1")
- protected String bandwidthDownWan1;
- @XmlElement(name = "bandwidth-up-wan2")
- protected String bandwidthUpWan2;
- @XmlElement(name = "bandwidth-down-wan2")
- protected String bandwidthDownWan2;
- @XmlElement(name = "vhn-portal-url")
- protected String vhnPortalUrl;
- @XmlElement(name = "operational-status")
- protected String operationalStatus;
- @XmlElement(name = "service-instance-location-id")
- protected String serviceInstanceLocationId;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
- protected Metadata metadata;
-
- /**
- * Gets the value of the serviceInstanceId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getServiceInstanceId() {
- return serviceInstanceId;
- }
-
- /**
- * Sets the value of the serviceInstanceId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setServiceInstanceId(String value) {
- this.serviceInstanceId = value;
- }
-
- /**
- * Gets the value of the serviceInstanceName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getServiceInstanceName() {
- return serviceInstanceName;
- }
-
- /**
- * Sets the value of the serviceInstanceName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setServiceInstanceName(String value) {
- this.serviceInstanceName = value;
- }
-
- /**
- * Gets the value of the personaModelId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPersonaModelId() {
- return personaModelId;
- }
-
- /**
- * Sets the value of the personaModelId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPersonaModelId(String value) {
- this.personaModelId = value;
- }
-
- /**
- * Gets the value of the personaModelVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPersonaModelVersion() {
- return personaModelVersion;
- }
-
- /**
- * Sets the value of the personaModelVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPersonaModelVersion(String value) {
- this.personaModelVersion = value;
- }
-
- /**
- * Gets the value of the widgetModelId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getWidgetModelId() {
- return widgetModelId;
- }
-
- /**
- * Sets the value of the widgetModelId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setWidgetModelId(String value) {
- this.widgetModelId = value;
- }
-
- /**
- * Gets the value of the widgetModelVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getWidgetModelVersion() {
- return widgetModelVersion;
- }
-
- /**
- * Sets the value of the widgetModelVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setWidgetModelVersion(String value) {
- this.widgetModelVersion = value;
- }
-
- /**
- * Gets the value of the bandwidthTotal property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getBandwidthTotal() {
- return bandwidthTotal;
- }
-
- /**
- * Sets the value of the bandwidthTotal property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setBandwidthTotal(String value) {
- this.bandwidthTotal = value;
- }
-
- /**
- * Gets the value of the bandwidthUpWan1 property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getBandwidthUpWan1() {
- return bandwidthUpWan1;
- }
-
- /**
- * Sets the value of the bandwidthUpWan1 property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setBandwidthUpWan1(String value) {
- this.bandwidthUpWan1 = value;
- }
-
- /**
- * Gets the value of the bandwidthDownWan1 property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getBandwidthDownWan1() {
- return bandwidthDownWan1;
- }
-
- /**
- * Sets the value of the bandwidthDownWan1 property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setBandwidthDownWan1(String value) {
- this.bandwidthDownWan1 = value;
- }
-
- /**
- * Gets the value of the bandwidthUpWan2 property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getBandwidthUpWan2() {
- return bandwidthUpWan2;
- }
-
- /**
- * Sets the value of the bandwidthUpWan2 property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setBandwidthUpWan2(String value) {
- this.bandwidthUpWan2 = value;
- }
-
- /**
- * Gets the value of the bandwidthDownWan2 property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getBandwidthDownWan2() {
- return bandwidthDownWan2;
- }
-
- /**
- * Sets the value of the bandwidthDownWan2 property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setBandwidthDownWan2(String value) {
- this.bandwidthDownWan2 = value;
- }
-
- /**
- * Gets the value of the vhnPortalUrl property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getVhnPortalUrl() {
- return vhnPortalUrl;
- }
-
- /**
- * Sets the value of the vhnPortalUrl property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVhnPortalUrl(String value) {
- this.vhnPortalUrl = value;
- }
-
- /**
- * Gets the value of the operationalStatus property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getOperationalStatus() {
- return operationalStatus;
- }
-
- /**
- * Sets the value of the operationalStatus property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setOperationalStatus(String value) {
- this.operationalStatus = value;
- }
-
- /**
- * Gets the value of the serviceInstanceLocationId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getServiceInstanceLocationId() {
- return serviceInstanceLocationId;
- }
-
- /**
- * Sets the value of the serviceInstanceLocationId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setServiceInstanceLocationId(String value) {
- this.serviceInstanceLocationId = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
- /**
- * Gets the value of the metadata property.
- *
- * @return
- * possible object is
- * {@link Metadata }
- *
- */
- public Metadata getMetadata() {
- return metadata;
- }
-
- /**
- * Sets the value of the metadata property.
- *
- * @param value
- * allowed object is
- * {@link Metadata }
- *
- */
- public void setMetadata(Metadata value) {
- this.metadata = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceInstances.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceInstances.java
deleted file mode 100644
index b6dd552..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceInstances.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}service-instance" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "serviceInstance"
-})
-@XmlRootElement(name = "service-instances")
-public class ServiceInstances
- implements AAIDatum
-{
-
- @XmlElement(name = "service-instance")
- protected List<ServiceInstance> serviceInstance;
-
- /**
- * Gets the value of the serviceInstance property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the serviceInstance property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getServiceInstance().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link ServiceInstance }
- *
- *
- */
- public List<ServiceInstance> getServiceInstance() {
- if (serviceInstance == null) {
- serviceInstance = new ArrayList<ServiceInstance>();
- }
- return this.serviceInstance;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceSubscription.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceSubscription.java
deleted file mode 100644
index c7007da..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceSubscription.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="service-type" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="temp-ub-sub-account-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}service-instances" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "serviceType",
- "tempUbSubAccountId",
- "resourceVersion",
- "serviceInstances",
- "relationshipList"
-})
-@XmlRootElement(name = "service-subscription")
-public class ServiceSubscription
- implements AAIDatum
-{
-
- @XmlElement(name = "service-type", required = true)
- protected String serviceType;
- @XmlElement(name = "temp-ub-sub-account-id")
- protected String tempUbSubAccountId;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "service-instances")
- protected ServiceInstances serviceInstances;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the serviceType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getServiceType() {
- return serviceType;
- }
-
- /**
- * Sets the value of the serviceType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setServiceType(String value) {
- this.serviceType = value;
- }
-
- /**
- * Gets the value of the tempUbSubAccountId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getTempUbSubAccountId() {
- return tempUbSubAccountId;
- }
-
- /**
- * Sets the value of the tempUbSubAccountId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setTempUbSubAccountId(String value) {
- this.tempUbSubAccountId = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the serviceInstances property.
- *
- * @return
- * possible object is
- * {@link ServiceInstances }
- *
- */
- public ServiceInstances getServiceInstances() {
- return serviceInstances;
- }
-
- /**
- * Sets the value of the serviceInstances property.
- *
- * @param value
- * allowed object is
- * {@link ServiceInstances }
- *
- */
- public void setServiceInstances(ServiceInstances value) {
- this.serviceInstances = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceSubscriptions.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceSubscriptions.java
deleted file mode 100644
index 704d546..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceSubscriptions.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}service-subscription" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "serviceSubscription"
-})
-@XmlRootElement(name = "service-subscriptions")
-public class ServiceSubscriptions
- implements AAIDatum
-{
-
- @XmlElement(name = "service-subscription")
- protected List<ServiceSubscription> serviceSubscription;
-
- /**
- * Gets the value of the serviceSubscription property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the serviceSubscription property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getServiceSubscription().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link ServiceSubscription }
- *
- *
- */
- public List<ServiceSubscription> getServiceSubscription() {
- if (serviceSubscription == null) {
- serviceSubscription = new ArrayList<ServiceSubscription>();
- }
- return this.serviceSubscription;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Services.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Services.java
deleted file mode 100644
index f6980bf..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Services.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}service" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "service"
-})
-@XmlRootElement(name = "services")
-public class Services
- implements AAIDatum
-{
-
- protected List<Service> service;
-
- /**
- * Gets the value of the service property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the service property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getService().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Service }
- *
- *
- */
- public List<Service> getService() {
- if (service == null) {
- service = new ArrayList<Service>();
- }
- return this.service;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Snapshot.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Snapshot.java
deleted file mode 100644
index 19ac644..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Snapshot.java
+++ /dev/null
@@ -1,402 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="snapshot-id" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="snapshot-name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="snapshot-architecture" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="snapshot-os-distro" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="snapshot-os-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="application" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="application-vendor" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="application-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="snapshot-selflink" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="prev-snapshot-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "snapshotId",
- "snapshotName",
- "snapshotArchitecture",
- "snapshotOsDistro",
- "snapshotOsVersion",
- "application",
- "applicationVendor",
- "applicationVersion",
- "snapshotSelflink",
- "prevSnapshotId",
- "resourceVersion",
- "relationshipList"
-})
-@XmlRootElement(name = "snapshot")
-public class Snapshot
- implements AAIDatum
-{
-
- @XmlElement(name = "snapshot-id", required = true)
- protected String snapshotId;
- @XmlElement(name = "snapshot-name")
- protected String snapshotName;
- @XmlElement(name = "snapshot-architecture")
- protected String snapshotArchitecture;
- @XmlElement(name = "snapshot-os-distro")
- protected String snapshotOsDistro;
- @XmlElement(name = "snapshot-os-version")
- protected String snapshotOsVersion;
- protected String application;
- @XmlElement(name = "application-vendor")
- protected String applicationVendor;
- @XmlElement(name = "application-version")
- protected String applicationVersion;
- @XmlElement(name = "snapshot-selflink")
- protected String snapshotSelflink;
- @XmlElement(name = "prev-snapshot-id")
- protected String prevSnapshotId;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the snapshotId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSnapshotId() {
- return snapshotId;
- }
-
- /**
- * Sets the value of the snapshotId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSnapshotId(String value) {
- this.snapshotId = value;
- }
-
- /**
- * Gets the value of the snapshotName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSnapshotName() {
- return snapshotName;
- }
-
- /**
- * Sets the value of the snapshotName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSnapshotName(String value) {
- this.snapshotName = value;
- }
-
- /**
- * Gets the value of the snapshotArchitecture property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSnapshotArchitecture() {
- return snapshotArchitecture;
- }
-
- /**
- * Sets the value of the snapshotArchitecture property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSnapshotArchitecture(String value) {
- this.snapshotArchitecture = value;
- }
-
- /**
- * Gets the value of the snapshotOsDistro property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSnapshotOsDistro() {
- return snapshotOsDistro;
- }
-
- /**
- * Sets the value of the snapshotOsDistro property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSnapshotOsDistro(String value) {
- this.snapshotOsDistro = value;
- }
-
- /**
- * Gets the value of the snapshotOsVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSnapshotOsVersion() {
- return snapshotOsVersion;
- }
-
- /**
- * Sets the value of the snapshotOsVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSnapshotOsVersion(String value) {
- this.snapshotOsVersion = value;
- }
-
- /**
- * Gets the value of the application property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getApplication() {
- return application;
- }
-
- /**
- * Sets the value of the application property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setApplication(String value) {
- this.application = value;
- }
-
- /**
- * Gets the value of the applicationVendor property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getApplicationVendor() {
- return applicationVendor;
- }
-
- /**
- * Sets the value of the applicationVendor property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setApplicationVendor(String value) {
- this.applicationVendor = value;
- }
-
- /**
- * Gets the value of the applicationVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getApplicationVersion() {
- return applicationVersion;
- }
-
- /**
- * Sets the value of the applicationVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setApplicationVersion(String value) {
- this.applicationVersion = value;
- }
-
- /**
- * Gets the value of the snapshotSelflink property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSnapshotSelflink() {
- return snapshotSelflink;
- }
-
- /**
- * Sets the value of the snapshotSelflink property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSnapshotSelflink(String value) {
- this.snapshotSelflink = value;
- }
-
- /**
- * Gets the value of the prevSnapshotId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPrevSnapshotId() {
- return prevSnapshotId;
- }
-
- /**
- * Sets the value of the prevSnapshotId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPrevSnapshotId(String value) {
- this.prevSnapshotId = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Snapshots.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Snapshots.java
deleted file mode 100644
index cf34d83..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Snapshots.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}snapshot" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "snapshot"
-})
-@XmlRootElement(name = "snapshots")
-public class Snapshots
- implements AAIDatum
-{
-
- protected List<Snapshot> snapshot;
-
- /**
- * Gets the value of the snapshot property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the snapshot property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getSnapshot().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Snapshot }
- *
- *
- */
- public List<Snapshot> getSnapshot() {
- if (snapshot == null) {
- snapshot = new ArrayList<Snapshot>();
- }
- return this.snapshot;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/StartNodeFilter.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/StartNodeFilter.java
deleted file mode 100644
index 5214556..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/StartNodeFilter.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="property-name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="property-value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "propertyName",
- "propertyValue"
-})
-@XmlRootElement(name = "start-node-filter")
-public class StartNodeFilter
- implements AAIDatum
-{
-
- @XmlElement(name = "property-name")
- protected String propertyName;
- @XmlElement(name = "property-value")
- protected String propertyValue;
-
- /**
- * Gets the value of the propertyName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPropertyName() {
- return propertyName;
- }
-
- /**
- * Sets the value of the propertyName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPropertyName(String value) {
- this.propertyName = value;
- }
-
- /**
- * Gets the value of the propertyValue property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPropertyValue() {
- return propertyValue;
- }
-
- /**
- * Sets the value of the propertyValue property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPropertyValue(String value) {
- this.propertyValue = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Subnet.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Subnet.java
deleted file mode 100644
index 4ed5f06..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Subnet.java
+++ /dev/null
@@ -1,423 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="subnet-id" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="subnet-name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="neutron-subnet-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="gateway-address" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="network-start-address" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="cidr-mask" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="ip-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="orchestration-status" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="dhcp-enabled" type="{http://www.w3.org/2001/XMLSchema}boolean"/&gt;
- * &lt;element name="dhcp-start" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="dhcp-end" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "subnetId",
- "subnetName",
- "neutronSubnetId",
- "gatewayAddress",
- "networkStartAddress",
- "cidrMask",
- "ipVersion",
- "orchestrationStatus",
- "dhcpEnabled",
- "dhcpStart",
- "dhcpEnd",
- "resourceVersion",
- "relationshipList"
-})
-@XmlRootElement(name = "subnet")
-public class Subnet
- implements AAIDatum
-{
-
- @XmlElement(name = "subnet-id", required = true)
- protected String subnetId;
- @XmlElement(name = "subnet-name")
- protected String subnetName;
- @XmlElement(name = "neutron-subnet-id")
- protected String neutronSubnetId;
- @XmlElement(name = "gateway-address")
- protected String gatewayAddress;
- @XmlElement(name = "network-start-address")
- protected String networkStartAddress;
- @XmlElement(name = "cidr-mask")
- protected String cidrMask;
- @XmlElement(name = "ip-version")
- protected String ipVersion;
- @XmlElement(name = "orchestration-status")
- protected String orchestrationStatus;
- @XmlElement(name = "dhcp-enabled")
- protected boolean dhcpEnabled;
- @XmlElement(name = "dhcp-start")
- protected String dhcpStart;
- @XmlElement(name = "dhcp-end")
- protected String dhcpEnd;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the subnetId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSubnetId() {
- return subnetId;
- }
-
- /**
- * Sets the value of the subnetId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSubnetId(String value) {
- this.subnetId = value;
- }
-
- /**
- * Gets the value of the subnetName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSubnetName() {
- return subnetName;
- }
-
- /**
- * Sets the value of the subnetName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSubnetName(String value) {
- this.subnetName = value;
- }
-
- /**
- * Gets the value of the neutronSubnetId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getNeutronSubnetId() {
- return neutronSubnetId;
- }
-
- /**
- * Sets the value of the neutronSubnetId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setNeutronSubnetId(String value) {
- this.neutronSubnetId = value;
- }
-
- /**
- * Gets the value of the gatewayAddress property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getGatewayAddress() {
- return gatewayAddress;
- }
-
- /**
- * Sets the value of the gatewayAddress property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setGatewayAddress(String value) {
- this.gatewayAddress = value;
- }
-
- /**
- * Gets the value of the networkStartAddress property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getNetworkStartAddress() {
- return networkStartAddress;
- }
-
- /**
- * Sets the value of the networkStartAddress property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setNetworkStartAddress(String value) {
- this.networkStartAddress = value;
- }
-
- /**
- * Gets the value of the cidrMask property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getCidrMask() {
- return cidrMask;
- }
-
- /**
- * Sets the value of the cidrMask property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setCidrMask(String value) {
- this.cidrMask = value;
- }
-
- /**
- * Gets the value of the ipVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getIpVersion() {
- return ipVersion;
- }
-
- /**
- * Sets the value of the ipVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setIpVersion(String value) {
- this.ipVersion = value;
- }
-
- /**
- * Gets the value of the orchestrationStatus property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getOrchestrationStatus() {
- return orchestrationStatus;
- }
-
- /**
- * Sets the value of the orchestrationStatus property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setOrchestrationStatus(String value) {
- this.orchestrationStatus = value;
- }
-
- /**
- * Gets the value of the dhcpEnabled property.
- *
- */
- public boolean isDhcpEnabled() {
- return dhcpEnabled;
- }
-
- /**
- * Sets the value of the dhcpEnabled property.
- *
- */
- public void setDhcpEnabled(boolean value) {
- this.dhcpEnabled = value;
- }
-
- /**
- * Gets the value of the dhcpStart property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getDhcpStart() {
- return dhcpStart;
- }
-
- /**
- * Sets the value of the dhcpStart property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setDhcpStart(String value) {
- this.dhcpStart = value;
- }
-
- /**
- * Gets the value of the dhcpEnd property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getDhcpEnd() {
- return dhcpEnd;
- }
-
- /**
- * Sets the value of the dhcpEnd property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setDhcpEnd(String value) {
- this.dhcpEnd = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Subnets.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Subnets.java
deleted file mode 100644
index bbcaeba..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Subnets.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}subnet" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "subnet"
-})
-@XmlRootElement(name = "subnets")
-public class Subnets
- implements AAIDatum
-{
-
- protected List<Subnet> subnet;
-
- /**
- * Gets the value of the subnet property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the subnet property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getSubnet().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Subnet }
- *
- *
- */
- public List<Subnet> getSubnet() {
- if (subnet == null) {
- subnet = new ArrayList<Subnet>();
- }
- return this.subnet;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/TaggedInventoryItemList.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/TaggedInventoryItemList.java
deleted file mode 100644
index 175a9a7..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/TaggedInventoryItemList.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}inventory-item" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "inventoryItem"
-})
-@XmlRootElement(name = "tagged-inventory-item-list")
-public class TaggedInventoryItemList
- implements AAIDatum
-{
-
- @XmlElement(name = "inventory-item")
- protected List<InventoryItem> inventoryItem;
-
- /**
- * Gets the value of the inventoryItem property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the inventoryItem property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getInventoryItem().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link InventoryItem }
- *
- *
- */
- public List<InventoryItem> getInventoryItem() {
- if (inventoryItem == null) {
- inventoryItem = new ArrayList<InventoryItem>();
- }
- return this.inventoryItem;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Tenant.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Tenant.java
deleted file mode 100644
index fd6933e..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Tenant.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="tenant-id" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="tenant-name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}vservers" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "tenantId",
- "tenantName",
- "resourceVersion",
- "vservers",
- "relationshipList"
-})
-@XmlRootElement(name = "tenant")
-public class Tenant
- implements AAIDatum
-{
-
- @XmlElement(name = "tenant-id", required = true)
- protected String tenantId;
- @XmlElement(name = "tenant-name", required = true)
- protected String tenantName;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- protected Vservers vservers;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the tenantId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getTenantId() {
- return tenantId;
- }
-
- /**
- * Sets the value of the tenantId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setTenantId(String value) {
- this.tenantId = value;
- }
-
- /**
- * Gets the value of the tenantName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getTenantName() {
- return tenantName;
- }
-
- /**
- * Sets the value of the tenantName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setTenantName(String value) {
- this.tenantName = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the vservers property.
- *
- * @return
- * possible object is
- * {@link Vservers }
- *
- */
- public Vservers getVservers() {
- return vservers;
- }
-
- /**
- * Sets the value of the vservers property.
- *
- * @param value
- * allowed object is
- * {@link Vservers }
- *
- */
- public void setVservers(Vservers value) {
- this.vservers = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Tenants.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Tenants.java
deleted file mode 100644
index 744075d..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Tenants.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}tenant" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "tenant"
-})
-@XmlRootElement(name = "tenants")
-public class Tenants
- implements AAIDatum
-{
-
- protected List<Tenant> tenant;
-
- /**
- * Gets the value of the tenant property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the tenant property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getTenant().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Tenant }
- *
- *
- */
- public List<Tenant> getTenant() {
- if (tenant == null) {
- tenant = new ArrayList<Tenant>();
- }
- return this.tenant;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Update.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Update.java
deleted file mode 100644
index 1862b0e..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Update.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="update-node-type" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}update-node-key" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;element name="update-node-uri" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}action" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "updateNodeType",
- "updateNodeKey",
- "updateNodeUri",
- "action"
-})
-@XmlRootElement(name = "update")
-public class Update
- implements AAIDatum
-{
-
- @XmlElement(name = "update-node-type", required = true)
- protected String updateNodeType;
- @XmlElement(name = "update-node-key")
- protected List<UpdateNodeKey> updateNodeKey;
- @XmlElement(name = "update-node-uri")
- protected String updateNodeUri;
- protected List<Action> action;
-
- /**
- * Gets the value of the updateNodeType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getUpdateNodeType() {
- return updateNodeType;
- }
-
- /**
- * Sets the value of the updateNodeType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setUpdateNodeType(String value) {
- this.updateNodeType = value;
- }
-
- /**
- * Gets the value of the updateNodeKey property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the updateNodeKey property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getUpdateNodeKey().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link UpdateNodeKey }
- *
- *
- */
- public List<UpdateNodeKey> getUpdateNodeKey() {
- if (updateNodeKey == null) {
- updateNodeKey = new ArrayList<UpdateNodeKey>();
- }
- return this.updateNodeKey;
- }
-
- /**
- * Gets the value of the updateNodeUri property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getUpdateNodeUri() {
- return updateNodeUri;
- }
-
- /**
- * Sets the value of the updateNodeUri property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setUpdateNodeUri(String value) {
- this.updateNodeUri = value;
- }
-
- /**
- * Gets the value of the action property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the action property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getAction().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Action }
- *
- *
- */
- public List<Action> getAction() {
- if (action == null) {
- action = new ArrayList<Action>();
- }
- return this.action;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/UpdateNodeKey.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/UpdateNodeKey.java
deleted file mode 100644
index 4e6fa18..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/UpdateNodeKey.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="key-name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="key-value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "keyName",
- "keyValue"
-})
-@XmlRootElement(name = "update-node-key")
-public class UpdateNodeKey
- implements AAIDatum
-{
-
- @XmlElement(name = "key-name")
- protected String keyName;
- @XmlElement(name = "key-value")
- protected String keyValue;
-
- /**
- * Gets the value of the keyName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getKeyName() {
- return keyName;
- }
-
- /**
- * Sets the value of the keyName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setKeyName(String value) {
- this.keyName = value;
- }
-
- /**
- * Gets the value of the keyValue property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getKeyValue() {
- return keyValue;
- }
-
- /**
- * Sets the value of the keyValue property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setKeyValue(String value) {
- this.keyValue = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VfModule.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VfModule.java
deleted file mode 100644
index 84f7bbc..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VfModule.java
+++ /dev/null
@@ -1,395 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="vf-module-id" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="vf-module-name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="heat-stack-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="orchestration-status" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="is-base-vf-module" type="{http://www.w3.org/2001/XMLSchema}boolean"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="persona-model-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="persona-model-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="widget-model-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="widget-model-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="contrail-service-instance-fqdn" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "vfModuleId",
- "vfModuleName",
- "heatStackId",
- "orchestrationStatus",
- "isBaseVfModule",
- "resourceVersion",
- "personaModelId",
- "personaModelVersion",
- "widgetModelId",
- "widgetModelVersion",
- "contrailServiceInstanceFqdn",
- "relationshipList"
-})
-@XmlRootElement(name = "vf-module")
-public class VfModule
- implements AAIDatum
-{
-
- @XmlElement(name = "vf-module-id", required = true)
- protected String vfModuleId;
- @XmlElement(name = "vf-module-name")
- protected String vfModuleName;
- @XmlElement(name = "heat-stack-id")
- protected String heatStackId;
- @XmlElement(name = "orchestration-status")
- protected String orchestrationStatus;
- @XmlElement(name = "is-base-vf-module")
- protected boolean isBaseVfModule;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "persona-model-id")
- protected String personaModelId;
- @XmlElement(name = "persona-model-version")
- protected String personaModelVersion;
- @XmlElement(name = "widget-model-id")
- protected String widgetModelId;
- @XmlElement(name = "widget-model-version")
- protected String widgetModelVersion;
- @XmlElement(name = "contrail-service-instance-fqdn")
- protected String contrailServiceInstanceFqdn;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the vfModuleId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getVfModuleId() {
- return vfModuleId;
- }
-
- /**
- * Sets the value of the vfModuleId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVfModuleId(String value) {
- this.vfModuleId = value;
- }
-
- /**
- * Gets the value of the vfModuleName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getVfModuleName() {
- return vfModuleName;
- }
-
- /**
- * Sets the value of the vfModuleName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVfModuleName(String value) {
- this.vfModuleName = value;
- }
-
- /**
- * Gets the value of the heatStackId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getHeatStackId() {
- return heatStackId;
- }
-
- /**
- * Sets the value of the heatStackId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setHeatStackId(String value) {
- this.heatStackId = value;
- }
-
- /**
- * Gets the value of the orchestrationStatus property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getOrchestrationStatus() {
- return orchestrationStatus;
- }
-
- /**
- * Sets the value of the orchestrationStatus property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setOrchestrationStatus(String value) {
- this.orchestrationStatus = value;
- }
-
- /**
- * Gets the value of the isBaseVfModule property.
- *
- */
- public boolean isIsBaseVfModule() {
- return isBaseVfModule;
- }
-
- /**
- * Sets the value of the isBaseVfModule property.
- *
- */
- public void setIsBaseVfModule(boolean value) {
- this.isBaseVfModule = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the personaModelId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPersonaModelId() {
- return personaModelId;
- }
-
- /**
- * Sets the value of the personaModelId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPersonaModelId(String value) {
- this.personaModelId = value;
- }
-
- /**
- * Gets the value of the personaModelVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPersonaModelVersion() {
- return personaModelVersion;
- }
-
- /**
- * Sets the value of the personaModelVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setPersonaModelVersion(String value) {
- this.personaModelVersion = value;
- }
-
- /**
- * Gets the value of the widgetModelId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getWidgetModelId() {
- return widgetModelId;
- }
-
- /**
- * Sets the value of the widgetModelId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setWidgetModelId(String value) {
- this.widgetModelId = value;
- }
-
- /**
- * Gets the value of the widgetModelVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getWidgetModelVersion() {
- return widgetModelVersion;
- }
-
- /**
- * Sets the value of the widgetModelVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setWidgetModelVersion(String value) {
- this.widgetModelVersion = value;
- }
-
- /**
- * Gets the value of the contrailServiceInstanceFqdn property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getContrailServiceInstanceFqdn() {
- return contrailServiceInstanceFqdn;
- }
-
- /**
- * Sets the value of the contrailServiceInstanceFqdn property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setContrailServiceInstanceFqdn(String value) {
- this.contrailServiceInstanceFqdn = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VfModules.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VfModules.java
deleted file mode 100644
index c5cab71..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VfModules.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}vf-module" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "vfModule"
-})
-@XmlRootElement(name = "vf-modules")
-public class VfModules
- implements AAIDatum
-{
-
- @XmlElement(name = "vf-module")
- protected List<VfModule> vfModule;
-
- /**
- * Gets the value of the vfModule property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the vfModule property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getVfModule().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link VfModule }
- *
- *
- */
- public List<VfModule> getVfModule() {
- if (vfModule == null) {
- vfModule = new ArrayList<VfModule>();
- }
- return this.vfModule;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vlan.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vlan.java
deleted file mode 100644
index 861736e..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vlan.java
+++ /dev/null
@@ -1,418 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="vlan-interface" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="vlan-id-inner" type="{http://www.w3.org/2001/XMLSchema}unsignedInt" minOccurs="0"/&gt;
- * &lt;element name="vlan-id-outer" type="{http://www.w3.org/2001/XMLSchema}unsignedInt" minOccurs="0"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="speed-value" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="speed-units" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="vlan-description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="backdoor-connection" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="vpn-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}l3-interface-ipv4-address-list" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}l3-interface-ipv6-address-list" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "vlanInterface",
- "vlanIdInner",
- "vlanIdOuter",
- "resourceVersion",
- "speedValue",
- "speedUnits",
- "vlanDescription",
- "backdoorConnection",
- "vpnId",
- "relationshipList",
- "l3InterfaceIpv4AddressList",
- "l3InterfaceIpv6AddressList"
-})
-@XmlRootElement(name = "vlan")
-public class Vlan
- implements AAIDatum
-{
-
- @XmlElement(name = "vlan-interface", required = true)
- protected String vlanInterface;
- @XmlElement(name = "vlan-id-inner")
- @XmlSchemaType(name = "unsignedInt")
- protected Long vlanIdInner;
- @XmlElement(name = "vlan-id-outer")
- @XmlSchemaType(name = "unsignedInt")
- protected Long vlanIdOuter;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "speed-value")
- protected String speedValue;
- @XmlElement(name = "speed-units")
- protected String speedUnits;
- @XmlElement(name = "vlan-description")
- protected String vlanDescription;
- @XmlElement(name = "backdoor-connection")
- protected String backdoorConnection;
- @XmlElement(name = "vpn-id")
- protected String vpnId;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
- @XmlElement(name = "l3-interface-ipv4-address-list")
- protected List<L3InterfaceIpv4AddressList> l3InterfaceIpv4AddressList;
- @XmlElement(name = "l3-interface-ipv6-address-list")
- protected List<L3InterfaceIpv6AddressList> l3InterfaceIpv6AddressList;
-
- /**
- * Gets the value of the vlanInterface property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getVlanInterface() {
- return vlanInterface;
- }
-
- /**
- * Sets the value of the vlanInterface property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVlanInterface(String value) {
- this.vlanInterface = value;
- }
-
- /**
- * Gets the value of the vlanIdInner property.
- *
- * @return
- * possible object is
- * {@link Long }
- *
- */
- public Long getVlanIdInner() {
- return vlanIdInner;
- }
-
- /**
- * Sets the value of the vlanIdInner property.
- *
- * @param value
- * allowed object is
- * {@link Long }
- *
- */
- public void setVlanIdInner(Long value) {
- this.vlanIdInner = value;
- }
-
- /**
- * Gets the value of the vlanIdOuter property.
- *
- * @return
- * possible object is
- * {@link Long }
- *
- */
- public Long getVlanIdOuter() {
- return vlanIdOuter;
- }
-
- /**
- * Sets the value of the vlanIdOuter property.
- *
- * @param value
- * allowed object is
- * {@link Long }
- *
- */
- public void setVlanIdOuter(Long value) {
- this.vlanIdOuter = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the speedValue property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSpeedValue() {
- return speedValue;
- }
-
- /**
- * Sets the value of the speedValue property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSpeedValue(String value) {
- this.speedValue = value;
- }
-
- /**
- * Gets the value of the speedUnits property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSpeedUnits() {
- return speedUnits;
- }
-
- /**
- * Sets the value of the speedUnits property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSpeedUnits(String value) {
- this.speedUnits = value;
- }
-
- /**
- * Gets the value of the vlanDescription property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getVlanDescription() {
- return vlanDescription;
- }
-
- /**
- * Sets the value of the vlanDescription property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVlanDescription(String value) {
- this.vlanDescription = value;
- }
-
- /**
- * Gets the value of the backdoorConnection property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getBackdoorConnection() {
- return backdoorConnection;
- }
-
- /**
- * Sets the value of the backdoorConnection property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setBackdoorConnection(String value) {
- this.backdoorConnection = value;
- }
-
- /**
- * Gets the value of the vpnId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getVpnId() {
- return vpnId;
- }
-
- /**
- * Sets the value of the vpnId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVpnId(String value) {
- this.vpnId = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
- /**
- * Gets the value of the l3InterfaceIpv4AddressList property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the l3InterfaceIpv4AddressList property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getL3InterfaceIpv4AddressList().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link L3InterfaceIpv4AddressList }
- *
- *
- */
- public List<L3InterfaceIpv4AddressList> getL3InterfaceIpv4AddressList() {
- if (l3InterfaceIpv4AddressList == null) {
- l3InterfaceIpv4AddressList = new ArrayList<L3InterfaceIpv4AddressList>();
- }
- return this.l3InterfaceIpv4AddressList;
- }
-
- /**
- * Gets the value of the l3InterfaceIpv6AddressList property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the l3InterfaceIpv6AddressList property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getL3InterfaceIpv6AddressList().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link L3InterfaceIpv6AddressList }
- *
- *
- */
- public List<L3InterfaceIpv6AddressList> getL3InterfaceIpv6AddressList() {
- if (l3InterfaceIpv6AddressList == null) {
- l3InterfaceIpv6AddressList = new ArrayList<L3InterfaceIpv6AddressList>();
- }
- return this.l3InterfaceIpv6AddressList;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vlans.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vlans.java
deleted file mode 100644
index e5af2b6..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vlans.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}vlan" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "vlan"
-})
-@XmlRootElement(name = "vlans")
-public class Vlans
- implements AAIDatum
-{
-
- protected List<Vlan> vlan;
-
- /**
- * Gets the value of the vlan property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the vlan property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getVlan().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Vlan }
- *
- *
- */
- public List<Vlan> getVlan() {
- if (vlan == null) {
- vlan = new ArrayList<Vlan>();
- }
- return this.vlan;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vnfc.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vnfc.java
deleted file mode 100644
index e402509..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vnfc.java
+++ /dev/null
@@ -1,359 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="vnfc-name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="vnfc-function-code" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="vnfc-type" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="prov-status" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="orchestration-status" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="ipaddress-v4-oam-vip" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="in-maint" type="{http://www.w3.org/2001/XMLSchema}boolean"/&gt;
- * &lt;element name="is-closed-loop-disabled" type="{http://www.w3.org/2001/XMLSchema}boolean"/&gt;
- * &lt;element name="group-notation" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "vnfcName",
- "vnfcFunctionCode",
- "vnfcType",
- "provStatus",
- "orchestrationStatus",
- "ipaddressV4OamVip",
- "inMaint",
- "isClosedLoopDisabled",
- "groupNotation",
- "resourceVersion",
- "relationshipList"
-})
-@XmlRootElement(name = "vnfc")
-public class Vnfc
- implements AAIDatum
-{
-
- @XmlElement(name = "vnfc-name", required = true)
- protected String vnfcName;
- @XmlElement(name = "vnfc-function-code", required = true)
- protected String vnfcFunctionCode;
- @XmlElement(name = "vnfc-type", required = true)
- protected String vnfcType;
- @XmlElement(name = "prov-status")
- protected String provStatus;
- @XmlElement(name = "orchestration-status")
- protected String orchestrationStatus;
- @XmlElement(name = "ipaddress-v4-oam-vip")
- protected String ipaddressV4OamVip;
- @XmlElement(name = "in-maint")
- protected boolean inMaint;
- @XmlElement(name = "is-closed-loop-disabled")
- protected boolean isClosedLoopDisabled;
- @XmlElement(name = "group-notation")
- protected String groupNotation;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the vnfcName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getVnfcName() {
- return vnfcName;
- }
-
- /**
- * Sets the value of the vnfcName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVnfcName(String value) {
- this.vnfcName = value;
- }
-
- /**
- * Gets the value of the vnfcFunctionCode property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getVnfcFunctionCode() {
- return vnfcFunctionCode;
- }
-
- /**
- * Sets the value of the vnfcFunctionCode property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVnfcFunctionCode(String value) {
- this.vnfcFunctionCode = value;
- }
-
- /**
- * Gets the value of the vnfcType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getVnfcType() {
- return vnfcType;
- }
-
- /**
- * Sets the value of the vnfcType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVnfcType(String value) {
- this.vnfcType = value;
- }
-
- /**
- * Gets the value of the provStatus property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getProvStatus() {
- return provStatus;
- }
-
- /**
- * Sets the value of the provStatus property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setProvStatus(String value) {
- this.provStatus = value;
- }
-
- /**
- * Gets the value of the orchestrationStatus property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getOrchestrationStatus() {
- return orchestrationStatus;
- }
-
- /**
- * Sets the value of the orchestrationStatus property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setOrchestrationStatus(String value) {
- this.orchestrationStatus = value;
- }
-
- /**
- * Gets the value of the ipaddressV4OamVip property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getIpaddressV4OamVip() {
- return ipaddressV4OamVip;
- }
-
- /**
- * Sets the value of the ipaddressV4OamVip property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setIpaddressV4OamVip(String value) {
- this.ipaddressV4OamVip = value;
- }
-
- /**
- * Gets the value of the inMaint property.
- *
- */
- public boolean isInMaint() {
- return inMaint;
- }
-
- /**
- * Sets the value of the inMaint property.
- *
- */
- public void setInMaint(boolean value) {
- this.inMaint = value;
- }
-
- /**
- * Gets the value of the isClosedLoopDisabled property.
- *
- */
- public boolean isIsClosedLoopDisabled() {
- return isClosedLoopDisabled;
- }
-
- /**
- * Sets the value of the isClosedLoopDisabled property.
- *
- */
- public void setIsClosedLoopDisabled(boolean value) {
- this.isClosedLoopDisabled = value;
- }
-
- /**
- * Gets the value of the groupNotation property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getGroupNotation() {
- return groupNotation;
- }
-
- /**
- * Sets the value of the groupNotation property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setGroupNotation(String value) {
- this.groupNotation = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vnfcs.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vnfcs.java
deleted file mode 100644
index 2d929e5..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vnfcs.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}vnfc" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "vnfc"
-})
-@XmlRootElement(name = "vnfcs")
-public class Vnfcs
- implements AAIDatum
-{
-
- protected List<Vnfc> vnfc;
-
- /**
- * Gets the value of the vnfc property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the vnfc property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getVnfc().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Vnfc }
- *
- *
- */
- public List<Vnfc> getVnfc() {
- if (vnfc == null) {
- vnfc = new ArrayList<Vnfc>();
- }
- return this.vnfc;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Volume.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Volume.java
deleted file mode 100644
index c716303..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Volume.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="volume-id" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="volume-selflink" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "volumeId",
- "volumeSelflink",
- "resourceVersion",
- "relationshipList"
-})
-@XmlRootElement(name = "volume")
-public class Volume
- implements AAIDatum
-{
-
- @XmlElement(name = "volume-id", required = true)
- protected String volumeId;
- @XmlElement(name = "volume-selflink", required = true)
- protected String volumeSelflink;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the volumeId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getVolumeId() {
- return volumeId;
- }
-
- /**
- * Sets the value of the volumeId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVolumeId(String value) {
- this.volumeId = value;
- }
-
- /**
- * Gets the value of the volumeSelflink property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getVolumeSelflink() {
- return volumeSelflink;
- }
-
- /**
- * Sets the value of the volumeSelflink property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVolumeSelflink(String value) {
- this.volumeSelflink = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VolumeGroup.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VolumeGroup.java
deleted file mode 100644
index 3ff2a4c..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VolumeGroup.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="volume-group-id" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="volume-group-name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="heat-stack-id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="vnf-type" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="orchestration-status" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "volumeGroupId",
- "volumeGroupName",
- "heatStackId",
- "vnfType",
- "orchestrationStatus",
- "resourceVersion",
- "relationshipList"
-})
-@XmlRootElement(name = "volume-group")
-public class VolumeGroup
- implements AAIDatum
-{
-
- @XmlElement(name = "volume-group-id", required = true)
- protected String volumeGroupId;
- @XmlElement(name = "volume-group-name", required = true)
- protected String volumeGroupName;
- @XmlElement(name = "heat-stack-id")
- protected String heatStackId;
- @XmlElement(name = "vnf-type", required = true)
- protected String vnfType;
- @XmlElement(name = "orchestration-status")
- protected String orchestrationStatus;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
-
- /**
- * Gets the value of the volumeGroupId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getVolumeGroupId() {
- return volumeGroupId;
- }
-
- /**
- * Sets the value of the volumeGroupId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVolumeGroupId(String value) {
- this.volumeGroupId = value;
- }
-
- /**
- * Gets the value of the volumeGroupName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getVolumeGroupName() {
- return volumeGroupName;
- }
-
- /**
- * Sets the value of the volumeGroupName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVolumeGroupName(String value) {
- this.volumeGroupName = value;
- }
-
- /**
- * Gets the value of the heatStackId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getHeatStackId() {
- return heatStackId;
- }
-
- /**
- * Sets the value of the heatStackId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setHeatStackId(String value) {
- this.heatStackId = value;
- }
-
- /**
- * Gets the value of the vnfType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getVnfType() {
- return vnfType;
- }
-
- /**
- * Sets the value of the vnfType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVnfType(String value) {
- this.vnfType = value;
- }
-
- /**
- * Gets the value of the orchestrationStatus property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getOrchestrationStatus() {
- return orchestrationStatus;
- }
-
- /**
- * Sets the value of the orchestrationStatus property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setOrchestrationStatus(String value) {
- this.orchestrationStatus = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VolumeGroups.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VolumeGroups.java
deleted file mode 100644
index 59fba62..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VolumeGroups.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}volume-group" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "volumeGroup"
-})
-@XmlRootElement(name = "volume-groups")
-public class VolumeGroups
- implements AAIDatum
-{
-
- @XmlElement(name = "volume-group")
- protected List<VolumeGroup> volumeGroup;
-
- /**
- * Gets the value of the volumeGroup property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the volumeGroup property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getVolumeGroup().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link VolumeGroup }
- *
- *
- */
- public List<VolumeGroup> getVolumeGroup() {
- if (volumeGroup == null) {
- volumeGroup = new ArrayList<VolumeGroup>();
- }
- return this.volumeGroup;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Volumes.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Volumes.java
deleted file mode 100644
index 63497f1..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Volumes.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}volume" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "volume"
-})
-@XmlRootElement(name = "volumes")
-public class Volumes
- implements AAIDatum
-{
-
- protected List<Volume> volume;
-
- /**
- * Gets the value of the volume property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the volume property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getVolume().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Volume }
- *
- *
- */
- public List<Volume> getVolume() {
- if (volume == null) {
- volume = new ArrayList<Volume>();
- }
- return this.volume;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vserver.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vserver.java
deleted file mode 100644
index 1a9aa21..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vserver.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element name="vserver-id" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="vserver-name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="vserver-name2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="prov-status" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element name="vserver-selflink" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
- * &lt;element name="in-maint" type="{http://www.w3.org/2001/XMLSchema}boolean"/&gt;
- * &lt;element name="is-closed-loop-disabled" type="{http://www.w3.org/2001/XMLSchema}boolean"/&gt;
- * &lt;element name="resource-version" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}volumes" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}relationship-list" minOccurs="0"/&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}l-interfaces" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "vserverId",
- "vserverName",
- "vserverName2",
- "provStatus",
- "vserverSelflink",
- "inMaint",
- "isClosedLoopDisabled",
- "resourceVersion",
- "volumes",
- "relationshipList",
- "lInterfaces"
-})
-@XmlRootElement(name = "vserver")
-public class Vserver
- implements AAIDatum
-{
-
- @XmlElement(name = "vserver-id", required = true)
- protected String vserverId;
- @XmlElement(name = "vserver-name", required = true)
- protected String vserverName;
- @XmlElement(name = "vserver-name2")
- protected String vserverName2;
- @XmlElement(name = "prov-status")
- protected String provStatus;
- @XmlElement(name = "vserver-selflink", required = true)
- protected String vserverSelflink;
- @XmlElement(name = "in-maint")
- protected boolean inMaint;
- @XmlElement(name = "is-closed-loop-disabled")
- protected boolean isClosedLoopDisabled;
- @XmlElement(name = "resource-version")
- protected String resourceVersion;
- protected Volumes volumes;
- @XmlElement(name = "relationship-list")
- protected RelationshipList relationshipList;
- @XmlElement(name = "l-interfaces")
- protected LInterfaces lInterfaces;
-
- /**
- * Gets the value of the vserverId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getVserverId() {
- return vserverId;
- }
-
- /**
- * Sets the value of the vserverId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVserverId(String value) {
- this.vserverId = value;
- }
-
- /**
- * Gets the value of the vserverName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getVserverName() {
- return vserverName;
- }
-
- /**
- * Sets the value of the vserverName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVserverName(String value) {
- this.vserverName = value;
- }
-
- /**
- * Gets the value of the vserverName2 property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getVserverName2() {
- return vserverName2;
- }
-
- /**
- * Sets the value of the vserverName2 property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVserverName2(String value) {
- this.vserverName2 = value;
- }
-
- /**
- * Gets the value of the provStatus property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getProvStatus() {
- return provStatus;
- }
-
- /**
- * Sets the value of the provStatus property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setProvStatus(String value) {
- this.provStatus = value;
- }
-
- /**
- * Gets the value of the vserverSelflink property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getVserverSelflink() {
- return vserverSelflink;
- }
-
- /**
- * Sets the value of the vserverSelflink property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setVserverSelflink(String value) {
- this.vserverSelflink = value;
- }
-
- /**
- * Gets the value of the inMaint property.
- *
- */
- public boolean isInMaint() {
- return inMaint;
- }
-
- /**
- * Sets the value of the inMaint property.
- *
- */
- public void setInMaint(boolean value) {
- this.inMaint = value;
- }
-
- /**
- * Gets the value of the isClosedLoopDisabled property.
- *
- */
- public boolean isIsClosedLoopDisabled() {
- return isClosedLoopDisabled;
- }
-
- /**
- * Sets the value of the isClosedLoopDisabled property.
- *
- */
- public void setIsClosedLoopDisabled(boolean value) {
- this.isClosedLoopDisabled = value;
- }
-
- /**
- * Gets the value of the resourceVersion property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- /**
- * Sets the value of the resourceVersion property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setResourceVersion(String value) {
- this.resourceVersion = value;
- }
-
- /**
- * Gets the value of the volumes property.
- *
- * @return
- * possible object is
- * {@link Volumes }
- *
- */
- public Volumes getVolumes() {
- return volumes;
- }
-
- /**
- * Sets the value of the volumes property.
- *
- * @param value
- * allowed object is
- * {@link Volumes }
- *
- */
- public void setVolumes(Volumes value) {
- this.volumes = value;
- }
-
- /**
- * Gets the value of the relationshipList property.
- *
- * @return
- * possible object is
- * {@link RelationshipList }
- *
- */
- public RelationshipList getRelationshipList() {
- return relationshipList;
- }
-
- /**
- * Sets the value of the relationshipList property.
- *
- * @param value
- * allowed object is
- * {@link RelationshipList }
- *
- */
- public void setRelationshipList(RelationshipList value) {
- this.relationshipList = value;
- }
-
- /**
- * Gets the value of the lInterfaces property.
- *
- * @return
- * possible object is
- * {@link LInterfaces }
- *
- */
- public LInterfaces getLInterfaces() {
- return lInterfaces;
- }
-
- /**
- * Sets the value of the lInterfaces property.
- *
- * @param value
- * allowed object is
- * {@link LInterfaces }
- *
- */
- public void setLInterfaces(LInterfaces value) {
- this.lInterfaces = value;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vservers.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vservers.java
deleted file mode 100644
index 3dd45e1..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vservers.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-
-package org.openecomp.aai.inventory.v8;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType&gt;
- * &lt;complexContent&gt;
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- * &lt;sequence&gt;
- * &lt;element ref="{http://org.openecomp.aai.inventory/v8}vserver" maxOccurs="unbounded" minOccurs="0"/&gt;
- * &lt;/sequence&gt;
- * &lt;/restriction&gt;
- * &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "vserver"
-})
-@XmlRootElement(name = "vservers")
-public class Vservers
- implements AAIDatum
-{
-
- protected List<Vserver> vserver;
-
- /**
- * Gets the value of the vserver property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the vserver property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getVserver().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Vserver }
- *
- *
- */
- public List<Vserver> getVserver() {
- if (vserver == null) {
- vserver = new ArrayList<Vserver>();
- }
- return this.vserver;
- }
-
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/package-info.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/package-info.java
deleted file mode 100644
index 81ab4da..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/package-info.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00
-//
-
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://org.openecomp.aai.inventory/v8", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.openecomp.aai.inventory.v8;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIClient.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIClient.java
index a57393c..05c4185 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIClient.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIClient.java
@@ -35,17 +35,7 @@ import org.openecomp.sdnc.sli.aai.update.Update;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.openecomp.aai.inventory.v8.AvailabilityZone;
-import org.openecomp.aai.inventory.v8.GenericVnf;
-import org.openecomp.aai.inventory.v8.L3Network;
-import org.openecomp.aai.inventory.v8.PInterface;
-import org.openecomp.aai.inventory.v8.PhysicalLink;
-import org.openecomp.aai.inventory.v8.Pserver;
-import org.openecomp.aai.inventory.v8.SearchResults;
-import org.openecomp.aai.inventory.v8.Service;
-import org.openecomp.aai.inventory.v8.ServiceInstance;
-import org.openecomp.aai.inventory.v8.Tenant;
-import org.openecomp.aai.inventory.v8.Vserver;
+import org.openecomp.aai.inventory.v10.*;
public interface AAIClient extends SvcLogicResource, SvcLogicJavaPlugin {
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIDeclarations.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIDeclarations.java
index f2f83c3..1157fb2 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIDeclarations.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIDeclarations.java
@@ -28,6 +28,7 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
+import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -57,23 +58,7 @@ import org.openecomp.sdnc.sli.aai.query.NamedQueryData;
import org.openecomp.sdnc.sli.aai.query.QueryParameters;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.openecomp.aai.inventory.v8.GenericVnf;
-import org.openecomp.aai.inventory.v8.InventoryResponseItem;
-import org.openecomp.aai.inventory.v8.InventoryResponseItems;
-import org.openecomp.aai.inventory.v8.L3Network;
-import org.openecomp.aai.inventory.v8.LogicalLink;
-import org.openecomp.aai.inventory.v8.Metadata;
-import org.openecomp.aai.inventory.v8.Metadatum;
-import org.openecomp.aai.inventory.v8.Pnf;
-import org.openecomp.aai.inventory.v8.Relationship;
-import org.openecomp.aai.inventory.v8.RelationshipData;
-import org.openecomp.aai.inventory.v8.RelationshipList;
-import org.openecomp.aai.inventory.v8.ResultData;
-import org.openecomp.aai.inventory.v8.SearchResults;
-import org.openecomp.aai.inventory.v8.ServiceInstance;
-import org.openecomp.aai.inventory.v8.Vlan;
-import org.openecomp.aai.inventory.v8.Vlans;
-import org.openecomp.aai.inventory.v8.Vserver;
+import org.openecomp.aai.inventory.v10.*;
public abstract class AAIDeclarations implements AAIClient {
@@ -1535,20 +1520,20 @@ public abstract class AAIDeclarations implements AAIClient {
if(relatedLink != null) {
relationship.setRelatedLink(relatedLink);
} else {
- List<RelationshipData> relData = relationship.getRelationshipData();
+ List<RelationshipData> relData = relationship.getRelationshipData();
- while(true) {
- String searchRelationshipKey = "relationship-list.relationship[" + i + "].relationship-data[" + j + "].relationship-key";
- String searchRelationshipValue = "relationship-list.relationship[" + i + "].relationship-data[" + j + "].relationship-value";
- if(!params.containsKey(searchRelationshipKey))
- break;
+ while(true) {
+ String searchRelationshipKey = "relationship-list.relationship[" + i + "].relationship-data[" + j + "].relationship-key";
+ String searchRelationshipValue = "relationship-list.relationship[" + i + "].relationship-data[" + j + "].relationship-value";
+ if(!params.containsKey(searchRelationshipKey))
+ break;
- RelationshipData relDatum = new RelationshipData();
- relDatum.setRelationshipKey(params.get(searchRelationshipKey));
- relDatum.setRelationshipValue(params.get(searchRelationshipValue));
- relData.add(relDatum);
- j++;
- }
+ RelationshipData relDatum = new RelationshipData();
+ relDatum.setRelationshipKey(params.get(searchRelationshipKey));
+ relDatum.setRelationshipValue(params.get(searchRelationshipValue));
+ relData.add(relDatum);
+ j++;
+ }
}
@@ -1807,6 +1792,9 @@ public abstract class AAIDeclarations implements AAIClient {
relatedTo = relatedTo.replaceAll("_", "-");
String relatedLink = nameValues.get("relationship.related_link");
+ if(relatedLink != null) {
+ relatedLink = URLDecoder.decode(relatedLink, "UTF-8");
+ }
List<Relationship> relationships = relationshipList.getRelationship();
List<Relationship> relationshipsToDelete = new LinkedList<Relationship>();
@@ -1814,14 +1802,20 @@ public abstract class AAIDeclarations implements AAIClient {
for(Relationship relationship : relationships) {
if(relatedTo.equals(relationship.getRelatedTo())) {
if(relatedLink != null) {
- if(relationship.getRelatedLink() == null || !relationship.getRelatedLink().endsWith(relatedLink)) {
- continue;
+ if(relationship.getRelatedLink() != null ) {
+ String localRelatedLink = relationship.getRelatedLink();
+ localRelatedLink = URLDecoder.decode(localRelatedLink, "UTF-8");
+ if(localRelatedLink.endsWith(relatedLink)) {
+ getLogger().debug(String.format("Found relationship of '%s' to keyword '%s'", relationship.getRelatedTo(), relatedTo));
+ relationshipsToDelete.add(relationship);
}
}
+ } else {
getLogger().debug(String.format("Found relationship of '%s' to keyword '%s'", relationship.getRelatedTo(), relatedTo));
relationshipsToDelete.add(relationship);
}
}
+ }
if(relationshipsToDelete == null || relationshipsToDelete.isEmpty()) {
getLogger().info(String.format("Relationship has not been found for %s", key));
return QueryStatus.NOT_FOUND;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIRequest.java
index 30d2168..6247e2d 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIRequest.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIRequest.java
@@ -55,7 +55,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.openecomp.aai.inventory.v8.GenericVnf;
+import org.openecomp.aai.inventory.v10.*;
public abstract class AAIRequest {
protected static final Logger LOG = LoggerFactory.getLogger(AAIRequest.class);
@@ -355,7 +355,7 @@ public abstract class AAIRequest {
return false;
}
- public static ObjectMapper getObjectMapper() {
+ ObjectMapper getObjectMapper() {
return AAIService.getObjectMapper();
}
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIService.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIService.java
index 8feba08..9dadd00 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIService.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIService.java
@@ -96,7 +96,7 @@ import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
import com.sun.jersey.api.client.config.DefaultClientConfig;
import com.sun.jersey.client.urlconnection.HTTPSProperties;
-import org.openecomp.aai.inventory.v8.*;
+import org.openecomp.aai.inventory.v10.*;
public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicResource {
@@ -2160,10 +2160,10 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
Tenant response = null;
try {
- AAIRequest request = new TenantRequest();
- request.addRequestProperty(TenantRequest.TENANT_ID, tenant_id);
- request.addRequestProperty(CloudRegionRequest.CLOUD_REGION_CLOUD_OWNER, cloudOwner);
- request.addRequestProperty(CloudRegionRequest.CLOUD_REGION_CLOUD_REGION_ID, cloudRegionId);
+ AAIRequest request = AAIRequest.getRequestFromResource("tenant");
+ request.addRequestProperty("tenant.tenant-id", tenant_id);
+ request.addRequestProperty("cloud-region.cloud-owner", cloudOwner);
+ request.addRequestProperty("cloud-region.cloud-region-id", cloudRegionId);
String rv = executor.get(request);
if(rv != null) {
@@ -2185,10 +2185,10 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
Tenant response = null;
try {
- AAIRequest request = new TenantRequest();
- request.addRequestProperty(TenantRequest.TENANT_NAME, tenant_name);
- request.addRequestProperty(CloudRegionRequest.CLOUD_REGION_CLOUD_OWNER, cloudOwner);
- request.addRequestProperty(CloudRegionRequest.CLOUD_REGION_CLOUD_REGION_ID, cloudRegionId);
+ AAIRequest request = AAIRequest.getRequestFromResource("tenant");
+ request.addRequestProperty("tenant.tenant-name", tenant_name);
+ request.addRequestProperty("cloud-region.cloud-owner", cloudOwner);
+ request.addRequestProperty("cloud-region.cloud-region-id", cloudRegionId);
Object rv = executor.query(request, Tenant.class);
if(rv == null)
return (Tenant)null;
@@ -2210,10 +2210,10 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
Boolean response = null;
try {
- AAIRequest request = new TenantRequest();
- request.addRequestProperty(TenantRequest.TENANT_ID, tenant_id);
- request.addRequestProperty(CloudRegionRequest.CLOUD_REGION_CLOUD_OWNER, cloudOwner);
- request.addRequestProperty(CloudRegionRequest.CLOUD_REGION_CLOUD_REGION_ID, cloudRegionId);
+ AAIRequest request = AAIRequest.getRequestFromResource("tenant");
+ request.addRequestProperty("tenant.tenant-id", tenant_id);
+ request.addRequestProperty("cloud-region.cloud-owner", cloudOwner);
+ request.addRequestProperty("cloud-region.cloud-region-id", cloudRegionId);
request.setRequestObject(tenannt);
response = executor.post(request);
} catch(AAIServiceException aaiexc) {
@@ -2513,7 +2513,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
break;
default:
- if(key.contains(String.format("%s.", resource))) {
+ if(!key.contains(String.format("%s.", resource))) {
key = rewriteKey(resource, key, ctx);
}
}
@@ -2558,7 +2558,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
break;
default:
- if(key.contains(String.format("%s.", resource))) {
+ if(!key.contains(String.format("%s.", resource))) {
key = rewriteKey(resource, key, ctx);
}
}
@@ -2580,7 +2580,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
break;
default:
- if(key.contains(String.format("%s.", resource))) {
+ if(!key.contains(String.format("%s.", resource))) {
key = rewriteKey(resource, key, ctx);
}
}
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIServiceActivator.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIServiceActivator.java
index 261a0c7..b00748b 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIServiceActivator.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIServiceActivator.java
@@ -55,6 +55,8 @@ public class AAIServiceActivator implements BundleActivator {
@Override
public void start(BundleContext ctx) throws Exception {
+ System.setProperty("aaiclient.runtime", "OSGI");
+
String sdnConfigDirectory = System.getenv(SDNC_CONFIG_DIR);
// check SDNC CONFIG DIR system property
@@ -210,8 +212,17 @@ public class AAIServiceActivator implements BundleActivator {
for(ServiceRegistration registration : localRegistrationSet) {
if (registration != null) {
+ try {
+ AAIService aaiService = (AAIService)ctx.getService(registration.getReference());
registration.unregister();
registrationSet.remove(registration);
+ if(aaiService != null) {
+ aaiService.cleanUp();
+ }
+ } catch(Exception exc) {
+ if(LOG.isDebugEnabled())
+ LOG.debug(exc.getMessage());
+ }
}
}
}
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/CloudRegionRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/CloudRegionRequest.java
index 9897fbf..eed22f7 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/CloudRegionRequest.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/CloudRegionRequest.java
@@ -24,21 +24,24 @@ package org.openecomp.sdnc.sli.aai;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Properties;
import org.openecomp.sdnc.sli.aai.data.AAIDatum;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Joiner;
-import org.openecomp.aai.inventory.v8.CloudRegion;
+import org.openecomp.aai.inventory.v10.CloudRegion;
public class CloudRegionRequest extends AAIRequest {
public static final String CLOUD_REGION_PATH = "org.openecomp.sdnc.sli.aai.path.cloud.region";
-
+
private final String cloud_region_path;
-
+
public static final String CLOUD_REGION_CLOUD_OWNER = "cloud-region.cloud-owner";
public static final String CLOUD_REGION_CLOUD_REGION_ID = "cloud-region.cloud-region-id";
@@ -51,7 +54,7 @@ public class CloudRegionRequest extends AAIRequest {
public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
return this.getRequestUrl(method, null);
}
-
+
@Override
public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
@@ -59,13 +62,25 @@ public class CloudRegionRequest extends AAIRequest {
request_url = processPathData(request_url, requestProperties);
+ Map<String, String> query = new HashMap<String, String>();
+ if(requestProperties.containsKey(DEPTH)) {
+ query.put(DEPTH, requestProperties.getProperty(DEPTH));
+ }
+
if(resourceVersion != null) {
- request_url = request_url +"?resource-version="+resourceVersion;
+// request_url = request_url +"?resource-version="+resourceVersion;
+ query.put(RESOURCE_VERSION, resourceVersion);
+ }
+
+ if(!query.isEmpty()) {
+ Joiner.MapJoiner mapJoiner = Joiner.on("&").withKeyValueSeparator("=");
+ String queryString = mapJoiner.join(query);
+ request_url = String.format("%s?%s", request_url, queryString);
}
URL http_req_url = new URL(request_url);
aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
-
+
return http_req_url;
}
@@ -86,10 +101,11 @@ public class CloudRegionRequest extends AAIRequest {
@Override
public String[] getArgsList() {
- String[] args =
+ String[] args =
{
CLOUD_REGION_CLOUD_OWNER,
- CLOUD_REGION_CLOUD_REGION_ID
+ CLOUD_REGION_CLOUD_REGION_ID,
+ DEPTH
};
return args;
@@ -99,13 +115,13 @@ public class CloudRegionRequest extends AAIRequest {
public Class<? extends AAIDatum> getModelClass() {
return CloudRegion.class;
}
-
+
public static String processPathData(String request_url, Properties requestProperties) throws UnsupportedEncodingException {
if(!requestProperties.containsKey(CLOUD_REGION_CLOUD_OWNER) || !requestProperties.containsKey(CLOUD_REGION_CLOUD_REGION_ID)) {
aaiService.logKeyError(String.format("%s,%s", CLOUD_REGION_CLOUD_OWNER, CLOUD_REGION_CLOUD_REGION_ID));
}
-
+
String encoded_vnf = encodeQuery(requestProperties.getProperty(CLOUD_REGION_CLOUD_OWNER));
request_url = request_url.replace("{cloud-owner}", encoded_vnf) ;
@@ -114,7 +130,7 @@ public class CloudRegionRequest extends AAIRequest {
aaiService.LOGwriteDateTrace("cloud-owner", requestProperties.getProperty(CLOUD_REGION_CLOUD_OWNER));
aaiService.LOGwriteDateTrace("cloud-region-id", requestProperties.getProperty(CLOUD_REGION_CLOUD_REGION_ID));
-
+
return request_url;
}
}
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericQueryRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericQueryRequest.java
index 417202e..a420a06 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericQueryRequest.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericQueryRequest.java
@@ -31,14 +31,14 @@ import org.openecomp.sdnc.sli.aai.data.AAIDatum;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.openecomp.aai.inventory.v8.ResultData;
+import org.openecomp.aai.inventory.v10.ResultData;
public class GenericQueryRequest extends AAIRequest {
public static final String GENERIC_SEARCH_PATH = "org.openecomp.sdnc.sli.aai.query.generic";
-
+
private final String generic_search_path;
-
+
public static final String START_NODE_TYPE = "start-node-type";
public static final String IDENTIFIER = "identifier";
public static final String VALUE = "value";
@@ -48,7 +48,7 @@ public class GenericQueryRequest extends AAIRequest {
generic_search_path = configProperties.getProperty(GENERIC_SEARCH_PATH);
}
-
+
// @Override
// public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
//
@@ -57,15 +57,15 @@ public class GenericQueryRequest extends AAIRequest {
//
// String encoded_vnf = encodeQuery(requestProperties.getProperty(key));
// request_url = request_url.replace("{vnf-id}", encoded_vnf) ;
-//
+//
// if(resourceVersion != null) {
// request_url = request_url +"?resource-version="+resourceVersion;
// }
// URL http_req_url = new URL(request_url);
//
// aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
-//
-//
+//
+//
// return http_req_url;
// }
@@ -82,12 +82,12 @@ public class GenericQueryRequest extends AAIRequest {
URL http_req_url = new URL(request_url);
aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
-
+
return http_req_url;
}
-
+
@Override
- public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
+ public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
return getRequestUrl(method, null);
}
@@ -127,19 +127,19 @@ public class GenericQueryRequest extends AAIRequest {
String encoded_vnf = encodeQuery(requestProperties.getProperty(key));
request_url = request_url.replace("{identifier}", encoded_vnf) ;
aaiService.LOGwriteDateTrace("identifier", requestProperties.getProperty(key));
-
+
key = VALUE;
encoded_vnf = encodeQuery(requestProperties.getProperty(key));
request_url = request_url.replace("{value}", encoded_vnf) ;
aaiService.LOGwriteDateTrace("value", requestProperties.getProperty(key));
-
+
key = START_NODE_TYPE;
encoded_vnf = encodeQuery(requestProperties.getProperty(key));
request_url = request_url.replace("{start-node-type}", encoded_vnf) ;
aaiService.LOGwriteDateTrace("start-node-type", requestProperties.getProperty(key));
-
+
return request_url;
}
}
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericRequest.java
index 41ee9f3..54a5afc 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericRequest.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericRequest.java
@@ -37,8 +37,8 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Joiner;
-import org.openecomp.aai.inventory.v8.L3Network;
-import org.openecomp.aai.inventory.v8.L3Networks;
+import org.openecomp.aai.inventory.v10.L3Network;
+import org.openecomp.aai.inventory.v10.L3Networks;
public class GenericRequest extends AAIRequest {
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericVnfRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericVnfRequest.java
index 235cecf..5d181f3 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericVnfRequest.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericVnfRequest.java
@@ -31,17 +31,17 @@ import org.openecomp.sdnc.sli.aai.data.AAIDatum;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.openecomp.aai.inventory.v8.GenericVnf;
+import org.openecomp.aai.inventory.v10.GenericVnf;
public class GenericVnfRequest extends AAIRequest {
// tenant (1602)
public static final String GENERIC_VNF_PATH = "org.openecomp.sdnc.sli.aai.path.generic.vnf";
public static final String GENERIC_VNF_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.generic.vnf.query";
-
+
private final String generic_vnf_path;
private final String generic_vnf_query_path;
-
+
public static final String GENERIC_VNF_ID = "generic_vnf.vnf_id";
public static final String VNF_ID = "vnf_id";
@@ -51,7 +51,7 @@ public class GenericVnfRequest extends AAIRequest {
generic_vnf_query_path = configProperties.getProperty(GENERIC_VNF_QUERY_PATH);
}
-
+
@Override
public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
@@ -60,11 +60,11 @@ public class GenericVnfRequest extends AAIRequest {
if(requestProperties.containsKey(GENERIC_VNF_ID)) {
key = GENERIC_VNF_ID;
}
-
+
if(!requestProperties.containsKey(key)) {
aaiService.logKeyError(String.format("%s,%s", VNF_ID, GENERIC_VNF_ID));
}
-
+
String encoded_vnf = encodeQuery(requestProperties.getProperty(key));
request_url = request_url.replace("{vnf-id}", encoded_vnf) ;
if(resourceVersion != null) {
@@ -74,31 +74,31 @@ public class GenericVnfRequest extends AAIRequest {
aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
aaiService.LOGwriteDateTrace("vnf-id", requestProperties.getProperty(key));
-
+
return http_req_url;
}
-
+
@Override
public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
String request_url = target_uri+generic_vnf_path;
-
+
String key = VNF_ID;
if(requestProperties.containsKey(GENERIC_VNF_ID)) {
key = GENERIC_VNF_ID;
}
-
+
if(!requestProperties.containsKey(key)) {
aaiService.logKeyError(String.format("%s,%s", VNF_ID, GENERIC_VNF_ID));
}
-
+
String encoded_vnf = encodeQuery(requestProperties.getProperty(key));
request_url = request_url.replace("{vnf-id}", encoded_vnf) ;
URL http_req_url = new URL(request_url);
aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
aaiService.LOGwriteDateTrace("vnf-id", requestProperties.getProperty(key));
-
+
return http_req_url;
}
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv4AddressListRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv4AddressListRequest.java
index d9b2a91..364940a 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv4AddressListRequest.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv4AddressListRequest.java
@@ -31,7 +31,7 @@ import org.openecomp.sdnc.sli.aai.data.AAIDatum;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.openecomp.aai.inventory.v8.L3InterfaceIpv4AddressList;
+import org.openecomp.aai.inventory.v10.L3InterfaceIpv4AddressList;
public class L3InterfaceIpv4AddressListRequest extends AAIRequest {
@@ -63,13 +63,14 @@ public class L3InterfaceIpv4AddressListRequest extends AAIRequest {
public static final String L3_INTERFACE_IPV4_ADDRESS_LIST_PATH = "org.openecomp.sdnc.sli.aai.path.l3.interface.ipv4.address.list";
public static final String VLAN_L3_INTERFACE_IPV4_ADDRESS_LIST_PATH = "org.openecomp.sdnc.sli.aai.path.vlan.l3.interface.ipv4.address.list";
-
+
private final String l3_interface_ipv4_address_list_path;
private final String vlan_l3_interface_ipv4_address_list_path;
-
+
public static final String L3_INTERFACE_IPV4_ADDRESS = "l3-interface-ipv4-address";
public static final String LIST_L3_INTERFACE_IPV4_ADDRESS = "l3-interface-ipv4-address-list.l3-interface-ipv4-address";
-
+ public static final String VLAN_INTERFACE = "vlan-interface";
+ public static final String VLAN_VLAN_INTERFACE = "vlan.vlan-interface";
public L3InterfaceIpv4AddressListRequest() {
l3_interface_ipv4_address_list_path = configProperties.getProperty(L3_INTERFACE_IPV4_ADDRESS_LIST_PATH);
@@ -80,20 +81,20 @@ public class L3InterfaceIpv4AddressListRequest extends AAIRequest {
public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
return this.getRequestUrl(method, null);
}
-
+
@Override
public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
String request_url = target_uri+l3_interface_ipv4_address_list_path;
-
- if(requestProperties.containsKey(VLanRequest.VLAN_INTERFACE) || requestProperties.containsKey(VLanRequest.VLAN_VLAN_INTERFACE)){
+
+ if(requestProperties.containsKey(VLAN_INTERFACE) || requestProperties.containsKey(VLAN_VLAN_INTERFACE)){
request_url = target_uri+vlan_l3_interface_ipv4_address_list_path;
- request_url = VLanRequest.processPathData(request_url, requestProperties);
+ request_url = processVLanRequestPathData(request_url, requestProperties);
}
request_url = processPathData(request_url, requestProperties);
request_url = LInterfaceRequest.processPathData(request_url, requestProperties);
- request_url = GenericVnfRequest.processPathData(request_url, requestProperties);
+// request_url = GenericVnfRequest.processPathData(request_url, requestProperties);
if(resourceVersion != null) {
request_url = request_url +"?resource-version="+resourceVersion;
@@ -101,10 +102,27 @@ public class L3InterfaceIpv4AddressListRequest extends AAIRequest {
URL http_req_url = new URL(request_url);
aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
-
+
return http_req_url;
}
+ public static String processVLanRequestPathData(String request_url, Properties requestProperties) throws UnsupportedEncodingException {
+ String key = null;
+
+ if(requestProperties.containsKey(VLAN_VLAN_INTERFACE)) {
+ key = VLAN_VLAN_INTERFACE;
+ } else if(requestProperties.containsKey(VLAN_INTERFACE)) {
+ key = VLAN_INTERFACE;
+ } else {
+ aaiService.logKeyError(String.format("%s,%s", VLAN_INTERFACE, VLAN_VLAN_INTERFACE));
+ }
+
+ String encoded_vnf = encodeQuery(requestProperties.getProperty(key));
+
+ request_url = request_url.replace("{vlan-interface}", encoded_vnf) ;
+ aaiService.LOGwriteDateTrace("vlan-interface", requestProperties.getProperty(key));
+ return request_url;
+ }
@Override
public String toJSONString() {
@@ -122,16 +140,15 @@ public class L3InterfaceIpv4AddressListRequest extends AAIRequest {
@Override
public String[] getArgsList() {
- String[] args =
+ String[] args =
{
L3_INTERFACE_IPV4_ADDRESS,
LIST_L3_INTERFACE_IPV4_ADDRESS,
- VLanRequest.VLAN_INTERFACE,
- VLanRequest.VLAN_VLAN_INTERFACE,
- LInterfaceRequest.INTERFACE_NAME,
+ VLAN_INTERFACE,
+ VLAN_VLAN_INTERFACE,
+ LInterfaceRequest.INTERFACE_NAME,
LInterfaceRequest.LINTERFACE_INTERFACE_NAME,
- GenericVnfRequest.GENERIC_VNF_ID,
- GenericVnfRequest.VNF_ID
+ "generic-vnf.vnf-id"
};
return args;
@@ -141,7 +158,7 @@ public class L3InterfaceIpv4AddressListRequest extends AAIRequest {
public Class<? extends AAIDatum> getModelClass() {
return L3InterfaceIpv4AddressList.class;
}
-
+
public static String processPathData(String request_url, Properties requestProperties) throws UnsupportedEncodingException {
String key = L3_INTERFACE_IPV4_ADDRESS;
if(requestProperties.containsKey(LIST_L3_INTERFACE_IPV4_ADDRESS)) {
@@ -151,29 +168,29 @@ public class L3InterfaceIpv4AddressListRequest extends AAIRequest {
if(!requestProperties.containsKey(key)) {
aaiService.logKeyError(String.format("%s,%s", L3_INTERFACE_IPV4_ADDRESS, LIST_L3_INTERFACE_IPV4_ADDRESS));
}
-
+
String encoded_vnf = encodeQuery(requestProperties.getProperty(key));
request_url = request_url.replace("{l3-interface-ipv4-address}", encoded_vnf) ;
-
+
aaiService.LOGwriteDateTrace("l3-interface-ipv4-address", requestProperties.getProperty(key));
return request_url;
}
-
+
/*
* (non-Javadoc)
* @see org.openecomp.sdnc.sli.aai.PathConfigurator#configurePath(java.lang.String)
*/
// @Override
// public void processRequestPathValues(Map<String, String> nameValues) {
-// String[] paths =
+// String[] paths =
// {
// "/aai/v7/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}",
// "/aai/v7/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}",
// "/aai/v7/network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}",
// "/aai/v7/network/generic-vnfs/generic-vnf/{vnf-id}/lag-interfaces/lag-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}"
// };
-//
+//
// List<String>keys = new LinkedList<String>();
// keys.addAll(nameValues.keySet());
// for(String key : keys) {
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv6AddressListRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv6AddressListRequest.java
index da57abf..aa6b098 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv6AddressListRequest.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv6AddressListRequest.java
@@ -31,7 +31,7 @@ import org.openecomp.sdnc.sli.aai.data.AAIDatum;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.openecomp.aai.inventory.v8.L3InterfaceIpv6AddressList;
+import org.openecomp.aai.inventory.v10.L3InterfaceIpv6AddressList;
public class L3InterfaceIpv6AddressListRequest extends AAIRequest {
@@ -60,16 +60,17 @@ public class L3InterfaceIpv6AddressListRequest extends AAIRequest {
* aaiv7:inventory/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
* aaiv7:inventory/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
*/
-
+
public static final String L3_INTERFACE_IPV6_ADDRESS_LIST_PATH = "org.openecomp.sdnc.sli.aai.path.l3.interface.ipv6.address.list";
public static final String VLAN_L3_INTERFACE_IPV6_ADDRESS_LIST_PATH = "org.openecomp.sdnc.sli.aai.path.vlan.l3.interface.ipv6.address.list";
-
+
private final String l3_interface_ipv6_address_list_path;
private final String vlan_l3_interface_ipv6_address_list_path;
-
+
public static final String L3_INTERFACE_IPV6_ADDRESS = "l3-interface-ipv6-address";
public static final String LIST_L3_INTERFACE_IPV6_ADDRESS = "l3-interface-ipv6-address-list.l3-interface-ipv6-address";
-
+ public static final String VLAN_INTERFACE = "vlan-interface";
+ public static final String VLAN_VLAN_INTERFACE = "vlan.vlan-interface";
public L3InterfaceIpv6AddressListRequest() {
l3_interface_ipv6_address_list_path = configProperties.getProperty(L3_INTERFACE_IPV6_ADDRESS_LIST_PATH);
@@ -80,20 +81,20 @@ public class L3InterfaceIpv6AddressListRequest extends AAIRequest {
public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
return this.getRequestUrl(method, null);
}
-
+
@Override
public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
String request_url = target_uri+l3_interface_ipv6_address_list_path;
- if(requestProperties.containsKey(VLanRequest.VLAN_INTERFACE) || requestProperties.containsKey(VLanRequest.VLAN_VLAN_INTERFACE)){
+ if(requestProperties.containsKey(VLAN_INTERFACE) || requestProperties.containsKey(VLAN_VLAN_INTERFACE)){
request_url = target_uri+vlan_l3_interface_ipv6_address_list_path;
- request_url = VLanRequest.processPathData(request_url, requestProperties);
+ request_url = processVLanRequestPathData(request_url, requestProperties);
}
request_url = processPathData(request_url, requestProperties);
request_url = LInterfaceRequest.processPathData(request_url, requestProperties);
- request_url = GenericVnfRequest.processPathData(request_url, requestProperties);
+// request_url = GenericVnfRequest.processPathData(request_url, requestProperties);
if(resourceVersion != null) {
request_url = request_url +"?resource-version="+resourceVersion;
@@ -101,10 +102,27 @@ public class L3InterfaceIpv6AddressListRequest extends AAIRequest {
URL http_req_url = new URL(request_url);
aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
-
+
return http_req_url;
}
+ public static String processVLanRequestPathData(String request_url, Properties requestProperties) throws UnsupportedEncodingException {
+ String key = null;
+
+ if(requestProperties.containsKey(VLAN_VLAN_INTERFACE)) {
+ key = VLAN_VLAN_INTERFACE;
+ } else if(requestProperties.containsKey(VLAN_INTERFACE)) {
+ key = VLAN_INTERFACE;
+ } else {
+ aaiService.logKeyError(String.format("%s,%s", VLAN_INTERFACE, VLAN_VLAN_INTERFACE));
+ }
+
+ String encoded_vnf = encodeQuery(requestProperties.getProperty(key));
+
+ request_url = request_url.replace("{vlan-interface}", encoded_vnf) ;
+ aaiService.LOGwriteDateTrace("vlan-interface", requestProperties.getProperty(key));
+ return request_url;
+ }
@Override
public String toJSONString() {
@@ -122,16 +140,15 @@ public class L3InterfaceIpv6AddressListRequest extends AAIRequest {
@Override
public String[] getArgsList() {
- String[] args =
+ String[] args =
{
L3_INTERFACE_IPV6_ADDRESS,
LIST_L3_INTERFACE_IPV6_ADDRESS,
- VLanRequest.VLAN_INTERFACE,
- VLanRequest.VLAN_VLAN_INTERFACE,
- LInterfaceRequest.INTERFACE_NAME,
+ VLAN_INTERFACE,
+ VLAN_VLAN_INTERFACE,
+ LInterfaceRequest.INTERFACE_NAME,
LInterfaceRequest.LINTERFACE_INTERFACE_NAME,
- GenericVnfRequest.GENERIC_VNF_ID,
- GenericVnfRequest.VNF_ID
+ "generic-vnf.vnf-id"
};
@@ -142,21 +159,21 @@ public class L3InterfaceIpv6AddressListRequest extends AAIRequest {
public Class<? extends AAIDatum> getModelClass() {
return L3InterfaceIpv6AddressList.class;
}
-
+
public static String processPathData(String request_url, Properties requestProperties) throws UnsupportedEncodingException {
String key = L3_INTERFACE_IPV6_ADDRESS;
if(requestProperties.containsKey(LIST_L3_INTERFACE_IPV6_ADDRESS)) {
key = LIST_L3_INTERFACE_IPV6_ADDRESS;
}
-
+
if(!requestProperties.containsKey(key)) {
aaiService.logKeyError(String.format("%s,%s", L3_INTERFACE_IPV6_ADDRESS, LIST_L3_INTERFACE_IPV6_ADDRESS));
}
-
+
String encoded_vnf = encodeQuery(requestProperties.getProperty(key));
request_url = request_url.replace("{l3-interface-ipv6-address}", encoded_vnf) ;
-
+
aaiService.LOGwriteDateTrace("l3-interface-ipv6-address", requestProperties.getProperty(key));
return request_url;
}
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LInterfaceRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LInterfaceRequest.java
index 7ba0155..c9a818d 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LInterfaceRequest.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LInterfaceRequest.java
@@ -31,17 +31,17 @@ import org.openecomp.sdnc.sli.aai.data.AAIDatum;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.openecomp.aai.inventory.v8.LInterface;
+import org.openecomp.aai.inventory.v10.LInterface;
public class LInterfaceRequest extends AAIRequest {
// tenant (1602)
public static final String LAGINTERFACE_LINTERFACE_PATH = "org.openecomp.sdnc.sli.aai.path.lag.interface.l.interface";
public static final String LAGINTERFACE_LINTERFACE_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.lag.interface.l.interface.query";
-
+
public static final String P_INTERFACE_LINTERFACE_PATH = "org.openecomp.sdnc.sli.aai.path.p.interface.l.interface";
public static final String P_INTERFACE_LINTERFACE_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.p.interface.l.interface.query";
-
+
public static final String LAGINTERFACE_LINTERFACE_PNF_PATH = "org.openecomp.sdnc.sli.aai.path.lag.interface.l.interface.pnf";
public static final String P_INTERFACE_LINTERFACE_PNF_PATH = "org.openecomp.sdnc.sli.aai.path.p.interface.l.interface.pnf";
@@ -49,23 +49,24 @@ public class LInterfaceRequest extends AAIRequest {
private final String laginterface_linterface_query_path;
private final String p_interface_linterface_path;
private final String p_interface_linterface_query_path;
-
+
private final String laginterface_linterface_pnf_path;
private final String p_interface_linterface_pnf_path;
-
+
public static final String INTERFACE_NAME = "interface-name";
public static final String LINTERFACE_INTERFACE_NAME = "l-interface.interface-name";
public static final String LAG_INTERFACE_INTERFACE_NAME = "lag-interface.interface-name";
public static final String P_INTERFACE_INTERFACE_NAME = "p-interface.interface-name";
+ public static final String PNF_PNF_NAME = "pnf.pnf-name";
public static final String ROUTER_NAME = "router-name";
public static final String HOSTNAME = "hostname";
-
-
+
+
public static enum TYPE { L2_BRIDGE_BGF, L2_BRIDGE_SBG};
-
+
private final TYPE type;
-
+
public LInterfaceRequest(TYPE type) {
this.type = type;
@@ -79,23 +80,23 @@ public class LInterfaceRequest extends AAIRequest {
p_interface_linterface_pnf_path = configProperties.getProperty(P_INTERFACE_LINTERFACE_PNF_PATH);
}
-
+
@Override
public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
- String request_url = null;
+ String request_url = null;
String encoded_vnf = null;
String hostname = null;
String pnfname = null;
String interfaceName = null;
if(type == TYPE.L2_BRIDGE_SBG) {
- if(requestProperties.containsKey(PnfRequest.PNF_PNF_NAME)) {
+ if(requestProperties.containsKey(PNF_PNF_NAME)) {
request_url = target_uri + laginterface_linterface_pnf_path;
} else {
request_url = target_uri + laginterface_linterface_path;
}
-
+
if(requestProperties.containsKey(ROUTER_NAME)) {
hostname = requestProperties.getProperty(ROUTER_NAME);
encoded_vnf = encodeQuery(hostname);
@@ -108,8 +109,8 @@ public class LInterfaceRequest extends AAIRequest {
request_url = request_url.replace("{hostname}", encoded_vnf);
}
- if(requestProperties.containsKey(PnfRequest.PNF_PNF_NAME)) {
- pnfname = requestProperties.getProperty(PnfRequest.PNF_PNF_NAME);
+ if(requestProperties.containsKey(PNF_PNF_NAME)) {
+ pnfname = requestProperties.getProperty(PNF_PNF_NAME);
encoded_vnf = encodeQuery(pnfname);
request_url = request_url.replace("{pnf-name}", encoded_vnf);
}
@@ -117,7 +118,7 @@ public class LInterfaceRequest extends AAIRequest {
encoded_vnf = encodeQuery(requestProperties.getProperty(LAG_INTERFACE_INTERFACE_NAME));
request_url = request_url.replace("{lag-interface.interface-name}", encoded_vnf) ;
-
+
interfaceName = requestProperties.getProperty(INTERFACE_NAME);
if(interfaceName == null || interfaceName.isEmpty()) {
interfaceName = requestProperties.getProperty(LINTERFACE_INTERFACE_NAME);
@@ -127,35 +128,35 @@ public class LInterfaceRequest extends AAIRequest {
}
if(type == TYPE.L2_BRIDGE_BGF) {
- if(requestProperties.containsKey(PnfRequest.PNF_PNF_NAME)) {
+ if(requestProperties.containsKey(PNF_PNF_NAME)) {
request_url = target_uri + p_interface_linterface_pnf_path;
} else {
request_url = target_uri + p_interface_linterface_path;
}
-
+
if(requestProperties.containsKey(ROUTER_NAME)) {
hostname = requestProperties.getProperty(ROUTER_NAME);
encoded_vnf = encodeQuery(hostname);
request_url = request_url.replace("{hostname}", encoded_vnf);
- }
-
+ }
+
if(requestProperties.containsKey(HOSTNAME)) {
hostname = requestProperties.getProperty(HOSTNAME);
encoded_vnf = encodeQuery(hostname);
request_url = request_url.replace("{hostname}", encoded_vnf);
}
-
- if(requestProperties.containsKey(PnfRequest.PNF_PNF_NAME)) {
- pnfname = requestProperties.getProperty(PnfRequest.PNF_PNF_NAME);
+
+ if(requestProperties.containsKey(PNF_PNF_NAME)) {
+ pnfname = requestProperties.getProperty(PNF_PNF_NAME);
encoded_vnf = encodeQuery(pnfname);
request_url = request_url.replace("{pnf-name}", encoded_vnf);
}
-
+
encoded_vnf = encodeQuery(requestProperties.getProperty(P_INTERFACE_INTERFACE_NAME));
request_url = request_url.replace("{p-interface.interface-name}", encoded_vnf) ;
-
-
+
+
interfaceName = requestProperties.getProperty(INTERFACE_NAME);
if(interfaceName == null || interfaceName.isEmpty()) {
interfaceName = requestProperties.getProperty(LINTERFACE_INTERFACE_NAME);
@@ -185,7 +186,7 @@ public class LInterfaceRequest extends AAIRequest {
return http_req_url;
}
-
+
@Override
public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
return this.getRequestUrl(method, null);
@@ -211,27 +212,27 @@ public class LInterfaceRequest extends AAIRequest {
public String[] getArgsList() {
String[] args = {};
if(type == TYPE.L2_BRIDGE_SBG) {
- String[] tmpArray = {INTERFACE_NAME, LINTERFACE_INTERFACE_NAME, LAG_INTERFACE_INTERFACE_NAME, HOSTNAME, ROUTER_NAME, PnfRequest.PNF_PNF_NAME};
+ String[] tmpArray = {INTERFACE_NAME, LINTERFACE_INTERFACE_NAME, LAG_INTERFACE_INTERFACE_NAME, HOSTNAME, ROUTER_NAME, PNF_PNF_NAME};
args = tmpArray;
}
if(type == TYPE.L2_BRIDGE_BGF) {
- String[] tmpArray = {INTERFACE_NAME, LINTERFACE_INTERFACE_NAME, P_INTERFACE_INTERFACE_NAME, HOSTNAME, ROUTER_NAME, PnfRequest.PNF_PNF_NAME};
+ String[] tmpArray = {INTERFACE_NAME, LINTERFACE_INTERFACE_NAME, P_INTERFACE_INTERFACE_NAME, HOSTNAME, ROUTER_NAME, PNF_PNF_NAME};
args = tmpArray;
}
return args;
}
-
+
@Override
public Class<? extends AAIDatum> getModelClass() {
return LInterface.class;
}
-
+
@Override
public String getPrimaryResourceName(String resource) {
return "l-interface";
}
-
+
public static final String processPathData(String request_url, Properties requestProperties) throws UnsupportedEncodingException {
String interfaceName = requestProperties.getProperty(INTERFACE_NAME);
if(interfaceName == null || interfaceName.isEmpty()) {
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LagInterfacePnfRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LagInterfacePnfRequest.java
index 15b72f1..f4b08e7 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LagInterfacePnfRequest.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LagInterfacePnfRequest.java
@@ -24,6 +24,7 @@ package org.openecomp.sdnc.sli.aai;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.Properties;
import org.apache.commons.lang.ArrayUtils;
import org.openecomp.sdnc.sli.aai.data.AAIDatum;
@@ -32,23 +33,26 @@ import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.openecomp.aai.inventory.v8.LagInterface;
+import org.openecomp.aai.inventory.v10.LagInterface;
public class LagInterfacePnfRequest extends AAIRequest {
// tenant (1602)
public static final String LAG_INTERFACE_PATH = "org.openecomp.sdnc.sli.aai.path.pserver.pinterface";
public static final String LAG_INTERFACE_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.pserver.pinterface.query";
-
+ public static final String PNF_PATH = "org.openecomp.sdnc.sli.aai.path.pnf";
+
private final String lag_interface_path;
private final String lag_interface_query_path;
-
+
public static final String INTERFACE_NAME = "interface-name";
public static final String LAG_INTERFACE_INTERFACE_NAME = "lag-interface.interface-name";
+ public static final String PNF_NAME = "pnf-name";
+ public static final String PNF_PNF_NAME = "pnf.pnf-name";
public LagInterfacePnfRequest() {
- lag_interface_path = configProperties.getProperty(PnfRequest.PNF_PATH) + "/lag-interfaces/lag-interface/{interface-name}";
+ lag_interface_path = configProperties.getProperty(PNF_PATH) + "/lag-interfaces/lag-interface/{interface-name}";
lag_interface_query_path = configProperties.getProperty(LAG_INTERFACE_QUERY_PATH);
LoggerFactory.getLogger(LagInterfacePnfRequest.class).debug("org.openecomp.sdnc.sli.aai.path.pserver.pinterface=\t" + lag_interface_path);
LoggerFactory.getLogger(LagInterfacePnfRequest.class).debug("org.openecomp.sdnc.sli.aai.path.pserver.pinterface.query=\t" + lag_interface_query_path);
@@ -57,26 +61,26 @@ public class LagInterfacePnfRequest extends AAIRequest {
}
}
-
+
@Override
public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
String request_url = target_uri + lag_interface_path;
String encoded_vnf = null;
-
+
String interfaceName = null;
if(requestProperties.containsKey(INTERFACE_NAME)) {
interfaceName = requestProperties.getProperty(INTERFACE_NAME);
- } else
+ } else
if(requestProperties.containsKey(LAG_INTERFACE_INTERFACE_NAME)) {
interfaceName = requestProperties.getProperty(LAG_INTERFACE_INTERFACE_NAME);
}
encoded_vnf = encodeQuery(interfaceName);
request_url = request_url.replace("{interface-name}", encoded_vnf) ;
-
- request_url = PnfRequest.processPathData(request_url,requestProperties);
+
+ request_url = processPnfRequestPathData(request_url,requestProperties);
if(resourceVersion != null) {
request_url = request_url +"?resource-version="+resourceVersion;
@@ -85,10 +89,27 @@ public class LagInterfacePnfRequest extends AAIRequest {
aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
aaiService.LOGwriteDateTrace("interface-name", interfaceName);
-
+
return http_req_url;
}
-
+
+ public static String processPnfRequestPathData(String request_url, Properties requestProperties) throws UnsupportedEncodingException {
+
+ String key = PNF_NAME;
+ if(requestProperties.containsKey(PNF_PNF_NAME)) {
+ key = PNF_PNF_NAME;
+ }
+
+ if(!requestProperties.containsKey(key)) {
+ aaiService.logKeyError(String.format("%s,%s", PNF_NAME, PNF_PNF_NAME));
+ }
+
+ String encoded_vnf = encodeQuery(requestProperties.getProperty(key));
+ request_url = request_url.replace("{pnf-name}", encoded_vnf) ;
+
+ return request_url;
+ }
+
@Override
public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
return this.getRequestUrl(method, null);
@@ -111,14 +132,11 @@ public class LagInterfacePnfRequest extends AAIRequest {
@Override
public String[] getArgsList() {
- String[] args = {INTERFACE_NAME, LAG_INTERFACE_INTERFACE_NAME};
- String[] tmpArgs = new PnfRequest().getArgsList();
-
- args = (String[]) ArrayUtils.addAll(args, tmpArgs);
-
+ String[] args = {INTERFACE_NAME, LAG_INTERFACE_INTERFACE_NAME, PNF_PNF_NAME};
+
return args;
}
-
+
@Override
public Class<? extends AAIDatum> getModelClass() {
return LagInterface.class;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NamedQueryRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NamedQueryRequest.java
index 6271b1d..46421b6 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NamedQueryRequest.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NamedQueryRequest.java
@@ -24,26 +24,32 @@ package org.openecomp.sdnc.sli.aai;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
import java.util.Properties;
import org.openecomp.sdnc.sli.aai.data.AAIDatum;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.AnnotationIntrospector;
import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.databind.type.TypeFactory;
import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
-import org.openecomp.aai.inventory.v8.InventoryResponseItems;
+import org.openecomp.aai.inventory.v10.InventoryResponseItems;
public class NamedQueryRequest extends AAIRequest {
public static final String NAMED_SEARCH_PATH = "org.openecomp.sdnc.sli.aai.query.named";
-
+
private final String named_search_path;
-
+
public static final String NAMED_QUERY_UUID = "named-query-uuid";
public static final String PREFIX = "prefix";
@@ -65,19 +71,23 @@ public class NamedQueryRequest extends AAIRequest {
URL http_req_url = new URL(request_url);
aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
-
+
return http_req_url;
}
-
+
@Override
- public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
+ public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
return getRequestUrl(method, null);
}
@Override
public String toJSONString() {
- ObjectMapper mapper = new ObjectMapper();
+ ObjectMapper mapper = AAIService.getObjectMapper();
+ mapper.setSerializationInclusion(Include.NON_NULL);
+ mapper.setSerializationInclusion(Include.NON_EMPTY);
+ mapper.setSerializationInclusion(Include.NON_DEFAULT);
+
AnnotationIntrospector introspector = new JaxbAnnotationIntrospector(TypeFactory.defaultInstance());
AnnotationIntrospector secondary = new JacksonAnnotationIntrospector();
mapper.setAnnotationIntrospector(AnnotationIntrospector.pair(introspector, secondary));
@@ -86,6 +96,54 @@ public class NamedQueryRequest extends AAIRequest {
AAIDatum tenant = (AAIDatum)requestDatum;
String json_text = null;
try {
+ ObjectNode node = mapper.valueToTree(tenant);
+ Iterator<JsonNode> it = node.elements();
+ while(it.hasNext()){
+ JsonNode jn = it.next();
+ JsonNode child = jn.get("instance-filter");
+ if(child != null) {
+ child = child.get(0);
+ if(child.has("l3-network")) {
+ JsonNode innerChild = child.get("l3-network");
+ if(innerChild != null) {
+ if(innerChild instanceof ObjectNode) {
+ ObjectNode on = ObjectNode.class.cast(innerChild);
+ List<String> namesToDelete = new ArrayList<String>();
+ Iterator<String> names = on.fieldNames();
+ while(names.hasNext()) {
+ String name = names.next();
+ if(name != null && name.startsWith("is-")) {
+ namesToDelete.add(name);
+ }
+ }
+ for(String nameToDelete : namesToDelete) {
+ on.remove(nameToDelete);
+ }
+ }
+ }
+ } else if(child.has("pnf")) {
+ JsonNode innerChild = child.get("pnf");
+ if(innerChild != null) {
+ if(innerChild instanceof ObjectNode) {
+ ObjectNode on = ObjectNode.class.cast(innerChild);
+ List<String> namesToDelete = new ArrayList<String>();
+ Iterator<String> names = on.fieldNames();
+ while(names.hasNext()) {
+ String name = names.next();
+ if(name != null && name.startsWith("in-maint")) {
+ namesToDelete.add(name);
+ }
+ }
+ for(String nameToDelete : namesToDelete) {
+ on.remove(nameToDelete);
+ }
+ }
+ }
+ }
+ }
+ }
+ json_text = node.toString();
+ if(json_text == null)
json_text = mapper.writeValueAsString(tenant);
} catch (JsonProcessingException exc) {
handleException(this, exc);
@@ -113,7 +171,7 @@ public class NamedQueryRequest extends AAIRequest {
String encoded_vnf ;
String key = NAMED_QUERY_UUID;
-
+
if(requestProperties.containsKey(key)) {
encoded_vnf = encodeQuery(requestProperties.getProperty(key));
request_url = request_url.replace("{named-query-uuid}", encoded_vnf) ;
@@ -121,7 +179,7 @@ public class NamedQueryRequest extends AAIRequest {
}
key = PREFIX;
-
+
if(requestProperties.containsKey(key)) {
encoded_vnf = encodeQuery(requestProperties.getProperty(key));
request_url = request_url.replace("{prefix}", encoded_vnf) ;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NodesQueryRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NodesQueryRequest.java
index d9bee38..a50d3f7 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NodesQueryRequest.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NodesQueryRequest.java
@@ -31,14 +31,14 @@ import org.openecomp.sdnc.sli.aai.data.AAIDatum;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.openecomp.aai.inventory.v8.SearchResults;
+import org.openecomp.aai.inventory.v10.SearchResults;
public class NodesQueryRequest extends AAIRequest {
public static final String NODES_SEARCH_PATH = "org.openecomp.sdnc.sli.aai.query.nodes";
-
+
private final String nodes_search_path;
-
+
public static final String NODE_TYPE = "node-type";
public static final String ENTITY_IDENTIFIER = "entity-identifier";
public static final String ENTITY_VALUE = "entity-value";
@@ -48,7 +48,7 @@ public class NodesQueryRequest extends AAIRequest {
nodes_search_path = configProperties.getProperty(NODES_SEARCH_PATH);
}
-
+
// @Override
// public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
//
@@ -57,15 +57,15 @@ public class NodesQueryRequest extends AAIRequest {
//
// String encoded_vnf = encodeQuery(requestProperties.getProperty(key));
// request_url = request_url.replace("{vnf-id}", encoded_vnf) ;
-//
+//
// if(resourceVersion != null) {
// request_url = request_url +"?resource-version="+resourceVersion;
// }
// URL http_req_url = new URL(request_url);
//
// aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
-//
-//
+//
+//
// return http_req_url;
// }
@@ -82,12 +82,12 @@ public class NodesQueryRequest extends AAIRequest {
URL http_req_url = new URL(request_url);
aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
-
+
return http_req_url;
}
-
+
@Override
- public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
+ public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
return getRequestUrl(method, null);
}
@@ -127,19 +127,19 @@ public class NodesQueryRequest extends AAIRequest {
String encoded_vnf = encodeQuery(requestProperties.getProperty(key));
request_url = request_url.replace("{entity-identifier}", encoded_vnf) ;
aaiService.LOGwriteDateTrace("entity-identifier", requestProperties.getProperty(key));
-
+
key = ENTITY_VALUE;
encoded_vnf = encodeQuery(requestProperties.getProperty(key));
request_url = request_url.replace("{entity-name}", encoded_vnf) ;
aaiService.LOGwriteDateTrace("entity-name", requestProperties.getProperty(key));
-
+
key = NODE_TYPE;
encoded_vnf = encodeQuery(requestProperties.getProperty(key));
request_url = request_url.replace("{node-type}", encoded_vnf) ;
aaiService.LOGwriteDateTrace("node-type", requestProperties.getProperty(key));
-
+
return request_url;
}
}
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfacePnfRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfacePnfRequest.java
index 637a0e4..c158d34 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfacePnfRequest.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfacePnfRequest.java
@@ -24,6 +24,7 @@ package org.openecomp.sdnc.sli.aai;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.Properties;
import org.apache.commons.lang.ArrayUtils;
import org.openecomp.sdnc.sli.aai.data.AAIDatum;
@@ -32,23 +33,26 @@ import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.openecomp.aai.inventory.v8.PInterface;
+import org.openecomp.aai.inventory.v10.PInterface;
public class PInterfacePnfRequest extends AAIRequest {
// tenant (1602)
public static final String PINTERFACE_PATH = "org.openecomp.sdnc.sli.aai.path.pserver.pinterface";
public static final String PINTERFACE_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.pserver.pinterface.query";
-
+ public static final String PNF_PATH = "org.openecomp.sdnc.sli.aai.path.pnf";
+
private final String pinterface_path;
private final String pinterface_query_path;
-
+
public static final String INTERFACE_NAME = "interface-name";
public static final String PINTERFACE_INTERFACE_NAME = "p-interface.interface-name";
+ public static final String PNF_NAME = "pnf-name";
+ public static final String PNF_PNF_NAME = "pnf.pnf-name";
public PInterfacePnfRequest() {
- pinterface_path = configProperties.getProperty(PnfRequest.PNF_PATH) + "/p-interfaces/p-interface/{interface-name}";
+ pinterface_path = configProperties.getProperty(PNF_PATH) + "/p-interfaces/p-interface/{interface-name}";
pinterface_query_path = configProperties.getProperty(PINTERFACE_QUERY_PATH);
LoggerFactory.getLogger(PInterfacePnfRequest.class).debug("org.openecomp.sdnc.sli.aai.path.pserver.pinterface=\t" + pinterface_path);
LoggerFactory.getLogger(PInterfacePnfRequest.class).debug("org.openecomp.sdnc.sli.aai.path.pserver.pinterface.query=\t" + pinterface_query_path);
@@ -57,26 +61,26 @@ public class PInterfacePnfRequest extends AAIRequest {
}
}
-
+
@Override
public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
String request_url = target_uri + pinterface_path;
String encoded_vnf = null;
-
+
String interfaceName = null;
if(requestProperties.containsKey(INTERFACE_NAME)) {
interfaceName = requestProperties.getProperty(INTERFACE_NAME);
- } else
+ } else
if(requestProperties.containsKey(PINTERFACE_INTERFACE_NAME)) {
interfaceName = requestProperties.getProperty(PINTERFACE_INTERFACE_NAME);
}
encoded_vnf = encodeQuery(interfaceName);
request_url = request_url.replace("{interface-name}", encoded_vnf) ;
-
- request_url = PnfRequest.processPathData(request_url,requestProperties);
+
+ request_url = processPnfRequestPathData(request_url,requestProperties);
if(resourceVersion != null) {
request_url = request_url +"?resource-version="+resourceVersion;
@@ -85,10 +89,27 @@ public class PInterfacePnfRequest extends AAIRequest {
aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
aaiService.LOGwriteDateTrace("interface-name", interfaceName);
-
+
return http_req_url;
}
-
+
+ public static String processPnfRequestPathData(String request_url, Properties requestProperties) throws UnsupportedEncodingException {
+
+ String key = PNF_NAME;
+ if(requestProperties.containsKey(PNF_PNF_NAME)) {
+ key = PNF_PNF_NAME;
+ }
+
+ if(!requestProperties.containsKey(key)) {
+ aaiService.logKeyError(String.format("%s,%s", PNF_NAME, PNF_PNF_NAME));
+ }
+
+ String encoded_vnf = encodeQuery(requestProperties.getProperty(key));
+ request_url = request_url.replace("{pnf-name}", encoded_vnf) ;
+
+ return request_url;
+ }
+
@Override
public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
return this.getRequestUrl(method, null);
@@ -111,14 +132,11 @@ public class PInterfacePnfRequest extends AAIRequest {
@Override
public String[] getArgsList() {
- String[] args = {INTERFACE_NAME, PINTERFACE_INTERFACE_NAME};
- String[] tmpArgs = new PnfRequest().getArgsList();
-
- args = (String[]) ArrayUtils.addAll(args, tmpArgs);
-
+ String[] args = {INTERFACE_NAME, PINTERFACE_INTERFACE_NAME, PNF_NAME, PNF_PNF_NAME};
+
return args;
}
-
+
@Override
public Class<? extends AAIDatum> getModelClass() {
return PInterface.class;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfaceRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfaceRequest.java
index f56d586..cc2208b 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfaceRequest.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfaceRequest.java
@@ -31,17 +31,17 @@ import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.openecomp.aai.inventory.v8.PInterface;
+import org.openecomp.aai.inventory.v10.PInterface;
public class PInterfaceRequest extends AAIRequest {
// tenant (1602)
public static final String PINTERFACE_PATH = "org.openecomp.sdnc.sli.aai.path.pserver.pinterface";
public static final String PINTERFACE_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.pserver.pinterface.query";
-
+
private final String pinterface_path;
private final String pinterface_query_path;
-
+
public static final String HOSTNAME = "hostname";
public static final String PSERVER_HOSTNAME = "pserver.hostname";
public static final String INTERFACE_NAME = "interface-name";
@@ -58,13 +58,13 @@ public class PInterfaceRequest extends AAIRequest {
}
}
-
+
@Override
public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
String request_url = target_uri + pinterface_path;
String encoded_vnf = null;
-
+
String hostname = null;
String interfaceName = null;
@@ -74,7 +74,7 @@ public class PInterfaceRequest extends AAIRequest {
if(requestProperties.containsKey(PSERVER_HOSTNAME)) {
hostname = requestProperties.getProperty(PSERVER_HOSTNAME);
}
-
+
if(requestProperties.containsKey(INTERFACE_NAME)) {
interfaceName = requestProperties.getProperty(INTERFACE_NAME);
}
@@ -96,10 +96,10 @@ public class PInterfaceRequest extends AAIRequest {
aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
aaiService.LOGwriteDateTrace("hostname", hostname);
aaiService.LOGwriteDateTrace("interface-name", hostname);
-
+
return http_req_url;
}
-
+
@Override
public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
return this.getRequestUrl(method, null);
@@ -125,7 +125,7 @@ public class PInterfaceRequest extends AAIRequest {
String[] args = {HOSTNAME, PSERVER_HOSTNAME, INTERFACE_NAME, PINTERFACE_INTERFACE_NAME};
return args;
}
-
+
@Override
public Class<? extends AAIDatum> getModelClass() {
return PInterface.class;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PServerRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PServerRequest.java
deleted file mode 100644
index d78254b..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PServerRequest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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.sdnc.sli.aai;
-
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.openecomp.aai.inventory.v8.Pserver;
-
-public class PServerRequest extends AAIRequest {
-
- // tenant (1602)
- public static final String PSERVER_PATH = "org.openecomp.sdnc.sli.aai.path.pserver";
- public static final String PSERVER_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.pserver.query";
-
- private final String pserver_path;
- private final String pserver_query_path;
-
- public static final String HOSTNAME = "hostname";
- public static final String PSERVER_HOSTNAME = "pserver.hostname";
-
-
- public PServerRequest() {
- pserver_path = configProperties.getProperty(PSERVER_PATH);
- pserver_query_path = configProperties.getProperty(PSERVER_QUERY_PATH);
- }
-
-
- @Override
- public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
-
- String request_url = target_uri + pserver_path;
- String encoded_vnf = null;
-
- String hostname = null;
- if(requestProperties.containsKey(HOSTNAME)) {
- hostname = requestProperties.getProperty(HOSTNAME);
- encoded_vnf = encodeQuery(hostname);
- request_url = request_url.replace("{hostname}", encoded_vnf) ;
-
- } else if(requestProperties.containsKey(PSERVER_HOSTNAME)) {
- hostname = requestProperties.getProperty(PSERVER_HOSTNAME);
- encoded_vnf = encodeQuery(hostname);
- request_url = request_url.replace("{hostname}", encoded_vnf) ;
-
- } else {
- LOG.error("Required key "+PSERVER_HOSTNAME+" is misssing.");
- }
-
- if(resourceVersion != null) {
- request_url = request_url +"?resource-version="+resourceVersion;
- }
- URL http_req_url = new URL(request_url);
-
- aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
- aaiService.LOGwriteDateTrace("hostname", hostname);
-
- return http_req_url;
- }
-
- @Override
- public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
- return this.getRequestUrl(method, null);
- }
-
-
- @Override
- public String toJSONString() {
- ObjectMapper mapper = getObjectMapper();
- Pserver vnfc = (Pserver)requestDatum;
- String json_text = null;
- try {
- json_text = mapper.writeValueAsString(vnfc);
- } catch (JsonProcessingException exc) {
- handleException(this, exc);
- return null;
- }
- return json_text;
- }
-
- @Override
- public String[] getArgsList() {
- String[] args = {HOSTNAME, PSERVER_HOSTNAME};
- return args;
- }
-
- @Override
- public Class<? extends AAIDatum> getModelClass() {
- return Pserver.class;
- }
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PhysicalLinkRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PhysicalLinkRequest.java
index 7aa0f1b..b494471 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PhysicalLinkRequest.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PhysicalLinkRequest.java
@@ -30,17 +30,17 @@ import org.openecomp.sdnc.sli.aai.data.AAIDatum;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.openecomp.aai.inventory.v8.PhysicalLink;
+import org.openecomp.aai.inventory.v10.PhysicalLink;
public class PhysicalLinkRequest extends AAIRequest {
// physical link
public static final String PHYSICAL_LINK_PATH = "org.openecomp.sdnc.sli.aai.path.physical.link";
public static final String PHYSICAL_LINK_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.physical.link.query";
-
+
private final String physical_link_path;
private final String physical_link_query_path;
-
+
public static final String LINK_NAME = "link-name";
public static final String PHYSICAL_LINK_NAME = "physical-link.link-name";
@@ -54,12 +54,12 @@ public class PhysicalLinkRequest extends AAIRequest {
public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
return this.getRequestUrl(method, null);
}
-
+
@Override
public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
String request_url = target_uri+physical_link_path;
-
+
String linkName = null;
if(requestProperties.containsKey(LINK_NAME)) {
linkName = requestProperties.getProperty(LINK_NAME);
@@ -69,7 +69,7 @@ public class PhysicalLinkRequest extends AAIRequest {
linkName = requestProperties.getProperty(PHYSICAL_LINK_NAME);
}
-
+
String encoded_vnf = encodeQuery(linkName);
request_url = request_url.replace("{link-name}", encoded_vnf) ;
@@ -80,7 +80,7 @@ public class PhysicalLinkRequest extends AAIRequest {
aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
aaiService.LOGwriteDateTrace("link-name", linkName);
-
+
return http_req_url;
}
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PnfRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PnfRequest.java
deleted file mode 100644
index 83988f9..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PnfRequest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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.sdnc.sli.aai;
-
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Properties;
-
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.openecomp.aai.inventory.v8.Pnf;
-
-public class PnfRequest extends AAIRequest {
-
- // pnf
- public static final String PNF_PATH = "org.openecomp.sdnc.sli.aai.path.pnf";
-
-
- private final String pnf_path;
-
-
- public static final String PNF_NAME = "pnf-name";
- public static final String PNF_PNF_NAME = "pnf.pnf-name";
-
-
- public PnfRequest() {
- pnf_path = configProperties.getProperty(PNF_PATH);
-
- }
-
- @Override
- public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
- return this.getRequestUrl(method, null);
- }
-
- @Override
- public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
-
- String request_url = target_uri+pnf_path;
- request_url = processPathData(request_url, requestProperties);
-
- if(resourceVersion != null) {
- request_url = request_url +"?resource-version="+resourceVersion;
- }
- URL http_req_url = new URL(request_url);
-
- aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
-
- return http_req_url;
- }
-
- public static String processPathData(String request_url, Properties requestProperties) throws UnsupportedEncodingException {
-
- String key = PNF_NAME;
- if(requestProperties.containsKey(PNF_PNF_NAME)) {
- key = PNF_PNF_NAME;
- }
-
- if(!requestProperties.containsKey(key)) {
- aaiService.logKeyError(String.format("%s,%s", PNF_NAME, PNF_PNF_NAME));
- }
-
- String encoded_vnf = encodeQuery(requestProperties.getProperty(key));
- request_url = request_url.replace("{pnf-name}", encoded_vnf) ;
-
- return request_url;
- }
-
- @Override
- public String toJSONString() {
- ObjectMapper mapper = getObjectMapper();
- Pnf pnf = (Pnf)requestDatum;
- String json_text = null;
- try {
- json_text = mapper.writeValueAsString(pnf);
- } catch (JsonProcessingException exc) {
- handleException(this, exc);
- return null;
- }
- return json_text;
- }
-
- @Override
- public String[] getArgsList() {
- String[] args = {PNF_NAME, PNF_PNF_NAME};
-
- return args;
- }
-
- @Override
- public Class<? extends AAIDatum> getModelClass() {
- return Pnf.class;
- }
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/RelationshipRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/RelationshipRequest.java
index b964ecb..d0d0e88 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/RelationshipRequest.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/RelationshipRequest.java
@@ -30,17 +30,17 @@ import org.openecomp.sdnc.sli.aai.data.AAIDatum;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.openecomp.aai.inventory.v8.RelationshipList;
+import org.openecomp.aai.inventory.v10.RelationshipList;
public class RelationshipRequest extends AAIRequest {
// tenant (1602)
public static final String RELATIONSHIP_LIST_PATH = "org.openecomp.sdnc.sli.aai.path.relationship.list";
public static final String RELATIONSHIP_LIST_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.relationship.list.query";
-
+
private final String relationship_path;
private final String relationship_query_path;
-
+
public static final String RELATED_TO = "related-to";
public static final String RELATIONSHIP_KEY = "relationship-key";
@@ -49,23 +49,23 @@ public class RelationshipRequest extends AAIRequest {
relationship_query_path = configProperties.getProperty(RELATIONSHIP_LIST_QUERY_PATH);
}
-
+
@Override
public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
AAIRequest masterRequest = (AAIRequest)requestProperties.get(MASTER_REQUEST);
URL masterURL = masterRequest.getRequestUrl(method, null);
-
+
String request_url = masterURL.toString();
request_url = request_url + relationship_path;
-
+
if(request_url.contains("//")) {
request_url = request_url.replaceAll("//", "/");
}
if(requestProperties.containsKey(RELATED_TO)) {
String encoded_vnf = encodeQuery(requestProperties.getProperty(RELATED_TO));
- request_url = request_url.replace("{related-to}", encoded_vnf) ;
+ request_url = request_url.replace("{related-to}", encoded_vnf) ;
}
// if(resourceVersion != null) {
@@ -75,10 +75,10 @@ public class RelationshipRequest extends AAIRequest {
aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
aaiService.LOGwriteDateTrace("related-to", requestProperties.getProperty(RELATED_TO));
-
+
return http_req_url;
}
-
+
@Override
public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
@@ -89,7 +89,7 @@ public class RelationshipRequest extends AAIRequest {
aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
aaiService.LOGwriteDateTrace("tenant_name", requestProperties.getProperty(RELATIONSHIP_KEY));
-
+
return http_req_url;
}
@@ -120,7 +120,7 @@ public class RelationshipRequest extends AAIRequest {
public Class<? extends AAIDatum> getModelClass() {
return RelationshipList.class;
}
-
+
public boolean isDeleteDataRequired() {
return true;
}
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SelfLinkRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SelfLinkRequest.java
index 0f0059a..90bbcb4 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SelfLinkRequest.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SelfLinkRequest.java
@@ -29,6 +29,7 @@ import org.openecomp.sdnc.sli.aai.data.AAIDatum;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Joiner;
public class SelfLinkRequest extends AAIRequest {
@@ -47,6 +48,17 @@ public class SelfLinkRequest extends AAIRequest {
String request_url = null;
request_url = requestProperties.getProperty(SELFLINK);
+
+ String query = null;
+
+ if(request_url.contains("?")) {
+ query = request_url.substring(request_url.indexOf("?"));
+ Joiner.MapJoiner mapJoiner = Joiner.on(",").withKeyValueSeparator("=");
+// String queryString = mapJoiner.join(query);
+ } else {
+ request_url = request_url + "?depth=1";
+ }
+
URL http_req_url = new URL(request_url);
aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/ServiceRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/ServiceRequest.java
deleted file mode 100644
index 7266fd0..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/ServiceRequest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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.sdnc.sli.aai;
-
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.openecomp.aai.inventory.v8.Service;
-
-public class ServiceRequest extends AAIRequest {
-
- // tenant (1602)
- public static final String SERVICE_PATH = "org.openecomp.sdnc.sli.aai.path.service";
- public static final String SERVICE_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.service.query";
-
- private final String service_path;
- private final String service_query_path;
-
- public static final String SERVICE_ID = "service.service-id";
-
-
-
- public ServiceRequest() {
- service_path = configProperties.getProperty(SERVICE_PATH);
- service_query_path = configProperties.getProperty(SERVICE_QUERY_PATH);
- }
-
-
- @Override
- public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
-
- String request_url = target_uri + service_path;
- String encoded_vnf = null;
-
- String serviceId = null;
- if(requestProperties.containsKey(SERVICE_ID)) {
- serviceId = requestProperties.getProperty(SERVICE_ID);
- }
-
- encoded_vnf = encodeQuery(serviceId);
- request_url = request_url.replace("{service-id}", encoded_vnf) ;
-
- if(resourceVersion != null) {
- request_url = request_url +"?resource-version="+resourceVersion;
- }
- URL http_req_url = new URL(request_url);
-
- aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
- aaiService.LOGwriteDateTrace("service-id", serviceId);
-
- return http_req_url;
- }
-
- @Override
- public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
- return this.getRequestUrl(method, null);
- }
-
-
- @Override
- public String toJSONString() {
- ObjectMapper mapper = getObjectMapper();
- Service vnfc = (Service)requestDatum;
- String json_text = null;
- try {
- json_text = mapper.writeValueAsString(vnfc);
- } catch (JsonProcessingException exc) {
- handleException(this, exc);
- return null;
- }
- return json_text;
- }
-
- @Override
- public String[] getArgsList() {
- String[] args = {SERVICE_ID};
- return args;
- }
-
- @Override
- public Class<? extends AAIDatum> getModelClass() {
- return Service.class;
- }
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SubInterfaceRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SubInterfaceRequest.java
index 8c97b3e..fa04349 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SubInterfaceRequest.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SubInterfaceRequest.java
@@ -31,29 +31,29 @@ import org.openecomp.sdnc.sli.aai.data.AAIDatum;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.openecomp.aai.inventory.v8.LInterface;
+import org.openecomp.aai.inventory.v10.LInterface;
public class SubInterfaceRequest extends AAIRequest {
// tenant (1602)
public static final String PNF_LAGINTERFACE_SUBINTERFACE_PATH = "org.openecomp.sdnc.sli.aai.path.pnf.lag.interface.subinterface";
public static final String PNF_LAGINTERFACE_SUBINTERFACE_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.pnf.lag.interface.subinterface.query";
-
+
public static final String PNF_P_INTERFACE_SUBINTERFACE_PATH = "org.openecomp.sdnc.sli.aai.path.pnf.p.interface.l.interface";
public static final String PNF_P_INTERFACE_SUBINTERFACE_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.pnf.p.interface.l.interface.query";
-
+
private final String pnf_laginterface_subinterface_path;
private final String pnf_laginterface_subinterface_query_path;
private final String pnf_p_interface_subinterface_path;
private final String pnf_p_interface_subinterface_query_path;
-
+
public static final String SUBINTERFACE_INTERFACE_NAME = "l-interface.interface-name";
public static final String LAG_INTERFACE_INTERFACE_NAME = "lag-interface.interface-name";
-
+ public static final String PNF_PNF_NAME = "pnf.pnf-name";
public static enum TYPE { L2_BRIDGE_BGF, L2_BRIDGE_SBG};
-
+
private final TYPE type;
-
+
public SubInterfaceRequest(TYPE type) {
this.type = type;
@@ -64,11 +64,11 @@ public class SubInterfaceRequest extends AAIRequest {
pnf_p_interface_subinterface_query_path = configProperties.getProperty(PNF_P_INTERFACE_SUBINTERFACE_QUERY_PATH);
}
-
+
@Override
public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
- String request_url = null;
+ String request_url = null;
String encoded_vnf = null;
String pnfname = null;
@@ -77,8 +77,8 @@ public class SubInterfaceRequest extends AAIRequest {
if(type == TYPE.L2_BRIDGE_SBG) {
request_url = target_uri + pnf_laginterface_subinterface_path;
- if(requestProperties.containsKey(PnfRequest.PNF_PNF_NAME)) {
- pnfname = requestProperties.getProperty(PnfRequest.PNF_PNF_NAME);
+ if(requestProperties.containsKey(PNF_PNF_NAME)) {
+ pnfname = requestProperties.getProperty(PNF_PNF_NAME);
encoded_vnf = encodeQuery(pnfname);
request_url = request_url.replace("{pnf-name}", encoded_vnf);
}
@@ -86,7 +86,7 @@ public class SubInterfaceRequest extends AAIRequest {
encoded_vnf = encodeQuery(requestProperties.getProperty(LAG_INTERFACE_INTERFACE_NAME));
request_url = request_url.replace("{lag-interface.interface-name}", encoded_vnf) ;
-
+
interfaceName = requestProperties.getProperty(SUBINTERFACE_INTERFACE_NAME);
encoded_vnf = encodeQuery(interfaceName);
request_url = request_url.replace("{interface-name}", encoded_vnf) ;
@@ -94,17 +94,17 @@ public class SubInterfaceRequest extends AAIRequest {
}
if(type == TYPE.L2_BRIDGE_BGF) {
request_url = target_uri + pnf_p_interface_subinterface_path;
-
- if(requestProperties.containsKey(PnfRequest.PNF_PNF_NAME)) {
- pnfname = requestProperties.getProperty(PnfRequest.PNF_PNF_NAME);
+
+ if(requestProperties.containsKey(PNF_PNF_NAME)) {
+ pnfname = requestProperties.getProperty(PNF_PNF_NAME);
encoded_vnf = encodeQuery(pnfname);
request_url = request_url.replace("{pnf-name}", encoded_vnf);
}
-
+
encoded_vnf = encodeQuery(requestProperties.getProperty(PInterfaceRequest.PINTERFACE_INTERFACE_NAME));
request_url = request_url.replace("{p-interface.interface-name}", encoded_vnf) ;
-
-
+
+
interfaceName = requestProperties.getProperty(SUBINTERFACE_INTERFACE_NAME);
encoded_vnf = encodeQuery(interfaceName);
request_url = request_url.replace("{interface-name}", encoded_vnf) ;
@@ -130,7 +130,7 @@ public class SubInterfaceRequest extends AAIRequest {
return http_req_url;
}
-
+
@Override
public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
return this.getRequestUrl(method, null);
@@ -156,27 +156,27 @@ public class SubInterfaceRequest extends AAIRequest {
public String[] getArgsList() {
String[] args = {};
if(type == TYPE.L2_BRIDGE_SBG) {
- String[] tmpArray = {SUBINTERFACE_INTERFACE_NAME, LAG_INTERFACE_INTERFACE_NAME, PnfRequest.PNF_PNF_NAME};
+ String[] tmpArray = {SUBINTERFACE_INTERFACE_NAME, LAG_INTERFACE_INTERFACE_NAME, PNF_PNF_NAME};
args = tmpArray;
}
if(type == TYPE.L2_BRIDGE_BGF) {
- String[] tmpArray = {SUBINTERFACE_INTERFACE_NAME, PInterfaceRequest.PINTERFACE_INTERFACE_NAME, PnfRequest.PNF_PNF_NAME};
+ String[] tmpArray = {SUBINTERFACE_INTERFACE_NAME, PInterfaceRequest.PINTERFACE_INTERFACE_NAME, PNF_PNF_NAME};
args = tmpArray;
}
return args;
}
-
+
@Override
public Class<? extends AAIDatum> getModelClass() {
return LInterface.class;
}
-
+
@Override
public String getPrimaryResourceName(String resource) {
return "sub-interface";
}
-
+
public static final String processPathData(String request_url, Properties requestProperties) throws UnsupportedEncodingException {
String interfaceName = requestProperties.getProperty(SUBINTERFACE_INTERFACE_NAME);
request_url = request_url.replace("{interface-name}", encodeQuery(interfaceName)) ;
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SubnetRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SubnetRequest.java
deleted file mode 100644
index 05d93e8..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SubnetRequest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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.sdnc.sli.aai;
-
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.openecomp.aai.inventory.v8.Subnet;
-
-public class SubnetRequest extends AAIRequest {
-
- public static final String SUBNET_PATH = "org.openecomp.sdnc.sli.aai.path.subnet";
- public static final String SUBNET_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.subnet.query";
-
- private final String subnet_path;
- private final String subnet_query_path;
-
- public static final String SUBNET_ID = "subnet.subnet-id";
- public static final String NETWORK_ID = "l3-network.network-id";
-
-
- public SubnetRequest() {
- subnet_path = configProperties.getProperty(SUBNET_PATH);
- subnet_query_path = configProperties.getProperty(SUBNET_QUERY_PATH);
- }
-
-
- @Override
- public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
-
- String request_url = target_uri+subnet_path;
-
- String encoded_vnf = null;
- if(requestProperties.getProperty(SUBNET_ID) != null) {
- encoded_vnf = encodeQuery(requestProperties.getProperty(SUBNET_ID));
- request_url = request_url.replace("{subnet-id}", encoded_vnf) ;
- }
-
- if(requestProperties.getProperty(NETWORK_ID) != null) {
- encoded_vnf = encodeQuery(requestProperties.getProperty(NETWORK_ID));
- request_url = request_url.replace("{network-id}", encoded_vnf) ;
-
- }
-
- if(resourceVersion != null) {
- request_url = request_url +"?resource-version="+resourceVersion;
- }
- URL http_req_url = new URL(request_url);
-
- aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
- aaiService.LOGwriteDateTrace(SUBNET_ID, requestProperties.getProperty(SUBNET_ID));
- aaiService.LOGwriteDateTrace(NETWORK_ID, requestProperties.getProperty(NETWORK_ID));
-
- return http_req_url;
- }
-
- @Override
- public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
- return this.getRequestUrl(method, null);
- }
-
-
- @Override
- public String toJSONString() {
- ObjectMapper mapper = getObjectMapper();
- Subnet vnfc = (Subnet)requestDatum;
- String json_text = null;
- try {
- json_text = mapper.writeValueAsString(vnfc);
- } catch (JsonProcessingException exc) {
- handleException(this, exc);
- return null;
- }
- return json_text;
- }
-
- @Override
- public String[] getArgsList() {
- String[] args = {SUBNET_ID, NETWORK_ID};
- return args;
- }
-
- @Override
- public Class<? extends AAIDatum> getModelClass() {
- return Subnet.class;
- }
-
- public String getPrimaryResourceName(String resource) {
- return "subnet";
- }
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/TenantRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/TenantRequest.java
deleted file mode 100644
index 2a4e1a1..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/TenantRequest.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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.sdnc.sli.aai;
-
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Properties;
-
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.openecomp.aai.inventory.v8.Tenant;
-
-public class TenantRequest extends AAIRequest {
-
- // tenant (1602)
- public static final String TENANT_PATH = "org.openecomp.sdnc.sli.aai.path.tenant";
- public static final String TENANT_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.tenant.query";
-
- private final String tenant_path;
- private final String tenant_query_path;
-
- public static final String TENANT_ID = "tenant_id";
- public static final String TENANT_NAME = "tenant_name";
- public static final String TENANT_TENANT_ID = "tenant.tenant_id";
- public static final String TENANT_TENANT_NAME = "tenant.tenant_name";
-
- public TenantRequest() {
- tenant_path = configProperties.getProperty(TENANT_PATH);
- tenant_query_path = configProperties.getProperty(TENANT_QUERY_PATH);
- }
-
-
- @Override
- public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
-
- if(requestProperties.getProperty(TENANT_ID) == null && requestProperties.getProperty(TENANT_NAME) != null) {
- return getRequestQueryUrl(method);
- }
-
- String request_url = target_uri+tenant_path;
-// String encoded_vnf = encodeQuery(requestProperties.getProperty(TENANT_ID));
-// request_url = request_url.replace("{tenant-id}", encoded_vnf) ;
-
- request_url = TenantRequest.processPathData(request_url, requestProperties);
- if(requestProperties.containsKey(CloudRegionRequest.CLOUD_REGION_CLOUD_OWNER)) {
- request_url = CloudRegionRequest.processPathData(request_url, requestProperties);
- }
-
- if(resourceVersion != null) {
- request_url = request_url +"?resource-version="+resourceVersion;
- }
- URL http_req_url = new URL(request_url);
-
- aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
-
- return http_req_url;
- }
-
- @Override
- public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
-
- String request_url = target_uri+tenant_query_path;
- String encoded_vnf = encodeQuery(requestProperties.getProperty(TENANT_NAME));
- request_url = request_url.replace("{tenant-name}", encoded_vnf) ;
-
- if(requestProperties.containsKey(CloudRegionRequest.CLOUD_REGION_CLOUD_OWNER)) {
- request_url = CloudRegionRequest.processPathData(request_url, requestProperties);
- }
-
- URL http_req_url = new URL(request_url);
-
- aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
- aaiService.LOGwriteDateTrace("tenant_name", requestProperties.getProperty(TENANT_NAME));
-
- return http_req_url;
- }
-
-
- @Override
- public String toJSONString() {
- ObjectMapper mapper = getObjectMapper();
- Tenant tenant = (Tenant)requestDatum;
- String json_text = null;
- try {
- json_text = mapper.writeValueAsString(tenant);
- } catch (JsonProcessingException exc) {
- handleException(this, exc);
- return null;
- }
- return json_text;
- }
-
-
- @Override
- public String[] getArgsList() {
- String[] args = {TENANT_ID, TENANT_NAME, TENANT_TENANT_ID, TENANT_TENANT_NAME, CloudRegionRequest.CLOUD_REGION_CLOUD_OWNER, CloudRegionRequest.CLOUD_REGION_CLOUD_REGION_ID };
- return args;
- }
-
-
- @Override
- public Class<? extends AAIDatum> getModelClass() {
- return Tenant.class;
- }
-
- public static String processPathData(String request_url, Properties requestProperties) throws UnsupportedEncodingException {
- String key = TENANT_ID;
- if(requestProperties.containsKey(TENANT_TENANT_ID)) {
- key = TENANT_TENANT_ID;
- }
-
- if(!requestProperties.containsKey(key)) {
- aaiService.logKeyError(String.format("%s,%s", TENANT_ID, TENANT_TENANT_ID));
- }
-
- String encoded_vnf = encodeQuery(requestProperties.getProperty(key));
- request_url = request_url.replace("{tenant-id}", encoded_vnf) ;
-
- aaiService.LOGwriteDateTrace("tenant-id", requestProperties.getProperty(key));
- return request_url;
- }
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VLanRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VLanRequest.java
deleted file mode 100644
index 2a775f4..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VLanRequest.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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.sdnc.sli.aai;
-
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Properties;
-
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.openecomp.aai.inventory.v8.Vlan;
-
-public class VLanRequest extends AAIRequest {
-
- public static final String VLAN_PATH = "org.openecomp.sdnc.sli.aai.path.vlan";
- public static final String GENERIC_VNF_VLAN_PATH ="org.openecomp.sdnc.sli.aai.path.generic.vnf.vlan";
-
- private final String vlan_path;
-
- public static final String VLAN_INTERFACE = "vlan-interface";
- public static final String VLAN_VLAN_INTERFACE = "vlan.vlan-interface";
-
-
- public VLanRequest() {
- vlan_path = configProperties.getProperty(VLAN_PATH);
- }
-
- @Override
- public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
- return this.getRequestUrl(method, null);
- }
-
- @Override
- public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
-
- String request_url = target_uri+vlan_path;
-
- String key = VLAN_INTERFACE;
- if(requestProperties.containsKey(VLAN_VLAN_INTERFACE)) {
- key = VLAN_VLAN_INTERFACE;
- }
-
- if(!requestProperties.containsKey(key)) {
- aaiService.logKeyError(String.format("%s,%s", VLAN_INTERFACE, VLAN_VLAN_INTERFACE));
- }
- String encoded_vnf = encodeQuery(requestProperties.getProperty(key));
-
- request_url = request_url.replace("{vlan-interface}", encoded_vnf) ;
- aaiService.LOGwriteDateTrace("vlan-interface", requestProperties.getProperty(key));
-
- if(resourceVersion != null) {
- request_url = request_url +"?resource-version="+resourceVersion;
- }
- URL http_req_url = new URL(request_url);
-
- aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
-
- return http_req_url;
- }
-
-
- @Override
- public String toJSONString() {
- ObjectMapper mapper = getObjectMapper();
- Vlan vnfc = (Vlan)requestDatum;
- String json_text = null;
- try {
- json_text = mapper.writeValueAsString(vnfc);
- } catch (JsonProcessingException exc) {
- handleException(this, exc);
- return null;
- }
- return json_text;
- }
-
- @Override
- public String[] getArgsList() {
- String[] args =
- {
- VLAN_INTERFACE,
- VLAN_VLAN_INTERFACE,
- LInterfaceRequest.INTERFACE_NAME,
- LInterfaceRequest.LINTERFACE_INTERFACE_NAME,
- GenericVnfRequest.GENERIC_VNF_ID,
- GenericVnfRequest.VNF_ID,
- CloudRegionRequest.CLOUD_REGION_CLOUD_OWNER,
- CloudRegionRequest.CLOUD_REGION_CLOUD_REGION_ID
- };
-
- return args;
- }
-
- @Override
- public Class<? extends AAIDatum> getModelClass() {
- return Vlan.class;
- }
-
- public static String processPathData(String request_url, Properties requestProperties) throws UnsupportedEncodingException {
- String key = VLAN_INTERFACE;
- if(requestProperties.containsKey(VLAN_VLAN_INTERFACE)) {
- key = VLAN_VLAN_INTERFACE;
- }
-
- if(!requestProperties.containsKey(key)) {
- aaiService.logKeyError(String.format("%s,%s", VLAN_INTERFACE, VLAN_VLAN_INTERFACE));
- }
-
- String encoded_vnf = encodeQuery(requestProperties.getProperty(key));
-
- request_url = request_url.replace("{vlan-interface}", encoded_vnf) ;
- aaiService.LOGwriteDateTrace("vlan-interface", requestProperties.getProperty(key));
- return request_url;
- }
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VServerVLanRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VServerVLanRequest.java
deleted file mode 100644
index f653d71..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VServerVLanRequest.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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.sdnc.sli.aai;
-
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.openecomp.aai.inventory.v8.Vlan;
-
-public class VServerVLanRequest extends AAIRequest {
-
- // tenant (1602)
- public static final String VLAN_PATH = "org.openecomp.sdnc.sli.aai.path.vlan";
- public static final String VLAN_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.vlan.query";
-
- private final String vlan_path;
- private final String vlan_query_path;
-
- public static final String TENANT_ID = "tenant.tenant_id";
- public static final String VSERVER_ID = "vserver.vserver_id";
- public static final String INTERFACE_NAME = "l-interface.interface-name";
- public static final String VLAN_INTERFACE = "vlan.vlan-interface";
-
- public VServerVLanRequest() {
- vlan_path = configProperties.getProperty(VLAN_PATH);
- vlan_query_path = configProperties.getProperty(VLAN_QUERY_PATH);
- }
-
-
- @Override
- public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
-
- String request_url = target_uri+vlan_path;
- String encoded_vnf = encodeQuery(requestProperties.getProperty(TENANT_ID));
- request_url = request_url.replace("{tenant-id}", encoded_vnf) ;
-
- encoded_vnf = encodeQuery(requestProperties.getProperty(VSERVER_ID));
- request_url = request_url.replace("{vserver-id}", encoded_vnf) ;
-
- encoded_vnf = encodeQuery(requestProperties.getProperty(INTERFACE_NAME));
- request_url = request_url.replace("{interface-name}", encoded_vnf) ;
-
- encoded_vnf = encodeQuery(requestProperties.getProperty(VLAN_INTERFACE));
- request_url = request_url.replace("{vlan-interface}", encoded_vnf) ;
-
- if(requestProperties.containsKey(CloudRegionRequest.CLOUD_REGION_CLOUD_OWNER)) {
- request_url = CloudRegionRequest.processPathData(request_url, requestProperties);
- }
-
- if(resourceVersion != null) {
- request_url = request_url +"?resource-version="+resourceVersion;
- }
- URL http_req_url = new URL(request_url);
-
- aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
- aaiService.LOGwriteDateTrace("tenant-id", requestProperties.getProperty(TENANT_ID));
- aaiService.LOGwriteDateTrace("vserver-id", requestProperties.getProperty(VSERVER_ID));
- aaiService.LOGwriteDateTrace("interface-name", requestProperties.getProperty(INTERFACE_NAME));
- aaiService.LOGwriteDateTrace("vlan-interface", requestProperties.getProperty(VLAN_INTERFACE));
-
- return http_req_url;
- }
-
- @Override
- public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
-
- String request_url = target_uri+vlan_path;
- String encoded_vnf = encodeQuery(requestProperties.getProperty(TENANT_ID));
- request_url = request_url.replace("{tenant-id}", encoded_vnf) ;
-
- encoded_vnf = encodeQuery(requestProperties.getProperty(VSERVER_ID));
- request_url = request_url.replace("{vserver-id}", encoded_vnf) ;
-
- encoded_vnf = encodeQuery(requestProperties.getProperty(INTERFACE_NAME));
- request_url = request_url.replace("{interface-name}", encoded_vnf) ;
-
- encoded_vnf = encodeQuery(requestProperties.getProperty(VLAN_INTERFACE));
- request_url = request_url.replace("{vlan-interface}", encoded_vnf) ;
-
- if(requestProperties.containsKey(CloudRegionRequest.CLOUD_REGION_CLOUD_OWNER)) {
- request_url = CloudRegionRequest.processPathData(request_url, requestProperties);
- }
-
- URL http_req_url = new URL(request_url);
-
- aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
- aaiService.LOGwriteDateTrace("tenant-id", requestProperties.getProperty(TENANT_ID));
- aaiService.LOGwriteDateTrace("vserver-id", requestProperties.getProperty(VSERVER_ID));
- aaiService.LOGwriteDateTrace("interface-name", requestProperties.getProperty(INTERFACE_NAME));
- aaiService.LOGwriteDateTrace("vlan-interface", requestProperties.getProperty(VLAN_INTERFACE));
-
- return http_req_url;
- }
-
-
- @Override
- public String toJSONString() {
- ObjectMapper mapper = getObjectMapper();
- Vlan tenant = (Vlan)requestDatum;
- String json_text = null;
- try {
- json_text = mapper.writeValueAsString(tenant);
- } catch (JsonProcessingException exc) {
- handleException(this, exc);
- return null;
- }
- return json_text;
- }
-
-
- @Override
- public String[] getArgsList() {
- String[] args = {TENANT_ID, VSERVER_ID, INTERFACE_NAME, VLAN_INTERFACE, CloudRegionRequest.CLOUD_REGION_CLOUD_OWNER, CloudRegionRequest.CLOUD_REGION_CLOUD_REGION_ID};
- return args;
- }
-
-
- @Override
- public Class<? extends AAIDatum> getModelClass() {
- return Vlan.class;
- }
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VserverRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VserverRequest.java
deleted file mode 100644
index 757034c..0000000
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VserverRequest.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * openECOMP : SDN-C
- * ================================================================================
- * 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.sdnc.sli.aai;
-
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Arrays;
-
-import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.openecomp.aai.inventory.v8.Vserver;
-
-public class VserverRequest extends AAIRequest {
-
- public static final String VSERVER_PATH = "org.openecomp.sdnc.sli.aai.path.vserver";
- public static final String VSERVER_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.vserver.query";
-
- private final String vserver_path;
- private final String vserver_query_path;
-
- public static final String VSERVER_ID = "vserver_id";
- public static final String VSERVER_VSERVER_ID = "vserver.vserver_id";
-
- public static final String TENANT_ID = "tenant_id";
- public static final String TENANT_TENANT_ID = "tenant.tenant_id";
-
-
- public static final String VSERVER_NAME = "vserver_name";
-
- public VserverRequest() {
- vserver_path = configProperties.getProperty(VSERVER_PATH);
- vserver_query_path = configProperties.getProperty(VSERVER_QUERY_PATH);
- }
-
-
- @Override
- public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
-
- String request_url = target_uri+vserver_path;
- LOG.debug(Arrays.toString(requestProperties.entrySet().toArray()));
-
- String encoded_vnf = null;
- if(requestProperties.containsKey(VSERVER_ID)) {
- encoded_vnf = encodeQuery(requestProperties.getProperty(VSERVER_ID));
- request_url = request_url.replace("{vserver-id}", encoded_vnf) ;
- aaiService.LOGwriteDateTrace(VSERVER_ID, requestProperties.getProperty(VSERVER_ID));
- }
- else if(requestProperties.containsKey(VSERVER_VSERVER_ID)) {
- encoded_vnf = encodeQuery(requestProperties.getProperty(VSERVER_VSERVER_ID));
- request_url = request_url.replace("{vserver-id}", encoded_vnf) ;
- aaiService.LOGwriteDateTrace(VSERVER_ID, requestProperties.getProperty(VSERVER_VSERVER_ID));
- }
-
-
- if(requestProperties.containsKey(TENANT_ID)) {
- encoded_vnf = encodeQuery(requestProperties.getProperty(TENANT_ID));
- request_url = request_url.replace("{tenant-id}", encoded_vnf) ;
- aaiService.LOGwriteDateTrace(TENANT_ID, requestProperties.getProperty(TENANT_ID));
- }
- else if(requestProperties.containsKey(TENANT_TENANT_ID)) {
- encoded_vnf = encodeQuery(requestProperties.getProperty(TENANT_TENANT_ID));
- request_url = request_url.replace("{tenant-id}", encoded_vnf) ;
- aaiService.LOGwriteDateTrace(TENANT_ID, requestProperties.getProperty(TENANT_TENANT_ID));
- }
-
- if(requestProperties.containsKey(CloudRegionRequest.CLOUD_REGION_CLOUD_OWNER)) {
- request_url = CloudRegionRequest.processPathData(request_url, requestProperties);
- }
-
-
- if(resourceVersion != null) {
- request_url = request_url +"?resource-version="+resourceVersion;
- }
- URL http_req_url = new URL(request_url);
-
- aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
-
- return http_req_url;
- }
-
- @Override
- public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
- return this.getRequestUrl(method, null);
- }
-
-
- @Override
- public String toJSONString() {
- ObjectMapper mapper = getObjectMapper();
- Vserver vnfc = (Vserver)requestDatum;
- String json_text = null;
- try {
- json_text = mapper.writeValueAsString(vnfc);
- } catch (JsonProcessingException exc) {
- handleException(this, exc);
- return null;
- }
- return json_text;
- }
-
- @Override
- public String[] getArgsList() {
- String[] args = {VSERVER_ID, VSERVER_VSERVER_ID, VSERVER_NAME, TENANT_ID, TENANT_TENANT_ID, CloudRegionRequest.CLOUD_REGION_CLOUD_OWNER, CloudRegionRequest.CLOUD_REGION_CLOUD_REGION_ID};
- return args;
- }
-
- @Override
- public Class<? extends AAIDatum> getModelClass() {
- return Vserver.class;
- }
-
- @Override
- public String formatKey(String argument) {
- switch(argument) {
- case "tenant-id":
- return "tenant.tenant-id";
- case "vserver-id":
- return "vserver.vserver-id";
- case "vserver-name":
- return "vserver.vserver-name";
-// case "cloud-region-id":
-// return "cloud-region.cloud-region-id";
-// case "cloud-owner":
-// return "cloud-region.cloud-owner";
- default:
- return argument;
- }
- }
-
- public String getPrimaryResourceName(String resource) {
- return "vserver";
- }
-}
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/SubInterface.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/SubInterface.java
index 03f638a..872c5f8 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/SubInterface.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/SubInterface.java
@@ -31,8 +31,8 @@ import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openecomp.aai.inventory.v8.RelationshipList;
-import org.openecomp.aai.inventory.v8.Vlans;
+import org.openecomp.aai.inventory.v10.RelationshipList;
+import org.openecomp.aai.inventory.v10.Vlans;
@JsonInclude(JsonInclude.Include.NON_NULL)
@Generated("org.jsonschema2pojo")
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/InstanceFilter.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/InstanceFilter.java
index 5e2eb78..26c6157 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/InstanceFilter.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/InstanceFilter.java
@@ -33,14 +33,15 @@ import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.openecomp.aai.inventory.v8.LogicalLink;
-import org.openecomp.aai.inventory.v8.Pnf;
+import org.openecomp.aai.inventory.v10.*;
@JsonInclude(JsonInclude.Include.NON_NULL)
@Generated("org.jsonschema2pojo")
@JsonPropertyOrder({
"logical-link",
- "pnf"
+ "pnf",
+ "l3-network",
+ "service-instance"
})
public class InstanceFilter {
@@ -48,11 +49,16 @@ public class InstanceFilter {
private LogicalLink logicalLink;
@JsonProperty("pnf")
private Pnf pnf;
+ @JsonProperty("l3-network")
+ private L3Network l3Network;
+ @JsonProperty("service-instance")
+ private ServiceInstance serviceInstance;
+
@JsonIgnore
private Map<String, Object> additionalProperties = new HashMap<String, Object>();
/**
- *
+ *
* @return
* The logicalLink
*/
@@ -62,7 +68,7 @@ public class InstanceFilter {
}
/**
- *
+ *
* @param logicalLink
* The logical-link
*/
@@ -72,7 +78,7 @@ public class InstanceFilter {
}
/**
- *
+ *
* @return
* The pnf
*/
@@ -82,7 +88,7 @@ public class InstanceFilter {
}
/**
- *
+ *
* @param pnf
* The pnf
*/
@@ -91,6 +97,16 @@ public class InstanceFilter {
this.pnf = pnf;
}
+ @JsonProperty("l3-network")
+ public L3Network getL3Network() {
+ return l3Network;
+ }
+
+ @JsonProperty("l3-network")
+ public void setL3Network(L3Network l3Network) {
+ this.l3Network = l3Network;
+ }
+
@JsonAnyGetter
public Map<String, Object> getAdditionalProperties() {
return this.additionalProperties;
@@ -101,4 +117,14 @@ public class InstanceFilter {
this.additionalProperties.put(name, value);
}
+ @JsonProperty("service-instance")
+ public ServiceInstance getServiceInstance() {
+ return serviceInstance;
+ }
+
+ @JsonProperty("service-instance")
+ public void setServiceInstance(ServiceInstance serviceInstance) {
+ this.serviceInstance = serviceInstance;
+ }
+
}
diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/NamedQueryData.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/NamedQueryData.java
index f136198..6d09a2d 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/NamedQueryData.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/NamedQueryData.java
@@ -26,7 +26,6 @@ import java.util.Map;
import javax.annotation.Generated;
import org.openecomp.sdnc.sli.aai.data.AAIDatum;
-
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonIgnore;