Merge "[DCAE-15] Changes related to version 1.1"

17 files changed, 39 insertions, 15 deletions

diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/Hypervisor.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/Hypervisor.java
index 154c46b..6593730 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/Hypervisor.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/Hypervisor.java
@@ -32,6 +32,7 @@ import org.openecomp.ncomp.core.NamedEntity;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.openstack.location.Hypervisor#getService <em>Service</em>}</li>
  *   <li>{@link org.openecomp.ncomp.openstack.location.Hypervisor#getHost_ip <em>Host ip</em>}</li>
@@ -52,7 +53,6 @@ import org.openecomp.ncomp.core.NamedEntity;
  *   <li>{@link org.openecomp.ncomp.openstack.location.Hypervisor#getFree_ram_mb <em>Free ram mb</em>}</li>
  *   <li>{@link org.openecomp.ncomp.openstack.location.Hypervisor#getId <em>Id</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.openstack.location.LocationPackage#getHypervisor()
  * @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/HypervisorCpuInfo.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/HypervisorCpuInfo.java
index 8cfcc52..ff4c964 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/HypervisorCpuInfo.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/HypervisorCpuInfo.java
@@ -34,6 +34,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.openstack.location.HypervisorCpuInfo#getVendor <em>Vendor</em>}</li>
  *   <li>{@link org.openecomp.ncomp.openstack.location.HypervisorCpuInfo#getModel <em>Model</em>}</li>
@@ -41,7 +42,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.openecomp.ncomp.openstack.location.HypervisorCpuInfo#getFeatures <em>Features</em>}</li>
  *   <li>{@link org.openecomp.ncomp.openstack.location.HypervisorCpuInfo#getTopology <em>Topology</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.openstack.location.LocationPackage#getHypervisorCpuInfo()
  * @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/HypervisorCpuTopology.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/HypervisorCpuTopology.java
index d54569f..1700db8 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/HypervisorCpuTopology.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/HypervisorCpuTopology.java
@@ -32,12 +32,12 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.openstack.location.HypervisorCpuTopology#getCores <em>Cores</em>}</li>
  *   <li>{@link org.openecomp.ncomp.openstack.location.HypervisorCpuTopology#getThreads <em>Threads</em>}</li>
  *   <li>{@link org.openecomp.ncomp.openstack.location.HypervisorCpuTopology#getSockets <em>Sockets</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.openstack.location.LocationPackage#getHypervisorCpuTopology()
  * @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/HypervisorService.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/HypervisorService.java
index 5fd546b..9849545 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/HypervisorService.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/HypervisorService.java
@@ -32,11 +32,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.openstack.location.HypervisorService#getHost <em>Host</em>}</li>
  *   <li>{@link org.openecomp.ncomp.openstack.location.HypervisorService#getId <em>Id</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.openstack.location.LocationPackage#getHypervisorService()
  * @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/LocationPackage.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/LocationPackage.java
index ccbef80..3f2fa5d 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/LocationPackage.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/LocationPackage.java
@@ -44,6 +44,24 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * 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============================================
+ * <!-- end-model-doc -->
  * @see org.openecomp.ncomp.openstack.location.LocationFactory
  * @model kind="package"
  *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/ncomp-openstack-model/src/main/xcore-gen' basePackage='org.openecomp.ncomp.openstack'"
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackLocation.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackLocation.java
index 0d15f9e..cab63c5 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackLocation.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackLocation.java
@@ -41,6 +41,7 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.openstack.location.OpenStackLocation#getVersion <em>Version</em>}</li>
  *   <li>{@link org.openecomp.ncomp.openstack.location.OpenStackLocation#isRemoteLocation <em>Remote Location</em>}</li>
@@ -57,7 +58,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.openecomp.ncomp.openstack.location.OpenStackLocation#getFlavors <em>Flavors</em>}</li>
  *   <li>{@link org.openecomp.ncomp.openstack.location.OpenStackLocation#getHypervisors <em>Hypervisors</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.openstack.location.LocationPackage#getOpenStackLocation()
  * @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackProject.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackProject.java
index 7cb85a2..dc0617a 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackProject.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackProject.java
@@ -49,6 +49,7 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.openstack.location.OpenStackProject#getID <em>ID</em>}</li>
  *   <li>{@link org.openecomp.ncomp.openstack.location.OpenStackProject#getAdminUser <em>Admin User</em>}</li>
@@ -71,7 +72,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.openecomp.ncomp.openstack.location.OpenStackProject#getSecurity_groups <em>Security groups</em>}</li>
  *   <li>{@link org.openecomp.ncomp.openstack.location.OpenStackProject#getFloatingips <em>Floatingips</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.openstack.location.LocationPackage#getOpenStackProject()
  * @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackUser.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackUser.java
index dd69e1c..bc654a7 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackUser.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackUser.java
@@ -32,10 +32,10 @@ import org.openecomp.ncomp.core.NamedEntity;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.openstack.location.OpenStackUser#getPassword <em>Password</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.openstack.location.LocationPackage#getOpenStackUser()
  * @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackVersion.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackVersion.java
index 2a4184b..d34ff87 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackVersion.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackVersion.java
@@ -255,6 +255,8 @@ public enum OpenStackVersion implements Enumerator {
 	 * Returns the '<em><b>Open Stack Version</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static OpenStackVersion get(String literal) {
@@ -271,6 +273,8 @@ public enum OpenStackVersion implements Enumerator {
 	 * Returns the '<em><b>Open Stack Version</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static OpenStackVersion getByName(String name) {
@@ -287,6 +291,8 @@ public enum OpenStackVersion implements Enumerator {
 	 * Returns the '<em><b>Open Stack Version</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static OpenStackVersion get(int value) {
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorCpuInfoImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorCpuInfoImpl.java
index fa02fa2..dd1aa7d 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorCpuInfoImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorCpuInfoImpl.java
@@ -48,6 +48,7 @@ import org.eclipse.emf.ecore.util.EDataTypeEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.openstack.location.impl.HypervisorCpuInfoImpl#getVendor <em>Vendor</em>}</li>
  *   <li>{@link org.openecomp.ncomp.openstack.location.impl.HypervisorCpuInfoImpl#getModel <em>Model</em>}</li>
@@ -55,7 +56,6 @@ import org.eclipse.emf.ecore.util.EDataTypeEList;
  *   <li>{@link org.openecomp.ncomp.openstack.location.impl.HypervisorCpuInfoImpl#getFeatures <em>Features</em>}</li>
  *   <li>{@link org.openecomp.ncomp.openstack.location.impl.HypervisorCpuInfoImpl#getTopology <em>Topology</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorCpuTopologyImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorCpuTopologyImpl.java
index f174236..9872312 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorCpuTopologyImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorCpuTopologyImpl.java
@@ -39,12 +39,12 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.openstack.location.impl.HypervisorCpuTopologyImpl#getCores <em>Cores</em>}</li>
  *   <li>{@link org.openecomp.ncomp.openstack.location.impl.HypervisorCpuTopologyImpl#getThreads <em>Threads</em>}</li>
  *   <li>{@link org.openecomp.ncomp.openstack.location.impl.HypervisorCpuTopologyImpl#getSockets <em>Sockets</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorImpl.java
index f857f00..cb152bf 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorImpl.java
@@ -44,6 +44,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.openstack.location.impl.HypervisorImpl#getService <em>Service</em>}</li>
  *   <li>{@link org.openecomp.ncomp.openstack.location.impl.HypervisorImpl#getHost_ip <em>Host ip</em>}</li>
@@ -64,7 +65,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  *   <li>{@link org.openecomp.ncomp.openstack.location.impl.HypervisorImpl#getFree_ram_mb <em>Free ram mb</em>}</li>
  *   <li>{@link org.openecomp.ncomp.openstack.location.impl.HypervisorImpl#getId <em>Id</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorServiceImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorServiceImpl.java
index b7b5e54..c85b322 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorServiceImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorServiceImpl.java
@@ -39,11 +39,11 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.openstack.location.impl.HypervisorServiceImpl#getHost <em>Host</em>}</li>
  *   <li>{@link org.openecomp.ncomp.openstack.location.impl.HypervisorServiceImpl#getId <em>Id</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/OpenStackLocationImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/OpenStackLocationImpl.java
index 1b9ed42..2367642 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/OpenStackLocationImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/OpenStackLocationImpl.java
@@ -75,6 +75,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.openstack.location.impl.OpenStackLocationImpl#getCeilometerAvailableCapabilites <em>Ceilometer Available Capabilites</em>}</li>
  *   <li>{@link org.openecomp.ncomp.openstack.location.impl.OpenStackLocationImpl#getCeilometerUnavailableCapabilites <em>Ceilometer Unavailable Capabilites</em>}</li>
@@ -93,7 +94,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.openecomp.ncomp.openstack.location.impl.OpenStackLocationImpl#getFlavors <em>Flavors</em>}</li>
  *   <li>{@link org.openecomp.ncomp.openstack.location.impl.OpenStackLocationImpl#getHypervisors <em>Hypervisors</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/OpenStackProjectImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/OpenStackProjectImpl.java
index 3e36228..9ed957e 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/OpenStackProjectImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/OpenStackProjectImpl.java
@@ -72,6 +72,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.openstack.location.impl.OpenStackProjectImpl#getAlarms <em>Alarms</em>}</li>
  *   <li>{@link org.openecomp.ncomp.openstack.location.impl.OpenStackProjectImpl#getResources <em>Resources</em>}</li>
@@ -97,7 +98,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.openecomp.ncomp.openstack.location.impl.OpenStackProjectImpl#getSecurity_groups <em>Security groups</em>}</li>
  *   <li>{@link org.openecomp.ncomp.openstack.location.impl.OpenStackProjectImpl#getFloatingips <em>Floatingips</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/OpenStackUserImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/OpenStackUserImpl.java
index 836493c..d91d9c4 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/OpenStackUserImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/OpenStackUserImpl.java
@@ -40,10 +40,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.openstack.location.impl.OpenStackUserImpl#getPassword <em>Password</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/util/LocationSwitch.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/util/LocationSwitch.java
index d60e0c6..978dc83 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/util/LocationSwitch.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/util/LocationSwitch.java
@@ -76,7 +76,7 @@ public class LocationSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */