21 files changed, 1702 insertions, 78 deletions

diff --git a/dcae-controller-core/dcae-controller-platform-server/.gitignore b/dcae-controller-core/dcae-controller-platform-server/.gitignore
index eefdc10..eea9273 100644
--- a/dcae-controller-core/dcae-controller-platform-server/.gitignore
+++ b/dcae-controller-core/dcae-controller-platform-server/.gitignore
@@ -1,3 +1,6 @@
 /target/
 .*.sw?
 /config/
+/test-config/
+/debug-logs/
+/logs/
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/server/tools/Generator.java b/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/server/tools/Generator.java
index 4cba375..7bd72b4 100644
--- a/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/server/tools/Generator.java
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/server/tools/Generator.java
@@ -27,10 +27,11 @@ import org.eclipse.emf.ecore.EPackage;
 import org.openecomp.ncomp.sirius.manager.controllermodel.ControllerModel;

 import org.openecomp.ncomp.sirius.manager.controllermodel.ControllermodelFactory;

 import org.openecomp.ncomp.sirius.manager.generator.ControllerGenerator;

-import org.openecomp.ncomp.gwt.siriusportal.model.*;

+import org.openecomp.ncomp.gwt.siriusportal.model.*;
+import org.openecomp.dcae.controller.inventory.InventoryFactory;
 import org.openecomp.dcae.controller.platform.controller.ControllerFactory;

 import org.openecomp.dcae.controller.service.vm.VmFactory;

-import org.openecomp.utils.YamlToJava;

+import org.openecomp.utils.YamlToJava;  

 

 

 public class Generator {

@@ -58,6 +59,8 @@ public class Generator {
 		g.addApi("cluster", cluster, m, false, true);

 		EObject cont = ControllerFactory.eINSTANCE.createControllerVirtualMachineService();

 		g.addApi("cont", cont, m, false, true);

+		EObject inventory = InventoryFactory.eINSTANCE.createDcaeInventory();
+		g.addObject("inventory",inventory,m);
 		EObject gui = ModelFactory.eINSTANCE.createGuiClientApi();

 		g.addObject("gui",gui,m);

 		g.addAlias("/test");

@@ -74,6 +77,8 @@ public class Generator {
 		YamlToJava.convert("src/main/sirius-gen/ControllerVirtualMachineService.yaml", dir + "/logging", pName);

 		String pName1 = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix() +".gui.logging";

 		YamlToJava.convert("src/main/sirius-gen/GuiClientApi.yaml", dir + "/gui/logging", pName1);

+		String pName2 = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix() +".inventory.logging";
+		YamlToJava.convert("src/main/sirius-gen/DcaeInventory.yaml", dir + "/inventory/logging", pName2);
 	}

 

 

diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerProvider.java b/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerProvider.java
index 24ce479..fe8a37f 100644
--- a/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerProvider.java
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerProvider.java
@@ -18,7 +18,7 @@
  * limitations under the License.
  * ============LICENSE_END============================================
  */
-	
+
 package org.openecomp.dcae.controller.platform.servers.controller;
 
 import java.io.BufferedReader;
@@ -37,6 +37,7 @@ import java.util.Properties;
 import org.apache.log4j.Logger;
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.json.JSONArray;
@@ -62,10 +63,12 @@ import org.openecomp.dcae.controller.core.stream.DcaeStream;
 import org.openecomp.dcae.controller.core.stream.DmaapStream;
 import org.openecomp.dcae.controller.core.stream.StreamAuthentication;
 import org.openecomp.dcae.controller.core.stream.StreamFactory;
+import org.openecomp.dcae.controller.inventory.DcaeInventory;
 import org.openecomp.dcae.controller.platform.controller.ControllerPackage;
 import org.openecomp.dcae.controller.platform.controller.DcaeDataBus;
 import org.openecomp.dcae.controller.platform.controller.DcaePlatformController;
 import org.openecomp.dcae.controller.platform.controller.ServerRole;
+import org.openecomp.dcae.controller.platform.servers.controller.inventory.DcaeInventoryFactory;
 import org.openecomp.dcae.controller.platform.servers.controller.logging.DcaeControllerMessageEnum;
 import org.openecomp.dcae.controller.platform.servers.controller.logging.DcaeControllerOperationEnum;
 import org.openecomp.dcae.controller.service.cdap.CdapService;
@@ -170,7 +173,8 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 							System.out.println("PPPPPPPPPPP polling start");
 							for (DcaeService s : o.getServices()) {
 								for (DcaeServiceInstance i : instances(s)) {
-									System.out.println("PPPPPPPPPPP updateObjectUsingPolicy list: " + s.getName() + "/" + i.getName());
+									System.out.println("PPPPPPPPPPP updateObjectUsingPolicy list: " + s.getName() + "/"
+											+ i.getName());
 									if (i.getStatus() != DeploymentStatus.DEPLOYED)
 										continue;
 									EList<DcaePolicyEntity> l = findPolicyEnabledObjects(i);
@@ -249,6 +253,51 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 		};
 		t3.start();
 
+		Thread t4 = new Thread("inventory polling") {
+			@Override
+			public void run() {
+				while (true) {
+					try {
+						switch (o.getCluster().getRole()) {
+						case MASTER:
+						case UNKNOWN:
+						case STANDALONE:
+							ecomplogger.setOperation(DcaeControllerOperationEnum.INVENTORY_POLLING);
+							ecomplogger.newRequestId();
+							ecomplogger.setInstanceId(controller, o);
+							ecomplogger.recordAuditEventStart();
+							try {
+								DcaeInventory inv = o.getInventory();
+								if (inv == null) {
+									inv = new DcaeInventoryFactory(controller).createDcaeInventory();
+									o.setInventory(inv);
+								}
+								inv.poll();
+								ecomplogger.recordAuditEventEnd();
+							} catch (Exception e) {
+								ecomplogger.warn(DcaeControllerMessageEnum.INVENTORY_POLLING_FAILED, e.toString());
+								ManagementServerUtils.printStackTrace(e);
+								ecomplogger.recordAuditEventEnd(StatusCodeEnum.ERROR);
+							}
+							break;
+						case SLAVE:
+							break;
+						}
+						Thread.sleep(1 * 60000); // sleep 1 minutes
+					} catch (Exception e) {
+						ManagementServerUtils.printStackTrace(e);
+						logger.fatal("health checks: " + e);
+						try {
+							Thread.sleep(30000);
+						} catch (InterruptedException e1) {
+						}
+					}
+				}
+			}
+
+		};
+		t4.start();
+
 	}
 
 	protected void updateDatabusInformation() {
@@ -321,17 +370,17 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 				if (i.getStatus() == DeploymentStatus.DEPLOYED && !before.equals(after)) {
 					try {
 						s.pushManagerConfiguration(i.getName());
-						okay = true; 
+						okay = true;
 					} catch (Exception e) {
 						logger.warn("Unable to push configuration: " + ManagementServer.object2ref(i));
 						e.printStackTrace();
 					}
-				} 
-				else {
+				} else {
 					okay = true;
 				}
-				if (! okay && !before.equals(after)) {
-					// need to restore previous state so next attempt will be made.
+				if (!okay && !before.equals(after)) {
+					// need to restore previous state so next attempt will be
+					// made.
 					i.getInputStreams().clear();
 					i.getInputStreams().addAll(in);
 					i.getOutputStreams().clear();
@@ -375,7 +424,7 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 		json2.put("dmaapName", client.props.get("databus.dmaapName"));
 		json2.put("drProvUrl", client.props.get("databus.drProvUrl"));
 		json2.put("version", "1");
-		json2.put("topicNsRoot", client.props.getProperty("databus.topicNsRoot","org.openecomp.dcae.dmaap"));
+		json2.put("topicNsRoot", client.props.getProperty("databus.topicNsRoot", "org.openecomp.dcae.dmaap"));
 		json2.put("bridgeAdminTopic", "DCAE_MM_AGENT");
 		try {
 			client.httpJsonTransaction("/webapi/dmaap", "PUT", headers, json2);
@@ -459,8 +508,9 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 					if (!(s2 instanceof DatabusStreamFeed))
 						continue;
 					DatabusStreamFeed feed2 = (DatabusStreamFeed) s2;
-					if (feed2.getPublishURL() == null) continue;
-					if (! feed2.getPublishURL().equals(sub.getDeliveryURL())) {
+					if (feed2.getPublishURL() == null)
+						continue;
+					if (!feed2.getPublishURL().equals(sub.getDeliveryURL())) {
 						System.err.println("FEED: forward URL wrong: " + feed.getName() + " " + sub.getDeliveryURL()
 								+ " != " + feed2.getPublishURL());
 						o.refreshDataBus(feed.getName());
@@ -736,8 +786,7 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 			if (topic.getFqtn() != null) {
 				try {
 					client.httpJsonTransaction("/webapi/topics/" + topic.getFqtn(), "DELETE", headers, null);
-				}
-				catch (Exception e) {
+				} catch (Exception e) {
 					System.err.println("TOPIC0: delete existing topic: " + topicName + " " + e);
 				}
 				System.err.println("TOPIC0: delete existing topic: " + topicName);
@@ -816,8 +865,7 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 
 	public static void main(String[] args) throws IOException {
 		server = new ManagementServer();
-		JSONObject json = JsonUtils
-				.file2json("CONFIG/controller-gen/resources/databus.json");
+		JSONObject json = JsonUtils.file2json("CONFIG/controller-gen/resources/databus.json");
 		DcaeDataBus d = (DcaeDataBus) server.json2ecore(ControllerPackage.eINSTANCE.getDcaeDataBus(), json);
 		databusPoll(d);
 		for (DatabusStream stream : d.getStreams()) {
@@ -932,6 +980,10 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 			logger.warn("No Policy Endpoint configured");
 			return;
 		}
+		EAnnotation anno = o2.eClass().getEAnnotation("http://openecomp.org/policy");
+		String matchingType = "policy-name";
+		if (anno != null && anno.getDetails().get("matchingType") != null)
+			matchingType = anno.getDetails().get("matchingType");
 		HashMap<String, String> headers = new HashMap<String, String>();
 		JSONObject json = new JSONObject();
 		headers.put("ClientAuth", client.props.getProperty("policy.clientAuth"));
@@ -941,59 +993,89 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 		String uuid = ManagementServer.object2ref(o2).toLowerCase();
 		String pName = o2.getPolicyName();
 		String matchPolicyName = pName;
-		json2.put("uuid", uuid);
-		json.put("policyName", matchPolicyName);
-		JSONObject res = client.httpJsonTransaction("/getConfig", "POST", headers, json);
-		System.out.println("PPPPPPPPPPP 0: " + uuid);
-		JSONArray a = res.getJSONArray("$list");
+		System.out.println("PPPPPPPPPPP 0: match type=" + matchingType);
+		JSONArray a = null;
+		switch (matchingType) {
+		case "policy-name":
+			json.put("policyName", matchPolicyName);
+			JSONObject res = client.httpJsonTransaction("/getConfig", "POST", headers, json);
+			a = res.getJSONArray("$list");
+			break;
+		case "uuid-path":
+			// ONAP R1
+			for (Object k : client.props.keySet()) {
+				String key = (String) k;
+				if (key.startsWith("policy.substitution.")) {
+					uuid = uuid.replace(key.substring(20), client.props.getProperty(key));
+				}
+			}
+			json2.put("uuid", uuid);
+			json.put("policyName", ".*");
+			JSONObject res1 = client.httpJsonTransaction("/PyPDPServer/getConfig", "POST", headers, json);
+			System.out.println("PPPPPPPPPPP 0: uuid=" + uuid);
+			JSONArray a1 = res1.getJSONArray("$list");
+			a = new JSONArray();
+			for (int j = 0; j < a1.length(); j++) {
+				JSONObject c1 = a1.getJSONObject(j);
+				JSONObject newConfig;
+				try {
+					newConfig = new JSONObject(c1.getString("config"));
+				} catch (Exception e) {
+					System.out.println("PPPPPPPPPPP 1.1: " + c1.toString(2));
+					continue;
+				}
+				if (!uuid.equals(newConfig.getString("uuid").toLowerCase()))
+					continue;
+				a.put(c1);
+			}
+		}
+
 		switch (a.length()) {
-		case 0: 
+		case 0:
 			System.out.println("PPPPPPPPPPP 0 no policies: " + matchPolicyName + " " + uuid);
 			return;
-		case 1: break;
+		case 1:
+			break;
 		default:
 			System.out.println("PPPPPPPPPPP 0 too many policies: " + matchPolicyName + " " + uuid + " " + a.length());
 			return;
 		}
-		for (int j = 0; j < a.length(); j++) {
-			JSONObject c1 = a.getJSONObject(j);
-			JSONObject newConfig;
-			try {
-				newConfig = new JSONObject(c1.getString("config"));
-			} catch (Exception e) {
-				System.out.println("PPPPPPPPPPP 1: " + c1.toString(2));
-				continue;
-			}
-			System.out.println("PPPPPPPPPPP 2: " + newConfig.toString(2) + " uuid:" + newConfig.get("uuid"));
-//			if (!uuid.equals(newConfig.getString("uuid").toLowerCase()))
-//				continue;
-			JSONObject content = new JSONObject(newConfig.getString("content"));
-			System.out.println("PPPPPPPPPPP 3: " + content.toString(2));
-			content.put("policyDescription", newConfig.getString("description"));
-			content.put("policyConfigName", newConfig.getString("configName"));
-			content.put("policyTemplateVersion", newConfig.getString("templateVersion"));
-			content.put("policyVersion", newConfig.getString("version"));
-			content.put("policyPriority", newConfig.getString("priority"));
-			content.put("policyScope", newConfig.getString("policyScope"));
-			System.out.println("PPPPPPPPPPP 4: " + content.toString(2));
-			ManagementServer server = controller.getServer();
-			EObject oo = server.json2ecore(o2.eClass(), content);
-			// System.out.println("PPPPPPPPPPP 4_1: " +
-			// ManagementServer.ecore2json(oo, 1000, null, true).toString(2));
-			JSONObject before = cleanJson(o2);
-			ManagementServer.merge(o2, oo, content, true, null);
-			o2.setPolicyName(pName);
-			JSONObject after = cleanJson(o2);
-			ManagementServer.ecore2json(o2, 1000, null, true);
-			if (!before.toString(2).equals(after.toString(2))) {
-				System.out.println("PPPPPPPPPPP configuration change 5: " + ManagementServer.object2ref(i) + " using: " +  c1.getString("policyName"));
-				System.out.println("PPPPPPPPPPP before: " + before.toString(2));
-				System.out.println("PPPPPPPPPPP after: " + after.toString(2));
-				s.pushManagerConfiguration(i.getName());
-			}
+		JSONObject c1 = a.getJSONObject(0);
+		JSONObject newConfig;
+		try {
+			newConfig = new JSONObject(c1.getString("config"));
+		} catch (Exception e) {
+			System.out.println("PPPPPPPPPPP 1: " + c1.toString(2));
 			return;
 		}
-		System.out.println("PPPPPPPPPPP ERROR no policy found: " + uuid);
+		System.out.println("PPPPPPPPPPP 2: " + newConfig.toString(2) + " uuid:" + newConfig.get("uuid"));
+		// if (!uuid.equals(newConfig.getString("uuid").toLowerCase()))
+		// continue;
+		JSONObject content = new JSONObject(newConfig.getString("content"));
+		System.out.println("PPPPPPPPPPP 3: " + content.toString(2));
+		content.put("policyDescription", newConfig.getString("description"));
+		content.put("policyConfigName", newConfig.getString("configName"));
+		content.put("policyTemplateVersion", newConfig.getString("templateVersion"));
+		content.put("policyVersion", newConfig.getString("version"));
+		content.put("policyPriority", newConfig.getString("priority"));
+		content.put("policyScope", newConfig.getString("policyScope"));
+		System.out.println("PPPPPPPPPPP 4: " + content.toString(2));
+		ManagementServer server = controller.getServer();
+		EObject oo = server.json2ecore(o2.eClass(), content);
+		// System.out.println("PPPPPPPPPPP 4_1: " +
+		// ManagementServer.ecore2json(oo, 1000, null, true).toString(2));
+		JSONObject before = cleanJson(o2);
+		ManagementServer.merge(o2, oo, content, true, null);
+		o2.setPolicyName(pName);
+		JSONObject after = cleanJson(o2);
+		ManagementServer.ecore2json(o2, 1000, null, true);
+		if (!before.toString(2).equals(after.toString(2))) {
+			System.out.println("PPPPPPPPPPP configuration change 5: " + ManagementServer.object2ref(i) + " using: "
+					+ c1.getString("policyName"));
+			System.out.println("PPPPPPPPPPP before: " + before.toString(2));
+			System.out.println("PPPPPPPPPPP after: " + after.toString(2));
+			s.pushManagerConfiguration(i.getName());
+		}
 	}
 
 	private JSONObject cleanJson(EObject o2) {
@@ -1115,7 +1197,8 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 		}
 	}
 
-	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context, String clientVersion) {
+	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context,
+			String clientVersion) {
 		// System.err.println("XXXXXX handleJson: " + action + " " +
 		// resourcePath + " " + context);
 		switch ((String) context.get("path")) {
@@ -1141,8 +1224,8 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 	}
 
 	public void refreshDataBus(String nameMatch) {
-		System.err.println("BBBBBBBBB: numberOfErrors=" + numberOfErrors + " tooMany=" + tooMany + " nameMatch="
-				+ nameMatch);
+		System.err.println(
+				"BBBBBBBBB: numberOfErrors=" + numberOfErrors + " tooMany=" + tooMany + " nameMatch=" + nameMatch);
 		numberOfErrors = 0;
 		for (DatabusStream s : o.getDatabus().getStreams()) {
 			if (nameMatch != null && !s.getName().matches(nameMatch))
@@ -1151,8 +1234,8 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 				DatabusStreamFeed f = (DatabusStreamFeed) s;
 				if (f.getFeedName() == null)
 					continue;
-				System.err.println("BBBBBBBBB: feed change to null " + ManagementServer.object2ref(s) + " "
-						+ f.getFeedName());
+				System.err.println(
+						"BBBBBBBBB: feed change to null " + ManagementServer.object2ref(s) + " " + f.getFeedName());
 				f.setFeedName(null);
 				for (DatabusStreamFeedPublisher c : f.getPublishers()) {
 					c.setFeedId(null);
@@ -1170,8 +1253,8 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 				DatabusStreamTopic t = (DatabusStreamTopic) s;
 				if (t.getTopicName() == null)
 					continue;
-				System.err.println("BBBBBBBBB: topic change to null " + ManagementServer.object2ref(s) + " "
-						+ t.getTopicName());
+				System.err.println(
+						"BBBBBBBBB: topic change to null " + ManagementServer.object2ref(s) + " " + t.getTopicName());
 				t.setTopicName(null);
 				for (DatabusStreamTopicClient c : t.getClients()) {
 					c.setTopicURL(null);
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryProvider.java b/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryProvider.java
new file mode 100644
index 0000000..ba6f379
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryProvider.java
@@ -0,0 +1,234 @@
+
+/*-
+ * ============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============================================
+ */
+
+package org.openecomp.dcae.controller.platform.servers.controller.inventory;
+
+import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+import org.openecomp.ncomp.sirius.manager.JavaHttpClient;
+import org.openecomp.ncomp.sirius.manager.ManagementServer;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.mvel2.optimizers.impl.refl.nodes.ArrayLength;
+import org.openecomp.ncomp.sirius.manager.BasicAdaptorProvider;
+
+import org.openecomp.dcae.controller.inventory.ApiResponseMessage;
+import org.openecomp.dcae.controller.inventory.DCAEService;
+import org.openecomp.dcae.controller.inventory.DCAEServiceGroupByResults;
+import org.openecomp.dcae.controller.inventory.DCAEServiceRequest;
+import org.openecomp.dcae.controller.inventory.DCAEServiceType;
+import org.openecomp.dcae.controller.inventory.DCAEServiceTypeRequest;
+import org.openecomp.dcae.controller.inventory.DcaeInventory;
+import org.openecomp.dcae.controller.inventory.DcaeServiceTypeResults;
+import org.openecomp.dcae.controller.inventory.InventoryPackage;
+import org.openecomp.dcae.controller.inventory.Link;
+import org.openecomp.dcae.controller.inventory.DcaeServiceResults;
+
+public class DcaeDcaeInventoryProvider extends BasicAdaptorProvider {
+	private static final Logger logger = Logger.getLogger(DcaeDcaeInventoryProvider.class);
+	DcaeInventory o;
+	DcaeInventoryFactory f;
+
+	public DcaeDcaeInventoryProvider(ISiriusServer controller, DcaeInventory o) {
+		super(controller, o);
+		f = new DcaeInventoryFactory(controller);
+		this.o = o;
+	}
+
+	public DcaeServiceTypeResults getDcaeServiceTypes(String typeName, Boolean onlyLatest, Boolean onlyActive,
+			String vnfType, String serviceId, String serviceLocation, String asdcServiceId, String asdcResourceId,
+			Integer offset) {
+		DcaeServiceTypeResults res = f.createDcaeServiceTypeResults();
+		JavaHttpClient client = new JavaHttpClient("controller.properties", "inventory");
+		HashMap<String, String> headers = new HashMap<String, String>();
+		HashMap<String, String> query = new HashMap<String, String>();
+		// TODO handle parameters, but for now only use is complete dump
+		addQuery(query,"offset", offset);
+		JSONObject json = client.httpJsonTransaction("/dcae-service-types" + queryUrl(query), "GET", headers, null);
+		System.err.println(json.toString(2));
+		JSONArray items = json.getJSONArray("items");
+		for (int i = 0; i < items.length(); i++) {
+			JSONObject item = items.getJSONObject(i);
+			item.put("name", item.getString("typeId"));
+			fixCreated(item);
+		}
+		nullClean(json);
+		EClass c = InventoryPackage.eINSTANCE.getDcaeServiceTypeResults();
+		res = (DcaeServiceTypeResults) controller.getServer().json2ecore(c, json);
+		System.out.println(ManagementServer.ecore2json(res, 1000, null, true).toString(2));
+		return res;
+	}
+
+	public ApiResponseMessage deleteDcaeServiceTypesType(String typeId) {
+		ApiResponseMessage res = null;
+		// TODO IMPLEMENT
+		throw new UnsupportedOperationException();
+	}
+
+	public DCAEServiceType getDcaeServiceTypesType(String typeId) {
+		DCAEServiceType res = null;
+		// TODO IMPLEMENT
+		throw new UnsupportedOperationException();
+	}
+
+	public DCAEServiceType createDcaeServiceTypesTypeName(DCAEServiceTypeRequest body) {
+		DCAEServiceType res = null;
+		// TODO IMPLEMENT
+		throw new UnsupportedOperationException();
+	}
+
+	public DcaeServiceResults getDcaeServices(String typeId, String vnfId, String vnfType, String vnfLocation,
+			String componentType, Boolean shareable, String created, Integer offset) {
+		DcaeServiceResults res = f.createDcaeServiceResults();
+		JavaHttpClient client = new JavaHttpClient("controller.properties", "inventory");
+		HashMap<String, String> headers = new HashMap<String, String>();
+		HashMap<String, String> query = new HashMap<String, String>();
+		// TODO handle parameters, but for now only use is complete dump
+		addQuery(query,"offset", offset);
+		JSONObject json = client.httpJsonTransaction("/dcae-services" + queryUrl(query), "GET", headers, null);
+		System.err.println(json.toString(2));
+		JSONArray items = json.getJSONArray("items");
+		for (int i = 0; i < items.length(); i++) {
+			JSONObject item = items.getJSONObject(i);
+			item.put("name", item.getString("serviceId"));
+			fixCreated(item);
+			JSONArray components = item.getJSONArray("components");
+			for (int j = 0; j < components.length(); j++) {
+				JSONObject component = components.getJSONObject(j);
+				fixCreated(component);
+				component.put("name", component.getString("componentId"));
+			}
+		}
+		nullClean(json);
+		EClass c = InventoryPackage.eINSTANCE.getDcaeServiceResults();
+		res = (DcaeServiceResults) controller.getServer().json2ecore(c, json);
+		System.out.println(ManagementServer.ecore2json(res, 1000, null, true).toString(2));
+		return res;
+	}
+
+	private String queryUrl(HashMap<String, String> query) {
+		if (query.size() == 0) return "";
+		StringBuffer b = new StringBuffer();
+		boolean first = true;
+		for (String k : query.keySet()) {
+			b.append(first ? "?" : "&");
+			first = false;
+			b.append(k).append("=").append(query.get(k));
+		}
+		return b.toString();
+	}
+
+	private void addQuery(HashMap<String, String> query, String k, Object v) {
+		if (v != null) query.put(k, v.toString());
+	}
+
+	private void nullClean(Object json) {
+		if (json instanceof JSONObject) {
+			JSONObject o = (JSONObject) json;
+			List<String> delete = new ArrayList<String>();
+			for (Iterator<String> iterator = o.keys(); iterator.hasNext();) {
+				String key = (String) iterator.next();
+				Object o1 = o.get(key);
+				if (o1.equals(null)) {
+					delete.add(key);
+					continue;
+				}
+				nullClean(o1);
+			}
+			for (String key : delete) {
+				o.remove(key);
+			}
+		}
+		if (json instanceof JSONArray) {
+			JSONArray a = (JSONArray) json;
+			for (int i = 0; i < a.length(); i++) {
+				Object o1 = a.get(i);
+				nullClean(o1);
+			}
+		}
+	}
+
+	private void fixCreated(JSONObject j) {
+		if (j.has("created")) {
+			j.put("created1",j.get("created"));
+			j.remove("created");
+		}
+	}
+
+	public DCAEServiceGroupByResults getDcaeServicesGroupbyPropertyName(String propertyName) {
+		DCAEServiceGroupByResults res = null;
+		// TODO IMPLEMENT
+		throw new UnsupportedOperationException();
+	}
+
+	public void deleteDcaeServicesService(String serviceId) {
+
+		// TODO IMPLEMENT
+		throw new UnsupportedOperationException();
+	}
+
+	public DCAEService getDcaeServicesService(String serviceId) {
+		DCAEService res = null;
+		// TODO IMPLEMENT
+		throw new UnsupportedOperationException();
+	}
+
+	public DCAEService createDcaeServicesService(String serviceId, DCAEServiceRequest body) {
+		DCAEService res = null;
+		// TODO IMPLEMENT
+		throw new UnsupportedOperationException();
+	}
+
+	public void poll() {
+		o.getServices().clear();
+		int offset = 0;
+		while (offset != -1) {
+			DcaeServiceResults s = o.getDcaeServices(null, null, null, null, null, null, null, offset);
+			o.getServices().addAll(s.getItems());
+			offset = offset(s.getLinks());
+		}
+		o.getServiceTypes().clear();
+		offset = 0;
+		while (offset != -1) {
+			DcaeServiceTypeResults s = o.getDcaeServiceTypes(null, null, null, null, null, null, null, null, null);
+			o.getServiceTypes().addAll(s.getItems());
+			offset = offset(s.getLinks());
+		}
+		System.out.println(ManagementServer.ecore2json(o, 1000, null, true).toString(2));
+	}
+
+	private int offset(EList<Link> links) {
+		for (Link l : links) {
+			if ("nextLink".equals(l.getName())) {
+				return Integer.parseInt(l.getHref().split("=")[1]);
+			}
+		}
+		return -1;
+	}
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryTest.java b/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryTest.java
new file mode 100644
index 0000000..0ad21dd
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryTest.java
@@ -0,0 +1,23 @@
+package org.openecomp.dcae.controller.platform.servers.controller.inventory;
+
+import org.openecomp.dcae.controller.inventory.DcaeInventory;
+import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+import org.openecomp.ncomp.sirius.manager.ManagementServer;
+
+public class DcaeDcaeInventoryTest implements ISiriusServer {
+
+	public static void main(String[] args) {
+		DcaeDcaeInventoryTest server = new DcaeDcaeInventoryTest();
+		DcaeInventoryFactory f = new DcaeInventoryFactory(server);
+		DcaeInventory inv = f.createDcaeInventory();
+		inv.poll();
+	}
+
+	private ManagementServer server = new ManagementServer();
+
+	@Override
+	public ManagementServer getServer() {
+		return server;
+	}
+
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/resources/DcaeController.yaml b/dcae-controller-core/dcae-controller-platform-server/src/main/resources/DcaeController.yaml
index 432a2a1..b88bd4d 100644
--- a/dcae-controller-core/dcae-controller-platform-server/src/main/resources/DcaeController.yaml
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/resources/DcaeController.yaml
@@ -5,6 +5,8 @@ operations:
     description: Polling of new configuration from ECOMP Policy for all DCAE service instances.
   DATABUS_POLLING:
     description: Polling of new configuration from DCAE Data Bus Controller.
+  INVENTORY_POLLING:
+    description: Polling of new configuration from DCAE Inventory.
   CLUSTER_DATA_REPLICATION:
     description: Data replication from master to slave controllers.
 messages:
@@ -26,6 +28,14 @@ messages:
         description: Exception that happened.
     resolution: Contact Tier 4. This is a software bug.
     description: Police Polling on the service level fails.
+  INVENTORY-POLLING-FAILED:
+    errorCode: 5001W
+    messageFormat: '{0}'
+    parameters:
+      exception: 
+        description: Exception that happened.
+    resolution: Contact Tier 4. This is a software bug.
+    description: INVENTORY Polling on the service level fails.   
   DATABUS-POLLING-FAILED:
     errorCode: 5001W
     messageFormat: '{0}'
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/server/scripts/rackspace-substitute.groovy b/dcae-controller-core/dcae-controller-platform-server/src/main/server/scripts/rackspace-substitute.groovy
index dd545b8..855e151 100644
--- a/dcae-controller-core/dcae-controller-platform-server/src/main/server/scripts/rackspace-substitute.groovy
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/server/scripts/rackspace-substitute.groovy
@@ -50,17 +50,6 @@ def m = yaml.load(f.text)
 
 if (m['POLICY-IP'] == null) m['POLICY-IP'] = "10.0.6.1"
 
-def i = m["DCAE-VERSION"].lastIndexOf(".")
-
-if (m['DCAE-VERSION'].contains("SNAPSHOT")) {
-	m['DOCKER-VERSION'] = "${m["DCAE-VERSION"].substring(0,i)}-SNAPSHOT-latest"
-}
-else {
-	m['DOCKER-VERSION'] = "${m["DCAE-VERSION"].substring(0,i)}-STAGING-latest"
-}
-
-println "m['DOCKER-VERSION'] = ${m['DOCKER-VERSION']}"
-
 fromDir.eachFileRecurse (FileType.FILES) { file ->
 	def ofile = new File(file.toString().replace(options.from, options.to))
 	switch (file.name) {
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/DcaeInventory.yaml b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/DcaeInventory.yaml
new file mode 100644
index 0000000..6584d46
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/DcaeInventory.yaml
@@ -0,0 +1,93 @@
+operations:
+  DcaeInventory@getDcaeServiceTypes: {}
+  DcaeInventory@deleteDcaeServiceTypesType: {}
+  DcaeInventory@getDcaeServiceTypesType: {}
+  DcaeInventory@createDcaeServiceTypesTypeName: {}
+  DcaeInventory@getDcaeServices: {}
+  DcaeInventory@getDcaeServicesGroupbyPropertyName: {}
+  DcaeInventory@deleteDcaeServicesService: {}
+  DcaeInventory@getDcaeServicesService: {}
+  DcaeInventory@createDcaeServicesService: {}
+  DcaeInventory@poll: {}
+messages:
+  dummy: {}
+  REQUEST-FAILED-getDcaeServiceTypes:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REQUEST-FAILED-deleteDcaeServiceTypesType:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REQUEST-FAILED-getDcaeServiceTypesType:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REQUEST-FAILED-createDcaeServiceTypesTypeName:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REQUEST-FAILED-getDcaeServices:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REQUEST-FAILED-getDcaeServicesGroupbyPropertyName:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REQUEST-FAILED-deleteDcaeServicesService:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REQUEST-FAILED-getDcaeServicesService:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REQUEST-FAILED-createDcaeServicesService:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REQUEST-FAILED-poll:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REMOTE-CALL-FAILED-getDcaeServiceTypes:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-deleteDcaeServiceTypesType:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-getDcaeServiceTypesType:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-createDcaeServiceTypesTypeName:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-getDcaeServices:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-getDcaeServicesGroupbyPropertyName:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-deleteDcaeServicesService:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-getDcaeServicesService:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-createDcaeServicesService:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-poll:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerConsole.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerConsole.java
index 0ad6540..6a838b2 100644
--- a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerConsole.java
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerConsole.java
@@ -33,6 +33,8 @@ import org.openecomp.ncomp.sirius.manager.ManagementServerError;
 
     
 
+import org.openecomp.dcae.controller.platform.servers.controller.inventory.DcaeDcaeInventoryConsole;       
+
 import org.openecomp.dcae.controller.platform.servers.controller.gui.DcaeGuiClientApiConsole;   
 
 
@@ -43,6 +45,7 @@ public class DcaeDcaePlatformControllerConsole extends Console {
     
         DcaeControllerClusterConsole cluster;       
         DcaeControllerVirtualMachineServiceConsole cont;       
+        DcaeDcaeInventoryConsole inventory;       
         DcaeGuiClientApiConsole gui;   
 
 
@@ -53,6 +56,7 @@ public class DcaeDcaePlatformControllerConsole extends Console {
     
             cluster = new  DcaeControllerClusterConsole(filename,name);       
             cont = new  DcaeControllerVirtualMachineServiceConsole(filename,name);       
+            inventory = new  DcaeDcaeInventoryConsole(filename,name);       
             gui = new  DcaeGuiClientApiConsole(filename,name);   
     }
     
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerServer.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerServer.java
index a8f99eb..e8f5040 100644
--- a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerServer.java
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerServer.java
@@ -45,6 +45,8 @@ import org.openecomp.dcae.controller.platform.servers.controller.DcaeControllerF
     
 import org.openecomp.dcae.controller.platform.servers.controller.DcaeControllerFactory;
     
+import org.openecomp.dcae.controller.platform.servers.controller.inventory.DcaeInventoryFactory;
+    
 import org.openecomp.dcae.controller.platform.servers.controller.gui.DcaeModelFactory;
 
 
@@ -68,6 +70,9 @@ public class DcaeDcaePlatformControllerServer implements ISiriusServer, IRequest
     String contPath;
     ManagementServer contServer;
     
+    String inventoryPath;
+    ManagementServer inventoryServer;
+    
     String guiPath;
     ManagementServer guiServer;
 
@@ -102,6 +107,12 @@ public class DcaeDcaePlatformControllerServer implements ISiriusServer, IRequest
 
 
     
+		EFactory inventoryFactory = new DcaeInventoryFactory(this);
+		inventoryPath = serverPath + "/inventory";
+		inventoryServer = new ManagementServer(inventoryFactory, "DcaeInventory", inventoryPath, "inventory.properties");
+		inventoryServer.start();
+		webServer.add("/inventory",inventoryServer);
+    
 		EFactory guiFactory = new DcaeModelFactory(this);
 		guiPath = serverPath + "/gui";
 		guiServer = new ManagementServer(guiFactory, "GuiClientApi", guiPath, "gui.properties");
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventory.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventory.java
new file mode 100644
index 0000000..3d41661
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventory.java
@@ -0,0 +1,368 @@
+
+/*-
+ * ============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============================================
+ */
+	
+// Autogenerated
+// Do not edit. No need to extend this class.
+package org.openecomp.dcae.controller.platform.servers.controller.inventory;
+
+
+
+
+
+import java.io.InputStream;
+
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
+import org.openecomp.ncomp.sirius.manager.ISwaggerHandler;
+import org.openecomp.ncomp.sirius.manager.ISiriusPlugin;
+import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+import org.openecomp.ncomp.sirius.manager.ISiriusProvider;
+import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.SwaggerUtils;
+import org.openecomp.ncomp.sirius.function.FunctionUtils;
+import org.openecomp.ncomp.component.ApiRequestStatus;
+
+import org.apache.log4j.Logger;
+
+import org.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.json.JSONObject;
+
+import java.util.Date;
+
+import org.openecomp.dcae.controller.platform.servers.controller.inventory.logging.DcaeInventoryOperationEnum;
+import org.openecomp.dcae.controller.platform.servers.controller.inventory.logging.DcaeInventoryMessageEnum;
+
+
+
+
+import org.openecomp.dcae.controller.inventory.impl.DcaeInventoryImpl;
+
+
+
+public class DcaeDcaeInventory extends DcaeInventoryImpl implements ISiriusProvider {
+	public static final Logger logger = Logger.getLogger(DcaeDcaeInventory.class);
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
+	public DcaeDcaeInventoryProvider controller;
+	ISiriusServer server;
+
+	public DcaeDcaeInventory(ISiriusServer server) {
+		this.server = server;
+		this.controller = new DcaeDcaeInventoryProvider(server,this);
+	}
+
+	public org.openecomp.dcae.controller.inventory.DcaeServiceTypeResults getDcaeServiceTypes(java.lang.String typeName, java.lang.Boolean onlyLatest, java.lang.Boolean onlyActive, java.lang.String vnfType, java.lang.String serviceId, java.lang.String serviceLocation, java.lang.String asdcServiceId, java.lang.String asdcResourceId, java.lang.Integer offset) {
+		org.openecomp.dcae.controller.inventory.DcaeServiceTypeResults res = null;
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "getDcaeServiceTypes", ApiRequestStatus.START, duration_,typeName,onlyLatest,onlyActive,vnfType,serviceId,serviceLocation,asdcServiceId,asdcResourceId,offset);
+		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(DcaeInventoryOperationEnum.DcaeInventory_getDcaeServiceTypes,server,this);
+		ecomplogger.recordMetricEventStart(DcaeInventoryOperationEnum.DcaeInventory_getDcaeServiceTypes,"self:" + ManagementServer.object2ref(this));
+		try {
+			res =  controller.getDcaeServiceTypes(typeName,onlyLatest,onlyActive,vnfType,serviceId,serviceLocation,asdcServiceId,asdcResourceId,offset);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "getDcaeServiceTypes", ApiRequestStatus.ERROR, duration_,typeName,onlyLatest,onlyActive,vnfType,serviceId,serviceLocation,asdcServiceId,asdcResourceId,offset);
+			System.err.println("ERROR: " + e);
+			ecomplogger.warn(DcaeInventoryMessageEnum.REQUEST_FAILED_getDcaeServiceTypes, e.toString());
+			EcompException e1 =  EcompException.create(DcaeInventoryMessageEnum.REQUEST_FAILED_getDcaeServiceTypes,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DcaeInventoryMessageEnum.REQUEST_FAILED_getDcaeServiceTypes, e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "getDcaeServiceTypes", ApiRequestStatus.OKAY, duration_,typeName,onlyLatest,onlyActive,vnfType,serviceId,serviceLocation,asdcServiceId,asdcResourceId,offset);
+		return res;
+	}
+
+	public org.openecomp.dcae.controller.inventory.ApiResponseMessage deleteDcaeServiceTypesType(java.lang.String typeId) {
+		org.openecomp.dcae.controller.inventory.ApiResponseMessage res = null;
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "deleteDcaeServiceTypesType", ApiRequestStatus.START, duration_,typeId);
+		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(DcaeInventoryOperationEnum.DcaeInventory_deleteDcaeServiceTypesType,server,this);
+		ecomplogger.recordMetricEventStart(DcaeInventoryOperationEnum.DcaeInventory_deleteDcaeServiceTypesType,"self:" + ManagementServer.object2ref(this));
+		try {
+			res =  controller.deleteDcaeServiceTypesType(typeId);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "deleteDcaeServiceTypesType", ApiRequestStatus.ERROR, duration_,typeId);
+			System.err.println("ERROR: " + e);
+			ecomplogger.warn(DcaeInventoryMessageEnum.REQUEST_FAILED_deleteDcaeServiceTypesType, e.toString());
+			EcompException e1 =  EcompException.create(DcaeInventoryMessageEnum.REQUEST_FAILED_deleteDcaeServiceTypesType,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DcaeInventoryMessageEnum.REQUEST_FAILED_deleteDcaeServiceTypesType, e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "deleteDcaeServiceTypesType", ApiRequestStatus.OKAY, duration_,typeId);
+		return res;
+	}
+
+	public org.openecomp.dcae.controller.inventory.DCAEServiceType getDcaeServiceTypesType(java.lang.String typeId) {
+		org.openecomp.dcae.controller.inventory.DCAEServiceType res = null;
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "getDcaeServiceTypesType", ApiRequestStatus.START, duration_,typeId);
+		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(DcaeInventoryOperationEnum.DcaeInventory_getDcaeServiceTypesType,server,this);
+		ecomplogger.recordMetricEventStart(DcaeInventoryOperationEnum.DcaeInventory_getDcaeServiceTypesType,"self:" + ManagementServer.object2ref(this));
+		try {
+			res =  controller.getDcaeServiceTypesType(typeId);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "getDcaeServiceTypesType", ApiRequestStatus.ERROR, duration_,typeId);
+			System.err.println("ERROR: " + e);
+			ecomplogger.warn(DcaeInventoryMessageEnum.REQUEST_FAILED_getDcaeServiceTypesType, e.toString());
+			EcompException e1 =  EcompException.create(DcaeInventoryMessageEnum.REQUEST_FAILED_getDcaeServiceTypesType,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DcaeInventoryMessageEnum.REQUEST_FAILED_getDcaeServiceTypesType, e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "getDcaeServiceTypesType", ApiRequestStatus.OKAY, duration_,typeId);
+		return res;
+	}
+
+	public org.openecomp.dcae.controller.inventory.DCAEServiceType createDcaeServiceTypesTypeName(org.openecomp.dcae.controller.inventory.DCAEServiceTypeRequest body) {
+		org.openecomp.dcae.controller.inventory.DCAEServiceType res = null;
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "createDcaeServiceTypesTypeName", ApiRequestStatus.START, duration_,body);
+		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(DcaeInventoryOperationEnum.DcaeInventory_createDcaeServiceTypesTypeName,server,this);
+		ecomplogger.recordMetricEventStart(DcaeInventoryOperationEnum.DcaeInventory_createDcaeServiceTypesTypeName,"self:" + ManagementServer.object2ref(this));
+		try {
+			res =  controller.createDcaeServiceTypesTypeName(body);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "createDcaeServiceTypesTypeName", ApiRequestStatus.ERROR, duration_,body);
+			System.err.println("ERROR: " + e);
+			ecomplogger.warn(DcaeInventoryMessageEnum.REQUEST_FAILED_createDcaeServiceTypesTypeName, e.toString());
+			EcompException e1 =  EcompException.create(DcaeInventoryMessageEnum.REQUEST_FAILED_createDcaeServiceTypesTypeName,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DcaeInventoryMessageEnum.REQUEST_FAILED_createDcaeServiceTypesTypeName, e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "createDcaeServiceTypesTypeName", ApiRequestStatus.OKAY, duration_,body);
+		return res;
+	}
+
+	public org.openecomp.dcae.controller.inventory.DcaeServiceResults getDcaeServices(java.lang.String typeId, java.lang.String vnfId, java.lang.String vnfType, java.lang.String vnfLocation, java.lang.String componentType, java.lang.Boolean shareable, java.lang.String created, java.lang.Integer offset) {
+		org.openecomp.dcae.controller.inventory.DcaeServiceResults res = null;
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "getDcaeServices", ApiRequestStatus.START, duration_,typeId,vnfId,vnfType,vnfLocation,componentType,shareable,created,offset);
+		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(DcaeInventoryOperationEnum.DcaeInventory_getDcaeServices,server,this);
+		ecomplogger.recordMetricEventStart(DcaeInventoryOperationEnum.DcaeInventory_getDcaeServices,"self:" + ManagementServer.object2ref(this));
+		try {
+			res =  controller.getDcaeServices(typeId,vnfId,vnfType,vnfLocation,componentType,shareable,created,offset);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "getDcaeServices", ApiRequestStatus.ERROR, duration_,typeId,vnfId,vnfType,vnfLocation,componentType,shareable,created,offset);
+			System.err.println("ERROR: " + e);
+			ecomplogger.warn(DcaeInventoryMessageEnum.REQUEST_FAILED_getDcaeServices, e.toString());
+			EcompException e1 =  EcompException.create(DcaeInventoryMessageEnum.REQUEST_FAILED_getDcaeServices,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DcaeInventoryMessageEnum.REQUEST_FAILED_getDcaeServices, e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "getDcaeServices", ApiRequestStatus.OKAY, duration_,typeId,vnfId,vnfType,vnfLocation,componentType,shareable,created,offset);
+		return res;
+	}
+
+	public org.openecomp.dcae.controller.inventory.DCAEServiceGroupByResults getDcaeServicesGroupbyPropertyName(java.lang.String propertyName) {
+		org.openecomp.dcae.controller.inventory.DCAEServiceGroupByResults res = null;
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "getDcaeServicesGroupbyPropertyName", ApiRequestStatus.START, duration_,propertyName);
+		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(DcaeInventoryOperationEnum.DcaeInventory_getDcaeServicesGroupbyPropertyName,server,this);
+		ecomplogger.recordMetricEventStart(DcaeInventoryOperationEnum.DcaeInventory_getDcaeServicesGroupbyPropertyName,"self:" + ManagementServer.object2ref(this));
+		try {
+			res =  controller.getDcaeServicesGroupbyPropertyName(propertyName);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "getDcaeServicesGroupbyPropertyName", ApiRequestStatus.ERROR, duration_,propertyName);
+			System.err.println("ERROR: " + e);
+			ecomplogger.warn(DcaeInventoryMessageEnum.REQUEST_FAILED_getDcaeServicesGroupbyPropertyName, e.toString());
+			EcompException e1 =  EcompException.create(DcaeInventoryMessageEnum.REQUEST_FAILED_getDcaeServicesGroupbyPropertyName,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DcaeInventoryMessageEnum.REQUEST_FAILED_getDcaeServicesGroupbyPropertyName, e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "getDcaeServicesGroupbyPropertyName", ApiRequestStatus.OKAY, duration_,propertyName);
+		return res;
+	}
+
+	public void deleteDcaeServicesService(java.lang.String serviceId) {
+		
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "deleteDcaeServicesService", ApiRequestStatus.START, duration_,serviceId);
+		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(DcaeInventoryOperationEnum.DcaeInventory_deleteDcaeServicesService,server,this);
+		ecomplogger.recordMetricEventStart(DcaeInventoryOperationEnum.DcaeInventory_deleteDcaeServicesService,"self:" + ManagementServer.object2ref(this));
+		try {
+			 controller.deleteDcaeServicesService(serviceId);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "deleteDcaeServicesService", ApiRequestStatus.ERROR, duration_,serviceId);
+			System.err.println("ERROR: " + e);
+			ecomplogger.warn(DcaeInventoryMessageEnum.REQUEST_FAILED_deleteDcaeServicesService, e.toString());
+			EcompException e1 =  EcompException.create(DcaeInventoryMessageEnum.REQUEST_FAILED_deleteDcaeServicesService,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DcaeInventoryMessageEnum.REQUEST_FAILED_deleteDcaeServicesService, e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "deleteDcaeServicesService", ApiRequestStatus.OKAY, duration_,serviceId);
+		
+	}
+
+	public org.openecomp.dcae.controller.inventory.DCAEService getDcaeServicesService(java.lang.String serviceId) {
+		org.openecomp.dcae.controller.inventory.DCAEService res = null;
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "getDcaeServicesService", ApiRequestStatus.START, duration_,serviceId);
+		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(DcaeInventoryOperationEnum.DcaeInventory_getDcaeServicesService,server,this);
+		ecomplogger.recordMetricEventStart(DcaeInventoryOperationEnum.DcaeInventory_getDcaeServicesService,"self:" + ManagementServer.object2ref(this));
+		try {
+			res =  controller.getDcaeServicesService(serviceId);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "getDcaeServicesService", ApiRequestStatus.ERROR, duration_,serviceId);
+			System.err.println("ERROR: " + e);
+			ecomplogger.warn(DcaeInventoryMessageEnum.REQUEST_FAILED_getDcaeServicesService, e.toString());
+			EcompException e1 =  EcompException.create(DcaeInventoryMessageEnum.REQUEST_FAILED_getDcaeServicesService,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DcaeInventoryMessageEnum.REQUEST_FAILED_getDcaeServicesService, e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "getDcaeServicesService", ApiRequestStatus.OKAY, duration_,serviceId);
+		return res;
+	}
+
+	public org.openecomp.dcae.controller.inventory.DCAEService createDcaeServicesService(java.lang.String serviceId, org.openecomp.dcae.controller.inventory.DCAEServiceRequest body) {
+		org.openecomp.dcae.controller.inventory.DCAEService res = null;
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "createDcaeServicesService", ApiRequestStatus.START, duration_,serviceId,body);
+		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(DcaeInventoryOperationEnum.DcaeInventory_createDcaeServicesService,server,this);
+		ecomplogger.recordMetricEventStart(DcaeInventoryOperationEnum.DcaeInventory_createDcaeServicesService,"self:" + ManagementServer.object2ref(this));
+		try {
+			res =  controller.createDcaeServicesService(serviceId,body);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "createDcaeServicesService", ApiRequestStatus.ERROR, duration_,serviceId,body);
+			System.err.println("ERROR: " + e);
+			ecomplogger.warn(DcaeInventoryMessageEnum.REQUEST_FAILED_createDcaeServicesService, e.toString());
+			EcompException e1 =  EcompException.create(DcaeInventoryMessageEnum.REQUEST_FAILED_createDcaeServicesService,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DcaeInventoryMessageEnum.REQUEST_FAILED_createDcaeServicesService, e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "createDcaeServicesService", ApiRequestStatus.OKAY, duration_,serviceId,body);
+		return res;
+	}
+
+	public void poll() {
+		
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "poll", ApiRequestStatus.START, duration_);
+		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(DcaeInventoryOperationEnum.DcaeInventory_poll,server,this);
+		ecomplogger.recordMetricEventStart(DcaeInventoryOperationEnum.DcaeInventory_poll,"self:" + ManagementServer.object2ref(this));
+		try {
+			 controller.poll();
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "poll", ApiRequestStatus.ERROR, duration_);
+			System.err.println("ERROR: " + e);
+			ecomplogger.warn(DcaeInventoryMessageEnum.REQUEST_FAILED_poll, e.toString());
+			EcompException e1 =  EcompException.create(DcaeInventoryMessageEnum.REQUEST_FAILED_poll,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DcaeInventoryMessageEnum.REQUEST_FAILED_poll, e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "poll", ApiRequestStatus.OKAY, duration_);
+		
+	}
+
+
+
+
+
+
+
+
+	public static void ecoreSetup() {
+		DcaeDcaeInventoryProvider.ecoreSetup();
+	}
+	public DcaeDcaeInventoryProvider getSiriusProvider() {
+		return controller;
+	}
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryClient.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryClient.java
new file mode 100644
index 0000000..7d39e55
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryClient.java
@@ -0,0 +1,258 @@
+
+/*-
+ * ============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============================================
+ */
+	
+// Autogenerated
+// Do not edit. No need to extend this class.
+package org.openecomp.dcae.controller.platform.servers.controller.inventory;
+
+import org.openecomp.ncomp.sirius.manager.AbstractClient;
+import org.openecomp.ncomp.sirius.manager.HighAvailabilityClient;
+import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
+
+import org.apache.log4j.Logger;
+
+import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+
+import org.openecomp.dcae.controller.inventory.impl.DcaeInventoryImpl;
+import org.openecomp.dcae.controller.inventory.InventoryPackage;
+import org.openecomp.dcae.controller.platform.servers.controller.inventory.logging.DcaeInventoryOperationEnum;
+import org.openecomp.dcae.controller.platform.servers.controller.inventory.logging.DcaeInventoryMessageEnum;
+
+
+import org.openecomp.dcae.controller.platform.servers.controller.DcaeDcaePlatformController; 
+
+
+
+ 
+@SuppressWarnings("unchecked")
+public class DcaeDcaeInventoryClient extends DcaeInventoryImpl {
+	public static final Logger logger = Logger.getLogger(DcaeDcaeInventoryClient.class);
+	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	public AbstractClient client;
+
+	public DcaeDcaeInventoryClient(String file, String name) {
+		DcaeDcaePlatformController.ecoreSetup(); 
+		client = new GenericHttpClient(file,name);
+		client.add("/inventory", this);
+		client.setVersion("ONAP-R2");
+	}
+
+	public DcaeDcaeInventoryClient(String file, String name1, String name2) {
+		HighAvailabilityClient client1 = new HighAvailabilityClient(file,name1,name2);
+		client = client1.all; // requests should be forwarded to all.
+		client.add("/inventory", this);
+		client.setVersion("ONAP-R2");
+	}
+	
+	public DcaeDcaeInventoryClient(AbstractClient c) {
+		client = c;
+		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
+	}
+
+
+
+	@Override
+	public org.openecomp.dcae.controller.inventory.DcaeServiceTypeResults getDcaeServiceTypes(java.lang.String typeName, java.lang.Boolean onlyLatest, java.lang.Boolean onlyActive, java.lang.String vnfType, java.lang.String serviceId, java.lang.String serviceLocation, java.lang.String asdcServiceId, java.lang.String asdcResourceId, java.lang.Integer offset) {
+		EClass c = InventoryPackage.eINSTANCE.getDcaeInventory(); 
+		ecomplogger.recordMetricEventStart(DcaeInventoryOperationEnum.DcaeInventory_getDcaeServiceTypes,client.getRemote());
+		org.openecomp.dcae.controller.inventory.DcaeServiceTypeResults res;
+		try {
+		  res = (org.openecomp.dcae.controller.inventory.DcaeServiceTypeResults) client.operationPath("/inventory", c, "getDcaeServiceTypes", null, typeName,onlyLatest,onlyActive,vnfType,serviceId,serviceLocation,asdcServiceId,asdcResourceId,offset);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_getDcaeServiceTypes, e.toString());
+			EcompException e1 = EcompException.create(DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_getDcaeServiceTypes,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_getDcaeServiceTypes,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	@Override
+	public org.openecomp.dcae.controller.inventory.ApiResponseMessage deleteDcaeServiceTypesType(java.lang.String typeId) {
+		EClass c = InventoryPackage.eINSTANCE.getDcaeInventory(); 
+		ecomplogger.recordMetricEventStart(DcaeInventoryOperationEnum.DcaeInventory_deleteDcaeServiceTypesType,client.getRemote());
+		org.openecomp.dcae.controller.inventory.ApiResponseMessage res;
+		try {
+		  res = (org.openecomp.dcae.controller.inventory.ApiResponseMessage) client.operationPath("/inventory", c, "deleteDcaeServiceTypesType", null, typeId);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_deleteDcaeServiceTypesType, e.toString());
+			EcompException e1 = EcompException.create(DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_deleteDcaeServiceTypesType,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_deleteDcaeServiceTypesType,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	@Override
+	public org.openecomp.dcae.controller.inventory.DCAEServiceType getDcaeServiceTypesType(java.lang.String typeId) {
+		EClass c = InventoryPackage.eINSTANCE.getDcaeInventory(); 
+		ecomplogger.recordMetricEventStart(DcaeInventoryOperationEnum.DcaeInventory_getDcaeServiceTypesType,client.getRemote());
+		org.openecomp.dcae.controller.inventory.DCAEServiceType res;
+		try {
+		  res = (org.openecomp.dcae.controller.inventory.DCAEServiceType) client.operationPath("/inventory", c, "getDcaeServiceTypesType", null, typeId);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_getDcaeServiceTypesType, e.toString());
+			EcompException e1 = EcompException.create(DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_getDcaeServiceTypesType,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_getDcaeServiceTypesType,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	@Override
+	public org.openecomp.dcae.controller.inventory.DCAEServiceType createDcaeServiceTypesTypeName(org.openecomp.dcae.controller.inventory.DCAEServiceTypeRequest body) {
+		EClass c = InventoryPackage.eINSTANCE.getDcaeInventory(); 
+		ecomplogger.recordMetricEventStart(DcaeInventoryOperationEnum.DcaeInventory_createDcaeServiceTypesTypeName,client.getRemote());
+		org.openecomp.dcae.controller.inventory.DCAEServiceType res;
+		try {
+		  res = (org.openecomp.dcae.controller.inventory.DCAEServiceType) client.operationPath("/inventory", c, "createDcaeServiceTypesTypeName", null, body);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_createDcaeServiceTypesTypeName, e.toString());
+			EcompException e1 = EcompException.create(DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_createDcaeServiceTypesTypeName,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_createDcaeServiceTypesTypeName,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	@Override
+	public org.openecomp.dcae.controller.inventory.DcaeServiceResults getDcaeServices(java.lang.String typeId, java.lang.String vnfId, java.lang.String vnfType, java.lang.String vnfLocation, java.lang.String componentType, java.lang.Boolean shareable, java.lang.String created, java.lang.Integer offset) {
+		EClass c = InventoryPackage.eINSTANCE.getDcaeInventory(); 
+		ecomplogger.recordMetricEventStart(DcaeInventoryOperationEnum.DcaeInventory_getDcaeServices,client.getRemote());
+		org.openecomp.dcae.controller.inventory.DcaeServiceResults res;
+		try {
+		  res = (org.openecomp.dcae.controller.inventory.DcaeServiceResults) client.operationPath("/inventory", c, "getDcaeServices", null, typeId,vnfId,vnfType,vnfLocation,componentType,shareable,created,offset);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_getDcaeServices, e.toString());
+			EcompException e1 = EcompException.create(DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_getDcaeServices,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_getDcaeServices,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	@Override
+	public org.openecomp.dcae.controller.inventory.DCAEServiceGroupByResults getDcaeServicesGroupbyPropertyName(java.lang.String propertyName) {
+		EClass c = InventoryPackage.eINSTANCE.getDcaeInventory(); 
+		ecomplogger.recordMetricEventStart(DcaeInventoryOperationEnum.DcaeInventory_getDcaeServicesGroupbyPropertyName,client.getRemote());
+		org.openecomp.dcae.controller.inventory.DCAEServiceGroupByResults res;
+		try {
+		  res = (org.openecomp.dcae.controller.inventory.DCAEServiceGroupByResults) client.operationPath("/inventory", c, "getDcaeServicesGroupbyPropertyName", null, propertyName);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_getDcaeServicesGroupbyPropertyName, e.toString());
+			EcompException e1 = EcompException.create(DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_getDcaeServicesGroupbyPropertyName,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_getDcaeServicesGroupbyPropertyName,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	@Override
+	public void deleteDcaeServicesService(java.lang.String serviceId) {
+		EClass c = InventoryPackage.eINSTANCE.getDcaeInventory(); 
+		ecomplogger.recordMetricEventStart(DcaeInventoryOperationEnum.DcaeInventory_deleteDcaeServicesService,client.getRemote());
+		
+		try {
+		  client.operationPath("/inventory", c, "deleteDcaeServicesService", null, serviceId);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_deleteDcaeServicesService, e.toString());
+			EcompException e1 = EcompException.create(DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_deleteDcaeServicesService,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_deleteDcaeServicesService,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	@Override
+	public org.openecomp.dcae.controller.inventory.DCAEService getDcaeServicesService(java.lang.String serviceId) {
+		EClass c = InventoryPackage.eINSTANCE.getDcaeInventory(); 
+		ecomplogger.recordMetricEventStart(DcaeInventoryOperationEnum.DcaeInventory_getDcaeServicesService,client.getRemote());
+		org.openecomp.dcae.controller.inventory.DCAEService res;
+		try {
+		  res = (org.openecomp.dcae.controller.inventory.DCAEService) client.operationPath("/inventory", c, "getDcaeServicesService", null, serviceId);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_getDcaeServicesService, e.toString());
+			EcompException e1 = EcompException.create(DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_getDcaeServicesService,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_getDcaeServicesService,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	@Override
+	public org.openecomp.dcae.controller.inventory.DCAEService createDcaeServicesService(java.lang.String serviceId, org.openecomp.dcae.controller.inventory.DCAEServiceRequest body) {
+		EClass c = InventoryPackage.eINSTANCE.getDcaeInventory(); 
+		ecomplogger.recordMetricEventStart(DcaeInventoryOperationEnum.DcaeInventory_createDcaeServicesService,client.getRemote());
+		org.openecomp.dcae.controller.inventory.DCAEService res;
+		try {
+		  res = (org.openecomp.dcae.controller.inventory.DCAEService) client.operationPath("/inventory", c, "createDcaeServicesService", null, serviceId,body);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_createDcaeServicesService, e.toString());
+			EcompException e1 = EcompException.create(DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_createDcaeServicesService,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_createDcaeServicesService,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	@Override
+	public void poll() {
+		EClass c = InventoryPackage.eINSTANCE.getDcaeInventory(); 
+		ecomplogger.recordMetricEventStart(DcaeInventoryOperationEnum.DcaeInventory_poll,client.getRemote());
+		
+		try {
+		  client.operationPath("/inventory", c, "poll", null);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_poll, e.toString());
+			EcompException e1 = EcompException.create(DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_poll,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_poll,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryConsole.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryConsole.java
new file mode 100644
index 0000000..6ff8ba7
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryConsole.java
@@ -0,0 +1,167 @@
+
+/*-
+ * ============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============================================
+ */
+	
+// Autogenerated
+// Do not edit but extend this class as needed
+package org.openecomp.dcae.controller.platform.servers.controller.inventory;
+
+
+import org.apache.log4j.Logger;
+import org.eclipse.emf.common.util.EList;
+
+import org.openecomp.ncomp.sirius.manager.console.Console;
+import org.openecomp.ncomp.sirius.manager.AbstractClient;
+import org.openecomp.ncomp.sirius.manager.ManagementServerError;
+
+
+
+
+public class DcaeDcaeInventoryConsole extends Console {
+	public static final Logger logger = Logger.getLogger(DcaeDcaeInventoryConsole.class);
+    protected DcaeDcaeInventoryClient controller;
+    
+
+
+
+    public DcaeDcaeInventoryConsole(String filename, String name) {
+            super(filename, name);
+            controller = new DcaeDcaeInventoryClient(filename,name);
+            client = controller.client;
+
+    }
+    
+	public DcaeDcaeInventoryConsole(AbstractClient c) {
+        controller = new DcaeDcaeInventoryClient(c);
+        client = controller.client;
+    }
+
+
+	public org.openecomp.dcae.controller.inventory.DcaeServiceTypeResults getDcaeServiceTypes(java.lang.String typeName, java.lang.Boolean onlyLatest, java.lang.Boolean onlyActive, java.lang.String vnfType, java.lang.String serviceId, java.lang.String serviceLocation, java.lang.String asdcServiceId, java.lang.String asdcResourceId, java.lang.Integer offset) {
+		org.openecomp.dcae.controller.inventory.DcaeServiceTypeResults res = null;
+		try {
+			res =  controller.getDcaeServiceTypes(typeName,onlyLatest,onlyActive,vnfType,serviceId,serviceLocation,asdcServiceId,asdcResourceId,offset);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+	public org.openecomp.dcae.controller.inventory.ApiResponseMessage deleteDcaeServiceTypesType(java.lang.String typeId) {
+		org.openecomp.dcae.controller.inventory.ApiResponseMessage res = null;
+		try {
+			res =  controller.deleteDcaeServiceTypesType(typeId);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+	public org.openecomp.dcae.controller.inventory.DCAEServiceType getDcaeServiceTypesType(java.lang.String typeId) {
+		org.openecomp.dcae.controller.inventory.DCAEServiceType res = null;
+		try {
+			res =  controller.getDcaeServiceTypesType(typeId);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+	public org.openecomp.dcae.controller.inventory.DCAEServiceType createDcaeServiceTypesTypeName(org.openecomp.dcae.controller.inventory.DCAEServiceTypeRequest body) {
+		org.openecomp.dcae.controller.inventory.DCAEServiceType res = null;
+		try {
+			res =  controller.createDcaeServiceTypesTypeName(body);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+	public org.openecomp.dcae.controller.inventory.DcaeServiceResults getDcaeServices(java.lang.String typeId, java.lang.String vnfId, java.lang.String vnfType, java.lang.String vnfLocation, java.lang.String componentType, java.lang.Boolean shareable, java.lang.String created, java.lang.Integer offset) {
+		org.openecomp.dcae.controller.inventory.DcaeServiceResults res = null;
+		try {
+			res =  controller.getDcaeServices(typeId,vnfId,vnfType,vnfLocation,componentType,shareable,created,offset);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+	public org.openecomp.dcae.controller.inventory.DCAEServiceGroupByResults getDcaeServicesGroupbyPropertyName(java.lang.String propertyName) {
+		org.openecomp.dcae.controller.inventory.DCAEServiceGroupByResults res = null;
+		try {
+			res =  controller.getDcaeServicesGroupbyPropertyName(propertyName);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+	public void deleteDcaeServicesService(java.lang.String serviceId) {
+		
+		try {
+			 controller.deleteDcaeServicesService(serviceId);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+	public org.openecomp.dcae.controller.inventory.DCAEService getDcaeServicesService(java.lang.String serviceId) {
+		org.openecomp.dcae.controller.inventory.DCAEService res = null;
+		try {
+			res =  controller.getDcaeServicesService(serviceId);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+	public org.openecomp.dcae.controller.inventory.DCAEService createDcaeServicesService(java.lang.String serviceId, org.openecomp.dcae.controller.inventory.DCAEServiceRequest body) {
+		org.openecomp.dcae.controller.inventory.DCAEService res = null;
+		try {
+			res =  controller.createDcaeServicesService(serviceId,body);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+	public void poll() {
+		
+		try {
+			 controller.poll();
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryProviderTemplate.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryProviderTemplate.java
new file mode 100644
index 0000000..bfdb66b
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryProviderTemplate.java
@@ -0,0 +1,123 @@
+
+/*-
+ * ============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============================================
+ */
+	
+
+package org.openecomp.dcae.controller.platform.servers.controller.inventory;
+
+
+
+
+
+import java.io.InputStream;
+
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
+import org.openecomp.ncomp.sirius.manager.ISiriusPlugin;
+import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+import org.openecomp.ncomp.sirius.function.FunctionUtils;
+
+import org.apache.log4j.Logger;
+import org.eclipse.emf.common.util.EList;
+import org.json.JSONObject;
+
+
+
+import org.openecomp.ncomp.sirius.manager.BasicAdaptorProvider;
+
+
+import org.openecomp.dcae.controller.inventory.impl.DcaeInventoryImpl;
+import org.openecomp.dcae.controller.inventory.DcaeInventory;
+
+
+public class DcaeDcaeInventoryProviderTemplate extends BasicAdaptorProvider {
+	private static final Logger logger = Logger.getLogger(DcaeDcaeInventoryProviderTemplate.class);
+	DcaeInventory o;
+
+	public DcaeDcaeInventoryProviderTemplate(ISiriusServer controller, DcaeInventory o) {
+		super(controller, o);
+		this.o = o;
+	}
+
+	public org.openecomp.dcae.controller.inventory.DcaeServiceTypeResults getDcaeServiceTypes(java.lang.String typeName, java.lang.Boolean onlyLatest, java.lang.Boolean onlyActive, java.lang.String vnfType, java.lang.String serviceId, java.lang.String serviceLocation, java.lang.String asdcServiceId, java.lang.String asdcResourceId, java.lang.Integer offset) {
+		org.openecomp.dcae.controller.inventory.DcaeServiceTypeResults res = null;
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public org.openecomp.dcae.controller.inventory.ApiResponseMessage deleteDcaeServiceTypesType(java.lang.String typeId) {
+		org.openecomp.dcae.controller.inventory.ApiResponseMessage res = null;
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public org.openecomp.dcae.controller.inventory.DCAEServiceType getDcaeServiceTypesType(java.lang.String typeId) {
+		org.openecomp.dcae.controller.inventory.DCAEServiceType res = null;
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public org.openecomp.dcae.controller.inventory.DCAEServiceType createDcaeServiceTypesTypeName(org.openecomp.dcae.controller.inventory.DCAEServiceTypeRequest body) {
+		org.openecomp.dcae.controller.inventory.DCAEServiceType res = null;
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public org.openecomp.dcae.controller.inventory.DcaeServiceResults getDcaeServices(java.lang.String typeId, java.lang.String vnfId, java.lang.String vnfType, java.lang.String vnfLocation, java.lang.String componentType, java.lang.Boolean shareable, java.lang.String created, java.lang.Integer offset) {
+		org.openecomp.dcae.controller.inventory.DcaeServiceResults res = null;
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public org.openecomp.dcae.controller.inventory.DCAEServiceGroupByResults getDcaeServicesGroupbyPropertyName(java.lang.String propertyName) {
+		org.openecomp.dcae.controller.inventory.DCAEServiceGroupByResults res = null;
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public void deleteDcaeServicesService(java.lang.String serviceId) {
+		
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public org.openecomp.dcae.controller.inventory.DCAEService getDcaeServicesService(java.lang.String serviceId) {
+		org.openecomp.dcae.controller.inventory.DCAEService res = null;
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public org.openecomp.dcae.controller.inventory.DCAEService createDcaeServicesService(java.lang.String serviceId, org.openecomp.dcae.controller.inventory.DCAEServiceRequest body) {
+		org.openecomp.dcae.controller.inventory.DCAEService res = null;
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public void poll() {
+		
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+
+
+
+
+	
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeInventoryFactory.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeInventoryFactory.java
new file mode 100644
index 0000000..2967515
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeInventoryFactory.java
@@ -0,0 +1,54 @@
+
+/*-
+ * ============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============================================
+ */
+	
+// Autogenerated
+// Do not edit. No need to extend this class.
+package org.openecomp.dcae.controller.platform.servers.controller.inventory;
+
+import org.eclipse.emf.ecore.EPackage;
+import org.apache.log4j.Logger;
+
+import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+
+import org.openecomp.dcae.controller.inventory.DcaeInventory;
+import org.openecomp.dcae.controller.inventory.InventoryPackage;
+import org.openecomp.dcae.controller.inventory.impl.InventoryFactoryImpl;
+
+import org.openecomp.dcae.controller.platform.servers.controller.DcaeDcaePlatformControllerServer; 
+
+
+
+public class DcaeInventoryFactory extends InventoryFactoryImpl {
+	public static final Logger logger = Logger.getLogger(DcaeInventoryFactory.class);
+	ISiriusServer server = null;
+	@Override
+	public EPackage getEPackage() { return InventoryPackage.eINSTANCE; }
+	public DcaeInventoryFactory(ISiriusServer server) {
+		this.server = server;
+	}
+	@Override
+	public DcaeInventory createDcaeInventory() {
+		return new DcaeDcaeInventory(server);
+	}
+	
+	
+
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/logging/DcaeInventory.properties b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/logging/DcaeInventory.properties
new file mode 100644
index 0000000..911d8ac
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/logging/DcaeInventory.properties
@@ -0,0 +1,126 @@
+
+dummy=\
+  dummy-null|\
+  null|\
+  null|\
+  null
+
+REQUEST_FAILED_getDcaeServiceTypes=\
+  REQUEST-FAILED-getDcaeServiceTypes-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_deleteDcaeServiceTypesType=\
+  REQUEST-FAILED-deleteDcaeServiceTypesType-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_getDcaeServiceTypesType=\
+  REQUEST-FAILED-getDcaeServiceTypesType-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_createDcaeServiceTypesTypeName=\
+  REQUEST-FAILED-createDcaeServiceTypesTypeName-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_getDcaeServices=\
+  REQUEST-FAILED-getDcaeServices-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_getDcaeServicesGroupbyPropertyName=\
+  REQUEST-FAILED-getDcaeServicesGroupbyPropertyName-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_deleteDcaeServicesService=\
+  REQUEST-FAILED-deleteDcaeServicesService-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_getDcaeServicesService=\
+  REQUEST-FAILED-getDcaeServicesService-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_createDcaeServicesService=\
+  REQUEST-FAILED-createDcaeServicesService-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_poll=\
+  REQUEST-FAILED-poll-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REMOTE_CALL_FAILED_getDcaeServiceTypes=\
+  REMOTE-CALL-FAILED-getDcaeServiceTypes-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_deleteDcaeServiceTypesType=\
+  REMOTE-CALL-FAILED-deleteDcaeServiceTypesType-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_getDcaeServiceTypesType=\
+  REMOTE-CALL-FAILED-getDcaeServiceTypesType-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_createDcaeServiceTypesTypeName=\
+  REMOTE-CALL-FAILED-createDcaeServiceTypesTypeName-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_getDcaeServices=\
+  REMOTE-CALL-FAILED-getDcaeServices-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_getDcaeServicesGroupbyPropertyName=\
+  REMOTE-CALL-FAILED-getDcaeServicesGroupbyPropertyName-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_deleteDcaeServicesService=\
+  REMOTE-CALL-FAILED-deleteDcaeServicesService-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_getDcaeServicesService=\
+  REMOTE-CALL-FAILED-getDcaeServicesService-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_createDcaeServicesService=\
+  REMOTE-CALL-FAILED-createDcaeServicesService-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_poll=\
+  REMOTE-CALL-FAILED-poll-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/logging/DcaeInventoryMessageEnum.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/logging/DcaeInventoryMessageEnum.java
new file mode 100644
index 0000000..460ac99
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/logging/DcaeInventoryMessageEnum.java
@@ -0,0 +1,34 @@
+
+package org.openecomp.dcae.controller.platform.servers.controller.inventory.logging;
+
+import com.att.eelf.i18n.EELFResourceManager;
+import org.openecomp.logger.EcompMessageEnum;
+
+public enum DcaeInventoryMessageEnum implements EcompMessageEnum {
+
+  dummy,
+  REQUEST_FAILED_getDcaeServiceTypes,
+  REQUEST_FAILED_deleteDcaeServiceTypesType,
+  REQUEST_FAILED_getDcaeServiceTypesType,
+  REQUEST_FAILED_createDcaeServiceTypesTypeName,
+  REQUEST_FAILED_getDcaeServices,
+  REQUEST_FAILED_getDcaeServicesGroupbyPropertyName,
+  REQUEST_FAILED_deleteDcaeServicesService,
+  REQUEST_FAILED_getDcaeServicesService,
+  REQUEST_FAILED_createDcaeServicesService,
+  REQUEST_FAILED_poll,
+  REMOTE_CALL_FAILED_getDcaeServiceTypes,
+  REMOTE_CALL_FAILED_deleteDcaeServiceTypesType,
+  REMOTE_CALL_FAILED_getDcaeServiceTypesType,
+  REMOTE_CALL_FAILED_createDcaeServiceTypesTypeName,
+  REMOTE_CALL_FAILED_getDcaeServices,
+  REMOTE_CALL_FAILED_getDcaeServicesGroupbyPropertyName,
+  REMOTE_CALL_FAILED_deleteDcaeServicesService,
+  REMOTE_CALL_FAILED_getDcaeServicesService,
+  REMOTE_CALL_FAILED_createDcaeServicesService,
+  REMOTE_CALL_FAILED_poll;
+
+	static {
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/platform/servers/controller/inventory/logging/DcaeInventory");
+	}
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/logging/DcaeInventoryOperationEnum.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/logging/DcaeInventoryOperationEnum.java
new file mode 100644
index 0000000..920dfb4
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/logging/DcaeInventoryOperationEnum.java
@@ -0,0 +1,31 @@
+
+package org.openecomp.dcae.controller.platform.servers.controller.inventory.logging;
+
+import org.openecomp.entity.EcompOperationEnum;
+
+public enum DcaeInventoryOperationEnum implements EcompOperationEnum {
+
+  DcaeInventory_getDcaeServiceTypes("DcaeInventory@getDcaeServiceTypes"),
+  DcaeInventory_deleteDcaeServiceTypesType("DcaeInventory@deleteDcaeServiceTypesType"),
+  DcaeInventory_getDcaeServiceTypesType("DcaeInventory@getDcaeServiceTypesType"),
+  DcaeInventory_createDcaeServiceTypesTypeName("DcaeInventory@createDcaeServiceTypesTypeName"),
+  DcaeInventory_getDcaeServices("DcaeInventory@getDcaeServices"),
+  DcaeInventory_getDcaeServicesGroupbyPropertyName("DcaeInventory@getDcaeServicesGroupbyPropertyName"),
+  DcaeInventory_deleteDcaeServicesService("DcaeInventory@deleteDcaeServicesService"),
+  DcaeInventory_getDcaeServicesService("DcaeInventory@getDcaeServicesService"),
+  DcaeInventory_createDcaeServicesService("DcaeInventory@createDcaeServicesService"),
+  DcaeInventory_poll("DcaeInventory@poll") ; 
+
+
+	private String n;
+	
+	private DcaeInventoryOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaeController.properties b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaeController.properties
index 883027d..213a999 100644
--- a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaeController.properties
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaeController.properties
@@ -11,6 +11,12 @@ POLICY_POLLING_FAILED=\
   Contact Tier 4. This is a software bug.|\
   Police Polling on the service level fails.
 
+INVENTORY_POLLING_FAILED=\
+  INVENTORY-POLLING-FAILED-5001W|\
+  {0}|\
+  Contact Tier 4. This is a software bug.|\
+  INVENTORY Polling on the service level fails.
+
 DATABUS_POLLING_FAILED=\
   DATABUS-POLLING-FAILED-5001W|\
   {0}|\
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaeControllerMessageEnum.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaeControllerMessageEnum.java
index 4233931..8abcc71 100644
--- a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaeControllerMessageEnum.java
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaeControllerMessageEnum.java
@@ -8,6 +8,7 @@ public enum DcaeControllerMessageEnum implements EcompMessageEnum {
 
   HEALTHCHECK_SERVICE_FAILED,
   POLICY_POLLING_FAILED,
+  INVENTORY_POLLING_FAILED,
   DATABUS_POLLING_FAILED,
   DATABUS_UNABLE_TO_ADD_STREAM,
   CLUSTER_DATA_REPLICATION_FAILED;
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaeControllerOperationEnum.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaeControllerOperationEnum.java
index 9285d2c..6604bc8 100644
--- a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaeControllerOperationEnum.java
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaeControllerOperationEnum.java
@@ -8,6 +8,7 @@ public enum DcaeControllerOperationEnum implements EcompOperationEnum {
   HEALTHCHECK("HEALTHCHECK"),
   POLICY_POLLING("POLICY_POLLING"),
   DATABUS_POLLING("DATABUS_POLLING"),
+  INVENTORY_POLLING("INVENTORY_POLLING"),
   CLUSTER_DATA_REPLICATION("CLUSTER_DATA_REPLICATION") ;