[DCAE-15] Changes related to version 1.1 (2)

Change-Id: I52fefc397f789b56095f037acc517b364516b2cb
Signed-off-by: Carsten Lund <lund@research.att.com>

16 files changed, 186 insertions, 25 deletions

diff --git a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/ControllerCluster.java b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/ControllerCluster.java
index 4ff0aa6..5f6ff11 100644
--- a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/ControllerCluster.java
+++ b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/ControllerCluster.java
@@ -35,6 +35,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.ControllerCluster#getMyServerName <em>My Server Name</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.ControllerCluster#getRole <em>Role</em>}</li>
@@ -42,7 +43,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.ControllerCluster#getServers <em>Servers</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.ControllerCluster#getRemoteServers <em>Remote Servers</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.dcae.controller.platform.controller.ControllerPackage#getControllerCluster()
  * @model
diff --git a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/ControllerClusterServer.java b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/ControllerClusterServer.java
index cff1a76..7e9ca60 100644
--- a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/ControllerClusterServer.java
+++ b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/ControllerClusterServer.java
@@ -34,12 +34,12 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.ControllerClusterServer#getRole <em>Role</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.ControllerClusterServer#getData <em>Data</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.ControllerClusterServer#getServer <em>Server</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.dcae.controller.platform.controller.ControllerPackage#getControllerClusterServer()
  * @model
diff --git a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/ControllerClusterServerData.java b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/ControllerClusterServerData.java
index 9a547f0..225404d 100644
--- a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/ControllerClusterServerData.java
+++ b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/ControllerClusterServerData.java
@@ -35,6 +35,7 @@ import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.ControllerClusterServerData#getPushInterval <em>Push Interval</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.ControllerClusterServerData#getLastPush <em>Last Push</em>}</li>
@@ -44,7 +45,6 @@ import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.ControllerClusterServerData#getNumberDataReceived <em>Number Data Received</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.ControllerClusterServerData#getNumberDataReceivedErrors <em>Number Data Received Errors</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.dcae.controller.platform.controller.ControllerPackage#getControllerClusterServerData()
  * @model
diff --git a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/ControllerPackage.java b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/ControllerPackage.java
index 2f0d0cb..7d11402 100644
--- a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/ControllerPackage.java
+++ b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/ControllerPackage.java
@@ -46,6 +46,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.dcae.controller.platform.controller.ControllerFactory
  * @model kind="package"
  *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/dcae-controller-platform-model/src/main/xcore-gen' basePackage='org.openecomp.dcae.controller.platform'"
@@ -149,13 +167,22 @@ public interface ControllerPackage extends EPackage {
 	int DCAE_PLATFORM_CONTROLLER__DATABUS = ServerPackage.SOUTH_BOUND_API_WITH_PROXY_FEATURE_COUNT + 5;
 
 	/**
+	 * The feature id for the '<em><b>Inventory</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_PLATFORM_CONTROLLER__INVENTORY = ServerPackage.SOUTH_BOUND_API_WITH_PROXY_FEATURE_COUNT + 6;
+
+	/**
 	 * The feature id for the '<em><b>Descriptors</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int DCAE_PLATFORM_CONTROLLER__DESCRIPTORS = ServerPackage.SOUTH_BOUND_API_WITH_PROXY_FEATURE_COUNT + 6;
+	int DCAE_PLATFORM_CONTROLLER__DESCRIPTORS = ServerPackage.SOUTH_BOUND_API_WITH_PROXY_FEATURE_COUNT + 7;
 
 	/**
 	 * The feature id for the '<em><b>Services</b></em>' containment reference list.
@@ -164,7 +191,7 @@ public interface ControllerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int DCAE_PLATFORM_CONTROLLER__SERVICES = ServerPackage.SOUTH_BOUND_API_WITH_PROXY_FEATURE_COUNT + 7;
+	int DCAE_PLATFORM_CONTROLLER__SERVICES = ServerPackage.SOUTH_BOUND_API_WITH_PROXY_FEATURE_COUNT + 8;
 
 	/**
 	 * The feature id for the '<em><b>Users</b></em>' containment reference list.
@@ -173,7 +200,7 @@ public interface ControllerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int DCAE_PLATFORM_CONTROLLER__USERS = ServerPackage.SOUTH_BOUND_API_WITH_PROXY_FEATURE_COUNT + 8;
+	int DCAE_PLATFORM_CONTROLLER__USERS = ServerPackage.SOUTH_BOUND_API_WITH_PROXY_FEATURE_COUNT + 9;
 
 	/**
 	 * The feature id for the '<em><b>Admin Users</b></em>' reference list.
@@ -182,7 +209,7 @@ public interface ControllerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int DCAE_PLATFORM_CONTROLLER__ADMIN_USERS = ServerPackage.SOUTH_BOUND_API_WITH_PROXY_FEATURE_COUNT + 9;
+	int DCAE_PLATFORM_CONTROLLER__ADMIN_USERS = ServerPackage.SOUTH_BOUND_API_WITH_PROXY_FEATURE_COUNT + 10;
 
 	/**
 	 * The number of structural features of the '<em>Dcae Platform Controller</em>' class.
@@ -191,7 +218,7 @@ public interface ControllerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int DCAE_PLATFORM_CONTROLLER_FEATURE_COUNT = ServerPackage.SOUTH_BOUND_API_WITH_PROXY_FEATURE_COUNT + 10;
+	int DCAE_PLATFORM_CONTROLLER_FEATURE_COUNT = ServerPackage.SOUTH_BOUND_API_WITH_PROXY_FEATURE_COUNT + 11;
 
 	/**
 	 * The operation id for the '<em>Logs</em>' operation.
@@ -943,6 +970,17 @@ public interface ControllerPackage extends EPackage {
 	EReference getDcaePlatformController_Databus();
 
 	/**
+	 * Returns the meta object for the containment reference '{@link org.openecomp.dcae.controller.platform.controller.DcaePlatformController#getInventory <em>Inventory</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Inventory</em>'.
+	 * @see org.openecomp.dcae.controller.platform.controller.DcaePlatformController#getInventory()
+	 * @see #getDcaePlatformController()
+	 * @generated
+	 */
+	EReference getDcaePlatformController_Inventory();
+
+	/**
 	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.platform.controller.DcaePlatformController#getServices <em>Services</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1361,6 +1399,14 @@ public interface ControllerPackage extends EPackage {
 		EReference DCAE_PLATFORM_CONTROLLER__DATABUS = eINSTANCE.getDcaePlatformController_Databus();
 
 		/**
+		 * The meta object literal for the '<em><b>Inventory</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DCAE_PLATFORM_CONTROLLER__INVENTORY = eINSTANCE.getDcaePlatformController_Inventory();
+
+		/**
 		 * The meta object literal for the '<em><b>Services</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/DcaeDataBus.java b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/DcaeDataBus.java
index d104318..fcefd91 100644
--- a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/DcaeDataBus.java
+++ b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/DcaeDataBus.java
@@ -37,13 +37,13 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.DcaeDataBus#getStreams <em>Streams</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.DcaeDataBus#getLocations <em>Locations</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.DcaeDataBus#getMrClusters <em>Mr Clusters</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.DcaeDataBus#getDrNodes <em>Dr Nodes</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.dcae.controller.platform.controller.ControllerPackage#getDcaeDataBus()
  * @model
diff --git a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/DcaePlatformController.java b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/DcaePlatformController.java
index a3a9204..ef8e16d 100644
--- a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/DcaePlatformController.java
+++ b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/DcaePlatformController.java
@@ -26,6 +26,7 @@ package org.openecomp.dcae.controller.platform.controller;
 import org.openecomp.dcae.controller.core.service.DcaeLocation;
 import org.openecomp.dcae.controller.core.service.DcaeService;
 import org.openecomp.dcae.controller.core.service.DcaeServiceDescriptor;
+import org.openecomp.dcae.controller.inventory.DcaeInventory;
 import org.openecomp.ncomp.core.User;
 import org.openecomp.ncomp.openstack.OpenStackController;
 import org.openecomp.ncomp.sirius.manager.server.AbstractManagementServer;
@@ -39,17 +40,18 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.DcaePlatformController#getCluster <em>Cluster</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.DcaePlatformController#getOpenstack <em>Openstack</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.DcaePlatformController#getLocations <em>Locations</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.DcaePlatformController#getDatabus <em>Databus</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.platform.controller.DcaePlatformController#getInventory <em>Inventory</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.DcaePlatformController#getDescriptors <em>Descriptors</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.DcaePlatformController#getServices <em>Services</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.DcaePlatformController#getUsers <em>Users</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.DcaePlatformController#getAdminUsers <em>Admin Users</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.dcae.controller.platform.controller.ControllerPackage#getDcaePlatformController()
  * @model
@@ -151,6 +153,32 @@ public interface DcaePlatformController extends SouthBoundApiWithProxy, Abstract
 	void setDatabus(DcaeDataBus value);
 
 	/**
+	 * Returns the value of the '<em><b>Inventory</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Inventory</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Inventory</em>' containment reference.
+	 * @see #setInventory(DcaeInventory)
+	 * @see org.openecomp.dcae.controller.platform.controller.ControllerPackage#getDcaePlatformController_Inventory()
+	 * @model containment="true"
+	 * @generated
+	 */
+	DcaeInventory getInventory();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.platform.controller.DcaePlatformController#getInventory <em>Inventory</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Inventory</em>' containment reference.
+	 * @see #getInventory()
+	 * @generated
+	 */
+	void setInventory(DcaeInventory value);
+
+	/**
 	 * Returns the value of the '<em><b>Services</b></em>' containment reference list.
 	 * The list contents are of type {@link org.openecomp.dcae.controller.core.service.DcaeService}.
 	 * <!-- begin-user-doc -->
diff --git a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/ServerRole.java b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/ServerRole.java
index 0286a1b..29515f1 100644
--- a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/ServerRole.java
+++ b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/ServerRole.java
@@ -163,6 +163,8 @@ public enum ServerRole implements Enumerator {
 	 * Returns the '<em><b>Server Role</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 ServerRole get(String literal) {
@@ -179,6 +181,8 @@ public enum ServerRole implements Enumerator {
 	 * Returns the '<em><b>Server Role</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 ServerRole getByName(String name) {
@@ -195,6 +199,8 @@ public enum ServerRole implements Enumerator {
 	 * Returns the '<em><b>Server Role</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 ServerRole get(int value) {
diff --git a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/ControllerClusterImpl.java b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/ControllerClusterImpl.java
index 7c03e75..1ba7d0c 100644
--- a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/ControllerClusterImpl.java
+++ b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/ControllerClusterImpl.java
@@ -50,6 +50,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.impl.ControllerClusterImpl#getMyServerName <em>My Server Name</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.impl.ControllerClusterImpl#getRole <em>Role</em>}</li>
@@ -57,7 +58,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.impl.ControllerClusterImpl#getServers <em>Servers</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.impl.ControllerClusterImpl#getRemoteServers <em>Remote Servers</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/ControllerClusterServerDataImpl.java b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/ControllerClusterServerDataImpl.java
index 6aedded..4263c9d 100644
--- a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/ControllerClusterServerDataImpl.java
+++ b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/ControllerClusterServerDataImpl.java
@@ -43,6 +43,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.impl.ControllerClusterServerDataImpl#getPushInterval <em>Push Interval</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.impl.ControllerClusterServerDataImpl#getLastPush <em>Last Push</em>}</li>
@@ -52,7 +53,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.impl.ControllerClusterServerDataImpl#getNumberDataReceived <em>Number Data Received</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.impl.ControllerClusterServerDataImpl#getNumberDataReceivedErrors <em>Number Data Received Errors</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/ControllerClusterServerImpl.java b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/ControllerClusterServerImpl.java
index 517f38e..a4c667c 100644
--- a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/ControllerClusterServerImpl.java
+++ b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/ControllerClusterServerImpl.java
@@ -45,12 +45,12 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.impl.ControllerClusterServerImpl#getRole <em>Role</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.impl.ControllerClusterServerImpl#getData <em>Data</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.impl.ControllerClusterServerImpl#getServer <em>Server</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/ControllerPackageImpl.java b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/ControllerPackageImpl.java
index 8725d12..efb4cba 100644
--- a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/ControllerPackageImpl.java
+++ b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/ControllerPackageImpl.java
@@ -25,6 +25,7 @@ package org.openecomp.dcae.controller.platform.controller.impl;
 
 import org.openecomp.dcae.controller.core.service.ServicePackage;
 import org.openecomp.dcae.controller.core.stream.StreamPackage;
+import org.openecomp.dcae.controller.inventory.InventoryPackage;
 import org.openecomp.dcae.controller.platform.controller.ControllerCluster;
 import org.openecomp.dcae.controller.platform.controller.ControllerClusterServer;
 import org.openecomp.dcae.controller.platform.controller.ControllerClusterServerData;
@@ -150,9 +151,10 @@ public class ControllerPackageImpl extends EPackageImpl implements ControllerPac
 		isInited = true;
 
 		// Initialize simple dependencies
-		VmPackage.eINSTANCE.eClass();
 		ServerPackage.eINSTANCE.eClass();
 		OpenstackPackage.eINSTANCE.eClass();
+		InventoryPackage.eINSTANCE.eClass();
+		VmPackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
 		theControllerPackage.createPackageContents();
@@ -219,8 +221,17 @@ public class ControllerPackageImpl extends EPackageImpl implements ControllerPac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EReference getDcaePlatformController_Inventory() {
+		return (EReference)dcaePlatformControllerEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EReference getDcaePlatformController_Services() {
-		return (EReference)dcaePlatformControllerEClass.getEStructuralFeatures().get(5);
+		return (EReference)dcaePlatformControllerEClass.getEStructuralFeatures().get(6);
 	}
 
 	/**
@@ -229,7 +240,7 @@ public class ControllerPackageImpl extends EPackageImpl implements ControllerPac
 	 * @generated
 	 */
 	public EReference getDcaePlatformController_Users() {
-		return (EReference)dcaePlatformControllerEClass.getEStructuralFeatures().get(6);
+		return (EReference)dcaePlatformControllerEClass.getEStructuralFeatures().get(7);
 	}
 
 	/**
@@ -238,7 +249,7 @@ public class ControllerPackageImpl extends EPackageImpl implements ControllerPac
 	 * @generated
 	 */
 	public EReference getDcaePlatformController_Descriptors() {
-		return (EReference)dcaePlatformControllerEClass.getEStructuralFeatures().get(4);
+		return (EReference)dcaePlatformControllerEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
@@ -247,7 +258,7 @@ public class ControllerPackageImpl extends EPackageImpl implements ControllerPac
 	 * @generated
 	 */
 	public EReference getDcaePlatformController_AdminUsers() {
-		return (EReference)dcaePlatformControllerEClass.getEStructuralFeatures().get(7);
+		return (EReference)dcaePlatformControllerEClass.getEStructuralFeatures().get(8);
 	}
 
 	/**
@@ -544,6 +555,7 @@ public class ControllerPackageImpl extends EPackageImpl implements ControllerPac
 		createEReference(dcaePlatformControllerEClass, DCAE_PLATFORM_CONTROLLER__OPENSTACK);
 		createEReference(dcaePlatformControllerEClass, DCAE_PLATFORM_CONTROLLER__LOCATIONS);
 		createEReference(dcaePlatformControllerEClass, DCAE_PLATFORM_CONTROLLER__DATABUS);
+		createEReference(dcaePlatformControllerEClass, DCAE_PLATFORM_CONTROLLER__INVENTORY);
 		createEReference(dcaePlatformControllerEClass, DCAE_PLATFORM_CONTROLLER__DESCRIPTORS);
 		createEReference(dcaePlatformControllerEClass, DCAE_PLATFORM_CONTROLLER__SERVICES);
 		createEReference(dcaePlatformControllerEClass, DCAE_PLATFORM_CONTROLLER__USERS);
@@ -613,6 +625,7 @@ public class ControllerPackageImpl extends EPackageImpl implements ControllerPac
 		ServerPackage theServerPackage = (ServerPackage)EPackage.Registry.INSTANCE.getEPackage(ServerPackage.eNS_URI);
 		OpenstackPackage theOpenstackPackage = (OpenstackPackage)EPackage.Registry.INSTANCE.getEPackage(OpenstackPackage.eNS_URI);
 		ServicePackage theServicePackage = (ServicePackage)EPackage.Registry.INSTANCE.getEPackage(ServicePackage.eNS_URI);
+		InventoryPackage theInventoryPackage = (InventoryPackage)EPackage.Registry.INSTANCE.getEPackage(InventoryPackage.eNS_URI);
 		CorePackage theCorePackage = (CorePackage)EPackage.Registry.INSTANCE.getEPackage(CorePackage.eNS_URI);
 		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
 		StreamPackage theStreamPackage = (StreamPackage)EPackage.Registry.INSTANCE.getEPackage(StreamPackage.eNS_URI);
@@ -636,6 +649,7 @@ public class ControllerPackageImpl extends EPackageImpl implements ControllerPac
 		initEReference(getDcaePlatformController_Openstack(), theOpenstackPackage.getOpenStackController(), null, "openstack", null, 0, 1, DcaePlatformController.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getDcaePlatformController_Locations(), theServicePackage.getDcaeLocation(), null, "locations", null, 0, -1, DcaePlatformController.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getDcaePlatformController_Databus(), this.getDcaeDataBus(), null, "databus", null, 0, 1, DcaePlatformController.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDcaePlatformController_Inventory(), theInventoryPackage.getDcaeInventory(), null, "inventory", null, 0, 1, DcaePlatformController.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getDcaePlatformController_Descriptors(), theServicePackage.getDcaeServiceDescriptor(), null, "descriptors", null, 0, -1, DcaePlatformController.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getDcaePlatformController_Services(), theServicePackage.getDcaeService(), null, "services", null, 0, -1, DcaePlatformController.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getDcaePlatformController_Users(), theCorePackage.getUser(), null, "users", null, 0, -1, DcaePlatformController.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
diff --git a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/ControllerVirtualMachineServiceImpl.java b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/ControllerVirtualMachineServiceImpl.java
index 9efe9bc..4bc0f5b 100644
--- a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/ControllerVirtualMachineServiceImpl.java
+++ b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/ControllerVirtualMachineServiceImpl.java
@@ -34,8 +34,6 @@ import org.eclipse.emf.ecore.EClass;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Virtual Machine Service</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/DcaeDataBusImpl.java b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/DcaeDataBusImpl.java
index eb17eff..41cc1be 100644
--- a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/DcaeDataBusImpl.java
+++ b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/DcaeDataBusImpl.java
@@ -44,13 +44,13 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.impl.DcaeDataBusImpl#getStreams <em>Streams</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.impl.DcaeDataBusImpl#getLocations <em>Locations</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.impl.DcaeDataBusImpl#getMrClusters <em>Mr Clusters</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.impl.DcaeDataBusImpl#getDrNodes <em>Dr Nodes</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/DcaePlatformControllerImpl.java b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/DcaePlatformControllerImpl.java
index 6827e84..1ce55c0 100644
--- a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/DcaePlatformControllerImpl.java
+++ b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/impl/DcaePlatformControllerImpl.java
@@ -26,6 +26,7 @@ package org.openecomp.dcae.controller.platform.controller.impl;
 import org.openecomp.dcae.controller.core.service.DcaeLocation;
 import org.openecomp.dcae.controller.core.service.DcaeService;
 import org.openecomp.dcae.controller.core.service.DcaeServiceDescriptor;
+import org.openecomp.dcae.controller.inventory.DcaeInventory;
 import org.openecomp.dcae.controller.platform.controller.ControllerCluster;
 import org.openecomp.dcae.controller.platform.controller.ControllerPackage;
 import org.openecomp.dcae.controller.platform.controller.DcaeDataBus;
@@ -62,6 +63,7 @@ import org.json.JSONObject;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.impl.DcaePlatformControllerImpl#getConfiguration <em>Configuration</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.impl.DcaePlatformControllerImpl#getComponent <em>Component</em>}</li>
@@ -69,12 +71,12 @@ import org.json.JSONObject;
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.impl.DcaePlatformControllerImpl#getOpenstack <em>Openstack</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.impl.DcaePlatformControllerImpl#getLocations <em>Locations</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.impl.DcaePlatformControllerImpl#getDatabus <em>Databus</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.platform.controller.impl.DcaePlatformControllerImpl#getInventory <em>Inventory</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.impl.DcaePlatformControllerImpl#getDescriptors <em>Descriptors</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.impl.DcaePlatformControllerImpl#getServices <em>Services</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.impl.DcaePlatformControllerImpl#getUsers <em>Users</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.platform.controller.impl.DcaePlatformControllerImpl#getAdminUsers <em>Admin Users</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -140,6 +142,16 @@ public class DcaePlatformControllerImpl extends SouthBoundApiWithProxyImpl imple
 	protected DcaeDataBus databus;
 
 	/**
+	 * The cached value of the '{@link #getInventory() <em>Inventory</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getInventory()
+	 * @generated
+	 * @ordered
+	 */
+	protected DcaeInventory inventory;
+
+	/**
 	 * The cached value of the '{@link #getDescriptors() <em>Descriptors</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -430,6 +442,49 @@ public class DcaePlatformControllerImpl extends SouthBoundApiWithProxyImpl imple
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public DcaeInventory getInventory() {
+		return inventory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetInventory(DcaeInventory newInventory, NotificationChain msgs) {
+		DcaeInventory oldInventory = inventory;
+		inventory = newInventory;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ControllerPackage.DCAE_PLATFORM_CONTROLLER__INVENTORY, oldInventory, newInventory);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setInventory(DcaeInventory newInventory) {
+		if (newInventory != inventory) {
+			NotificationChain msgs = null;
+			if (inventory != null)
+				msgs = ((InternalEObject)inventory).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ControllerPackage.DCAE_PLATFORM_CONTROLLER__INVENTORY, null, msgs);
+			if (newInventory != null)
+				msgs = ((InternalEObject)newInventory).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ControllerPackage.DCAE_PLATFORM_CONTROLLER__INVENTORY, null, msgs);
+			msgs = basicSetInventory(newInventory, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ControllerPackage.DCAE_PLATFORM_CONTROLLER__INVENTORY, newInventory, newInventory));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EList<DcaeService> getServices() {
 		if (services == null) {
 			services = new EObjectContainmentEList<DcaeService>(DcaeService.class, this, ControllerPackage.DCAE_PLATFORM_CONTROLLER__SERVICES);
@@ -581,6 +636,8 @@ public class DcaePlatformControllerImpl extends SouthBoundApiWithProxyImpl imple
 				return ((InternalEList<?>)getLocations()).basicRemove(otherEnd, msgs);
 			case ControllerPackage.DCAE_PLATFORM_CONTROLLER__DATABUS:
 				return basicSetDatabus(null, msgs);
+			case ControllerPackage.DCAE_PLATFORM_CONTROLLER__INVENTORY:
+				return basicSetInventory(null, msgs);
 			case ControllerPackage.DCAE_PLATFORM_CONTROLLER__DESCRIPTORS:
 				return ((InternalEList<?>)getDescriptors()).basicRemove(otherEnd, msgs);
 			case ControllerPackage.DCAE_PLATFORM_CONTROLLER__SERVICES:
@@ -611,6 +668,8 @@ public class DcaePlatformControllerImpl extends SouthBoundApiWithProxyImpl imple
 				return getLocations();
 			case ControllerPackage.DCAE_PLATFORM_CONTROLLER__DATABUS:
 				return getDatabus();
+			case ControllerPackage.DCAE_PLATFORM_CONTROLLER__INVENTORY:
+				return getInventory();
 			case ControllerPackage.DCAE_PLATFORM_CONTROLLER__DESCRIPTORS:
 				return getDescriptors();
 			case ControllerPackage.DCAE_PLATFORM_CONTROLLER__SERVICES:
@@ -651,6 +710,9 @@ public class DcaePlatformControllerImpl extends SouthBoundApiWithProxyImpl imple
 			case ControllerPackage.DCAE_PLATFORM_CONTROLLER__DATABUS:
 				setDatabus((DcaeDataBus)newValue);
 				return;
+			case ControllerPackage.DCAE_PLATFORM_CONTROLLER__INVENTORY:
+				setInventory((DcaeInventory)newValue);
+				return;
 			case ControllerPackage.DCAE_PLATFORM_CONTROLLER__DESCRIPTORS:
 				getDescriptors().clear();
 				getDescriptors().addAll((Collection<? extends DcaeServiceDescriptor>)newValue);
@@ -697,6 +759,9 @@ public class DcaePlatformControllerImpl extends SouthBoundApiWithProxyImpl imple
 			case ControllerPackage.DCAE_PLATFORM_CONTROLLER__DATABUS:
 				setDatabus((DcaeDataBus)null);
 				return;
+			case ControllerPackage.DCAE_PLATFORM_CONTROLLER__INVENTORY:
+				setInventory((DcaeInventory)null);
+				return;
 			case ControllerPackage.DCAE_PLATFORM_CONTROLLER__DESCRIPTORS:
 				getDescriptors().clear();
 				return;
@@ -733,6 +798,8 @@ public class DcaePlatformControllerImpl extends SouthBoundApiWithProxyImpl imple
 				return locations != null && !locations.isEmpty();
 			case ControllerPackage.DCAE_PLATFORM_CONTROLLER__DATABUS:
 				return databus != null;
+			case ControllerPackage.DCAE_PLATFORM_CONTROLLER__INVENTORY:
+				return inventory != null;
 			case ControllerPackage.DCAE_PLATFORM_CONTROLLER__DESCRIPTORS:
 				return descriptors != null && !descriptors.isEmpty();
 			case ControllerPackage.DCAE_PLATFORM_CONTROLLER__SERVICES:
diff --git a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/util/ControllerSwitch.java b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/util/ControllerSwitch.java
index cb46d3c..8cc5859 100644
--- a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/util/ControllerSwitch.java
+++ b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore-gen/org/openecomp/dcae/controller/platform/controller/util/ControllerSwitch.java
@@ -75,7 +75,7 @@ public class ControllerSwitch<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
 	 */
diff --git a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore/controller.xcore b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore/controller.xcore
index 7b243b0..be7cc35 100644
--- a/dcae-controller-core/dcae-controller-platform-model/src/main/xcore/controller.xcore
+++ b/dcae-controller-core/dcae-controller-platform-model/src/main/xcore/controller.xcore
@@ -38,13 +38,15 @@ import org.openecomp.dcae.controller.core.server.DcaeBasicServer
 import org.openecomp.dcae.controller.core.stream.DatabusLocation

 import org.openecomp.dcae.controller.core.stream.DatabusMessageRouterCluster

 import org.openecomp.dcae.controller.core.stream.DatabusDataRouterNode

-import org.openecomp.dcae.controller.service.vm.VirtualMachineService   

+import org.openecomp.dcae.controller.service.vm.VirtualMachineService

+import org.openecomp.dcae.controller.inventory.DcaeInventory  

 

 class DcaePlatformController extends SouthBoundApiWithProxy, AbstractManagementServer {   

 	contains ControllerCluster cluster

 	contains OpenStackController openstack

 	contains unordered DcaeLocation[] locations

-	contains DcaeDataBus databus

+	contains DcaeDataBus databus
+	contains DcaeInventory inventory

 	contains unordered DcaeServiceDescriptor[] descriptors

 	contains unordered DcaeService[] services

 	contains unordered User[] users