Init dcae.controller

Change-Id: I460f09494faa84b55d9c5d54112e098b0e74d007
Signed-off-by: lj1412 <lji@research.att.com>

23 files changed, 6969 insertions, 0 deletions

diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/ControllerServiceDmaapDrsubManager.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/ControllerServiceDmaapDrsubManager.java
new file mode 100644
index 0000000..9cbd349
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/ControllerServiceDmaapDrsubManager.java
@@ -0,0 +1,42 @@
+
+/*-
+ * ============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.service.dmaap.drsub.manager;
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration;
+
+import org.openecomp.dcae.controller.service.vmmanager.VirtualMachineManager;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Controller Service Dmaap Drsub Manager</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.openecomp.dcae.controller.service.dmaap.drsub.manager.ManagerPackage#getControllerServiceDmaapDrsubManager()
+ * @model
+ * @generated
+ */
+public interface ControllerServiceDmaapDrsubManager extends VirtualMachineManager, ControllerServiceDmaapDrsubServiceConfiguration {
+
+} // ControllerServiceDmaapDrsubManager
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/ManagerFactory.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/ManagerFactory.java
new file mode 100644
index 0000000..a15b406
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/ManagerFactory.java
@@ -0,0 +1,63 @@
+
+/*-
+ * ============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.service.dmaap.drsub.manager;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.service.dmaap.drsub.manager.ManagerPackage
+ * @generated
+ */
+public interface ManagerFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	ManagerFactory eINSTANCE = org.openecomp.dcae.controller.service.dmaap.drsub.manager.impl.ManagerFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Controller Service Dmaap Drsub Manager</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Controller Service Dmaap Drsub Manager</em>'.
+	 * @generated
+	 */
+	ControllerServiceDmaapDrsubManager createControllerServiceDmaapDrsubManager();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	ManagerPackage getManagerPackage();
+
+} //ManagerFactory
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/ManagerPackage.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/ManagerPackage.java
new file mode 100644
index 0000000..6330d56
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/ManagerPackage.java
@@ -0,0 +1,433 @@
+
+/*-
+ * ============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.service.dmaap.drsub.manager;
+
+import org.openecomp.dcae.controller.service.vmmanager.VmmanagerPackage;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.service.dmaap.drsub.manager.ManagerFactory
+ * @model kind="package"
+ *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen' basePackage='org.openecomp.dcae.controller.service.dmaap.drsub'"
+ * @generated
+ */
+public interface ManagerPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "manager";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "org.openecomp.dcae.controller.service.dmaap.drsub.manager";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "manager";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	ManagerPackage eINSTANCE = org.openecomp.dcae.controller.service.dmaap.drsub.manager.impl.ManagerPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.dmaap.drsub.manager.impl.ControllerServiceDmaapDrsubManagerImpl <em>Controller Service Dmaap Drsub Manager</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.manager.impl.ControllerServiceDmaapDrsubManagerImpl
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.manager.impl.ManagerPackageImpl#getControllerServiceDmaapDrsubManager()
+	 * @generated
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER = 0;
+
+	/**
+	 * The feature id for the '<em><b>Input Streams</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__INPUT_STREAMS = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER__INPUT_STREAMS;
+
+	/**
+	 * The feature id for the '<em><b>Output Streams</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__OUTPUT_STREAMS = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER__OUTPUT_STREAMS;
+
+	/**
+	 * The feature id for the '<em><b>Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__CONFIGURATION = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER__CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Component</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__COMPONENT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER__COMPONENT;
+
+	/**
+	 * The feature id for the '<em><b>Cdap Url</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__CDAP_URL = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Number Of Cdap Records</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__NUMBER_OF_CDAP_RECORDS = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Number Of Cdap Errors</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__NUMBER_OF_CDAP_ERRORS = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Hdfs Uri</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_URI = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Hdfs Uri Descr</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_URI_DESCR = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Hdfs Persist Loc</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_PERSIST_LOC = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Hdfs Persist Loc Descr</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_PERSIST_LOC_DESCR = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_FEATURE_COUNT + 6;
+
+	/**
+	 * The feature id for the '<em><b>Dmaap Conf File</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_CONF_FILE = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_FEATURE_COUNT + 7;
+
+	/**
+	 * The feature id for the '<em><b>Dmaap Conf File Descr</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_CONF_FILE_DESCR = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_FEATURE_COUNT + 8;
+
+	/**
+	 * The feature id for the '<em><b>Dmaap Streamid</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_STREAMID = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_FEATURE_COUNT + 9;
+
+	/**
+	 * The feature id for the '<em><b>Dmaap Streamid Descr</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_STREAMID_DESCR = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_FEATURE_COUNT + 10;
+
+	/**
+	 * The number of structural features of the '<em>Controller Service Dmaap Drsub Manager</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER_FEATURE_COUNT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_FEATURE_COUNT + 11;
+
+	/**
+	 * The operation id for the '<em>Test</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER___TEST = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER___TEST;
+
+	/**
+	 * The operation id for the '<em>Suspend</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER___SUSPEND = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER___SUSPEND;
+
+	/**
+	 * The operation id for the '<em>Resume</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER___RESUME = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER___RESUME;
+
+	/**
+	 * The operation id for the '<em>Public Key</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER___PUBLIC_KEY = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER___PUBLIC_KEY;
+
+	/**
+	 * The operation id for the '<em>Configuration Changed</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER___CONFIGURATION_CHANGED = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER___CONFIGURATION_CHANGED;
+
+	/**
+	 * The operation id for the '<em>Update Streams</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER___UPDATE_STREAMS__ELIST_ELIST = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER___UPDATE_STREAMS__ELIST_ELIST;
+
+	/**
+	 * The operation id for the '<em>Logs</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER___LOGS__JSONOBJECT_ELIST = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER___LOGS__JSONOBJECT_ELIST;
+
+	/**
+	 * The operation id for the '<em>Metrics</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER___METRICS__JSONOBJECT_ELIST = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER___METRICS__JSONOBJECT_ELIST;
+
+	/**
+	 * The operation id for the '<em>Properties</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER___PROPERTIES__JSONOBJECT_ELIST = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER___PROPERTIES__JSONOBJECT_ELIST;
+
+	/**
+	 * The operation id for the '<em>Upload Info</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER___UPLOAD_INFO__JSONOBJECT_ELIST = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER___UPLOAD_INFO__JSONOBJECT_ELIST;
+
+	/**
+	 * The operation id for the '<em>Get Values</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER___GET_VALUES__JSONOBJECT_STRING_LONG_LONG_METRICVALUEOPTION_BOOLEAN = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER___GET_VALUES__JSONOBJECT_STRING_LONG_LONG_METRICVALUEOPTION_BOOLEAN;
+
+	/**
+	 * The operation id for the '<em>Get Values All</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER___GET_VALUES_ALL__JSONOBJECT_STRING_ELIST_LONG_LONG_METRICVALUEOPTION_BOOLEAN = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER___GET_VALUES_ALL__JSONOBJECT_STRING_ELIST_LONG_LONG_METRICVALUEOPTION_BOOLEAN;
+
+	/**
+	 * The operation id for the '<em>Get Messages</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER___GET_MESSAGES__JSONOBJECT_STRING_LONG_LONG = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER___GET_MESSAGES__JSONOBJECT_STRING_LONG_LONG;
+
+	/**
+	 * The operation id for the '<em>Get Request Logger</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER___GET_REQUEST_LOGGER__STRING_STRING_STRING_JSONOBJECT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER___GET_REQUEST_LOGGER__STRING_STRING_STRING_JSONOBJECT;
+
+	/**
+	 * The operation id for the '<em>Evaluate</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER___EVALUATE__STRING_FUNCTION = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER___EVALUATE__STRING_FUNCTION;
+
+	/**
+	 * The operation id for the '<em>Update</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER___UPDATE__STRING_FUNCTION = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER___UPDATE__STRING_FUNCTION;
+
+	/**
+	 * The number of operations of the '<em>Controller Service Dmaap Drsub Manager</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER_OPERATION_COUNT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 0;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.dmaap.drsub.manager.ControllerServiceDmaapDrsubManager <em>Controller Service Dmaap Drsub Manager</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Controller Service Dmaap Drsub Manager</em>'.
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.manager.ControllerServiceDmaapDrsubManager
+	 * @generated
+	 */
+	EClass getControllerServiceDmaapDrsubManager();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	ManagerFactory getManagerFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each operation of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.dmaap.drsub.manager.impl.ControllerServiceDmaapDrsubManagerImpl <em>Controller Service Dmaap Drsub Manager</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.dmaap.drsub.manager.impl.ControllerServiceDmaapDrsubManagerImpl
+		 * @see org.openecomp.dcae.controller.service.dmaap.drsub.manager.impl.ManagerPackageImpl#getControllerServiceDmaapDrsubManager()
+		 * @generated
+		 */
+		EClass CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER = eINSTANCE.getControllerServiceDmaapDrsubManager();
+
+	}
+
+} //ManagerPackage
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/impl/ControllerServiceDmaapDrsubManagerImpl.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/impl/ControllerServiceDmaapDrsubManagerImpl.java
new file mode 100644
index 0000000..e5a7ffb
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/impl/ControllerServiceDmaapDrsubManagerImpl.java
@@ -0,0 +1,777 @@
+
+/*-
+ * ============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.service.dmaap.drsub.manager.impl;
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.manager.ControllerServiceDmaapDrsubManager;
+import org.openecomp.dcae.controller.service.dmaap.drsub.manager.ManagerPackage;
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration;
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage;
+import org.openecomp.dcae.controller.service.vmmanager.impl.VirtualMachineManagerImpl;
+import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Controller Service Dmaap Drsub Manager</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.manager.impl.ControllerServiceDmaapDrsubManagerImpl#getCdapUrl <em>Cdap Url</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.manager.impl.ControllerServiceDmaapDrsubManagerImpl#getNumberOfCdapRecords <em>Number Of Cdap Records</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.manager.impl.ControllerServiceDmaapDrsubManagerImpl#getNumberOfCdapErrors <em>Number Of Cdap Errors</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.manager.impl.ControllerServiceDmaapDrsubManagerImpl#getHdfsUri <em>Hdfs Uri</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.manager.impl.ControllerServiceDmaapDrsubManagerImpl#getHdfsUriDescr <em>Hdfs Uri Descr</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.manager.impl.ControllerServiceDmaapDrsubManagerImpl#getHdfsPersistLoc <em>Hdfs Persist Loc</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.manager.impl.ControllerServiceDmaapDrsubManagerImpl#getHdfsPersistLocDescr <em>Hdfs Persist Loc Descr</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.manager.impl.ControllerServiceDmaapDrsubManagerImpl#getDmaapConfFile <em>Dmaap Conf File</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.manager.impl.ControllerServiceDmaapDrsubManagerImpl#getDmaapConfFileDescr <em>Dmaap Conf File Descr</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.manager.impl.ControllerServiceDmaapDrsubManagerImpl#getDmaapStreamid <em>Dmaap Streamid</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.manager.impl.ControllerServiceDmaapDrsubManagerImpl#getDmaapStreamidDescr <em>Dmaap Streamid Descr</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ControllerServiceDmaapDrsubManagerImpl extends VirtualMachineManagerImpl implements ControllerServiceDmaapDrsubManager {
+	/**
+	 * The default value of the '{@link #getCdapUrl() <em>Cdap Url</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCdapUrl()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String CDAP_URL_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getCdapUrl() <em>Cdap Url</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCdapUrl()
+	 * @generated
+	 * @ordered
+	 */
+	protected String cdapUrl = CDAP_URL_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getNumberOfCdapRecords() <em>Number Of Cdap Records</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getNumberOfCdapRecords()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final IncreasingULongMetricAttribute NUMBER_OF_CDAP_RECORDS_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getNumberOfCdapRecords() <em>Number Of Cdap Records</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getNumberOfCdapRecords()
+	 * @generated
+	 * @ordered
+	 */
+	protected IncreasingULongMetricAttribute numberOfCdapRecords = NUMBER_OF_CDAP_RECORDS_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getNumberOfCdapErrors() <em>Number Of Cdap Errors</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getNumberOfCdapErrors()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final IncreasingULongMetricAttribute NUMBER_OF_CDAP_ERRORS_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getNumberOfCdapErrors() <em>Number Of Cdap Errors</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getNumberOfCdapErrors()
+	 * @generated
+	 * @ordered
+	 */
+	protected IncreasingULongMetricAttribute numberOfCdapErrors = NUMBER_OF_CDAP_ERRORS_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getHdfsUri() <em>Hdfs Uri</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHdfsUri()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String HDFS_URI_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getHdfsUri() <em>Hdfs Uri</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHdfsUri()
+	 * @generated
+	 * @ordered
+	 */
+	protected String hdfsUri = HDFS_URI_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getHdfsUriDescr() <em>Hdfs Uri Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHdfsUriDescr()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String HDFS_URI_DESCR_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getHdfsUriDescr() <em>Hdfs Uri Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHdfsUriDescr()
+	 * @generated
+	 * @ordered
+	 */
+	protected String hdfsUriDescr = HDFS_URI_DESCR_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getHdfsPersistLoc() <em>Hdfs Persist Loc</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHdfsPersistLoc()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String HDFS_PERSIST_LOC_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getHdfsPersistLoc() <em>Hdfs Persist Loc</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHdfsPersistLoc()
+	 * @generated
+	 * @ordered
+	 */
+	protected String hdfsPersistLoc = HDFS_PERSIST_LOC_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getHdfsPersistLocDescr() <em>Hdfs Persist Loc Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHdfsPersistLocDescr()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String HDFS_PERSIST_LOC_DESCR_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getHdfsPersistLocDescr() <em>Hdfs Persist Loc Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHdfsPersistLocDescr()
+	 * @generated
+	 * @ordered
+	 */
+	protected String hdfsPersistLocDescr = HDFS_PERSIST_LOC_DESCR_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDmaapConfFile() <em>Dmaap Conf File</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapConfFile()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DMAAP_CONF_FILE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDmaapConfFile() <em>Dmaap Conf File</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapConfFile()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dmaapConfFile = DMAAP_CONF_FILE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDmaapConfFileDescr() <em>Dmaap Conf File Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapConfFileDescr()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DMAAP_CONF_FILE_DESCR_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDmaapConfFileDescr() <em>Dmaap Conf File Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapConfFileDescr()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dmaapConfFileDescr = DMAAP_CONF_FILE_DESCR_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDmaapStreamid() <em>Dmaap Streamid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapStreamid()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DMAAP_STREAMID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDmaapStreamid() <em>Dmaap Streamid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapStreamid()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dmaapStreamid = DMAAP_STREAMID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDmaapStreamidDescr() <em>Dmaap Streamid Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapStreamidDescr()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DMAAP_STREAMID_DESCR_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDmaapStreamidDescr() <em>Dmaap Streamid Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapStreamidDescr()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dmaapStreamidDescr = DMAAP_STREAMID_DESCR_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ControllerServiceDmaapDrsubManagerImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ManagerPackage.Literals.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getCdapUrl() {
+		return cdapUrl;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCdapUrl(String newCdapUrl) {
+		String oldCdapUrl = cdapUrl;
+		cdapUrl = newCdapUrl;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__CDAP_URL, oldCdapUrl, cdapUrl));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IncreasingULongMetricAttribute getNumberOfCdapRecords() {
+		return numberOfCdapRecords;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setNumberOfCdapRecords(IncreasingULongMetricAttribute newNumberOfCdapRecords) {
+		IncreasingULongMetricAttribute oldNumberOfCdapRecords = numberOfCdapRecords;
+		numberOfCdapRecords = newNumberOfCdapRecords;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__NUMBER_OF_CDAP_RECORDS, oldNumberOfCdapRecords, numberOfCdapRecords));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IncreasingULongMetricAttribute getNumberOfCdapErrors() {
+		return numberOfCdapErrors;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setNumberOfCdapErrors(IncreasingULongMetricAttribute newNumberOfCdapErrors) {
+		IncreasingULongMetricAttribute oldNumberOfCdapErrors = numberOfCdapErrors;
+		numberOfCdapErrors = newNumberOfCdapErrors;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__NUMBER_OF_CDAP_ERRORS, oldNumberOfCdapErrors, numberOfCdapErrors));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getHdfsUri() {
+		return hdfsUri;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHdfsUri(String newHdfsUri) {
+		String oldHdfsUri = hdfsUri;
+		hdfsUri = newHdfsUri;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_URI, oldHdfsUri, hdfsUri));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getHdfsUriDescr() {
+		return hdfsUriDescr;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHdfsUriDescr(String newHdfsUriDescr) {
+		String oldHdfsUriDescr = hdfsUriDescr;
+		hdfsUriDescr = newHdfsUriDescr;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_URI_DESCR, oldHdfsUriDescr, hdfsUriDescr));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getHdfsPersistLoc() {
+		return hdfsPersistLoc;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHdfsPersistLoc(String newHdfsPersistLoc) {
+		String oldHdfsPersistLoc = hdfsPersistLoc;
+		hdfsPersistLoc = newHdfsPersistLoc;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_PERSIST_LOC, oldHdfsPersistLoc, hdfsPersistLoc));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getHdfsPersistLocDescr() {
+		return hdfsPersistLocDescr;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHdfsPersistLocDescr(String newHdfsPersistLocDescr) {
+		String oldHdfsPersistLocDescr = hdfsPersistLocDescr;
+		hdfsPersistLocDescr = newHdfsPersistLocDescr;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_PERSIST_LOC_DESCR, oldHdfsPersistLocDescr, hdfsPersistLocDescr));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDmaapConfFile() {
+		return dmaapConfFile;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDmaapConfFile(String newDmaapConfFile) {
+		String oldDmaapConfFile = dmaapConfFile;
+		dmaapConfFile = newDmaapConfFile;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_CONF_FILE, oldDmaapConfFile, dmaapConfFile));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDmaapConfFileDescr() {
+		return dmaapConfFileDescr;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDmaapConfFileDescr(String newDmaapConfFileDescr) {
+		String oldDmaapConfFileDescr = dmaapConfFileDescr;
+		dmaapConfFileDescr = newDmaapConfFileDescr;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_CONF_FILE_DESCR, oldDmaapConfFileDescr, dmaapConfFileDescr));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDmaapStreamid() {
+		return dmaapStreamid;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDmaapStreamid(String newDmaapStreamid) {
+		String oldDmaapStreamid = dmaapStreamid;
+		dmaapStreamid = newDmaapStreamid;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_STREAMID, oldDmaapStreamid, dmaapStreamid));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDmaapStreamidDescr() {
+		return dmaapStreamidDescr;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDmaapStreamidDescr(String newDmaapStreamidDescr) {
+		String oldDmaapStreamidDescr = dmaapStreamidDescr;
+		dmaapStreamidDescr = newDmaapStreamidDescr;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_STREAMID_DESCR, oldDmaapStreamidDescr, dmaapStreamidDescr));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__CDAP_URL:
+				return getCdapUrl();
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__NUMBER_OF_CDAP_RECORDS:
+				return getNumberOfCdapRecords();
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__NUMBER_OF_CDAP_ERRORS:
+				return getNumberOfCdapErrors();
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_URI:
+				return getHdfsUri();
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_URI_DESCR:
+				return getHdfsUriDescr();
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_PERSIST_LOC:
+				return getHdfsPersistLoc();
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_PERSIST_LOC_DESCR:
+				return getHdfsPersistLocDescr();
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_CONF_FILE:
+				return getDmaapConfFile();
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_CONF_FILE_DESCR:
+				return getDmaapConfFileDescr();
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_STREAMID:
+				return getDmaapStreamid();
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_STREAMID_DESCR:
+				return getDmaapStreamidDescr();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__CDAP_URL:
+				setCdapUrl((String)newValue);
+				return;
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__NUMBER_OF_CDAP_RECORDS:
+				setNumberOfCdapRecords((IncreasingULongMetricAttribute)newValue);
+				return;
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__NUMBER_OF_CDAP_ERRORS:
+				setNumberOfCdapErrors((IncreasingULongMetricAttribute)newValue);
+				return;
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_URI:
+				setHdfsUri((String)newValue);
+				return;
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_URI_DESCR:
+				setHdfsUriDescr((String)newValue);
+				return;
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_PERSIST_LOC:
+				setHdfsPersistLoc((String)newValue);
+				return;
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_PERSIST_LOC_DESCR:
+				setHdfsPersistLocDescr((String)newValue);
+				return;
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_CONF_FILE:
+				setDmaapConfFile((String)newValue);
+				return;
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_CONF_FILE_DESCR:
+				setDmaapConfFileDescr((String)newValue);
+				return;
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_STREAMID:
+				setDmaapStreamid((String)newValue);
+				return;
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_STREAMID_DESCR:
+				setDmaapStreamidDescr((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__CDAP_URL:
+				setCdapUrl(CDAP_URL_EDEFAULT);
+				return;
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__NUMBER_OF_CDAP_RECORDS:
+				setNumberOfCdapRecords(NUMBER_OF_CDAP_RECORDS_EDEFAULT);
+				return;
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__NUMBER_OF_CDAP_ERRORS:
+				setNumberOfCdapErrors(NUMBER_OF_CDAP_ERRORS_EDEFAULT);
+				return;
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_URI:
+				setHdfsUri(HDFS_URI_EDEFAULT);
+				return;
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_URI_DESCR:
+				setHdfsUriDescr(HDFS_URI_DESCR_EDEFAULT);
+				return;
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_PERSIST_LOC:
+				setHdfsPersistLoc(HDFS_PERSIST_LOC_EDEFAULT);
+				return;
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_PERSIST_LOC_DESCR:
+				setHdfsPersistLocDescr(HDFS_PERSIST_LOC_DESCR_EDEFAULT);
+				return;
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_CONF_FILE:
+				setDmaapConfFile(DMAAP_CONF_FILE_EDEFAULT);
+				return;
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_CONF_FILE_DESCR:
+				setDmaapConfFileDescr(DMAAP_CONF_FILE_DESCR_EDEFAULT);
+				return;
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_STREAMID:
+				setDmaapStreamid(DMAAP_STREAMID_EDEFAULT);
+				return;
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_STREAMID_DESCR:
+				setDmaapStreamidDescr(DMAAP_STREAMID_DESCR_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__CDAP_URL:
+				return CDAP_URL_EDEFAULT == null ? cdapUrl != null : !CDAP_URL_EDEFAULT.equals(cdapUrl);
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__NUMBER_OF_CDAP_RECORDS:
+				return NUMBER_OF_CDAP_RECORDS_EDEFAULT == null ? numberOfCdapRecords != null : !NUMBER_OF_CDAP_RECORDS_EDEFAULT.equals(numberOfCdapRecords);
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__NUMBER_OF_CDAP_ERRORS:
+				return NUMBER_OF_CDAP_ERRORS_EDEFAULT == null ? numberOfCdapErrors != null : !NUMBER_OF_CDAP_ERRORS_EDEFAULT.equals(numberOfCdapErrors);
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_URI:
+				return HDFS_URI_EDEFAULT == null ? hdfsUri != null : !HDFS_URI_EDEFAULT.equals(hdfsUri);
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_URI_DESCR:
+				return HDFS_URI_DESCR_EDEFAULT == null ? hdfsUriDescr != null : !HDFS_URI_DESCR_EDEFAULT.equals(hdfsUriDescr);
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_PERSIST_LOC:
+				return HDFS_PERSIST_LOC_EDEFAULT == null ? hdfsPersistLoc != null : !HDFS_PERSIST_LOC_EDEFAULT.equals(hdfsPersistLoc);
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_PERSIST_LOC_DESCR:
+				return HDFS_PERSIST_LOC_DESCR_EDEFAULT == null ? hdfsPersistLocDescr != null : !HDFS_PERSIST_LOC_DESCR_EDEFAULT.equals(hdfsPersistLocDescr);
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_CONF_FILE:
+				return DMAAP_CONF_FILE_EDEFAULT == null ? dmaapConfFile != null : !DMAAP_CONF_FILE_EDEFAULT.equals(dmaapConfFile);
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_CONF_FILE_DESCR:
+				return DMAAP_CONF_FILE_DESCR_EDEFAULT == null ? dmaapConfFileDescr != null : !DMAAP_CONF_FILE_DESCR_EDEFAULT.equals(dmaapConfFileDescr);
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_STREAMID:
+				return DMAAP_STREAMID_EDEFAULT == null ? dmaapStreamid != null : !DMAAP_STREAMID_EDEFAULT.equals(dmaapStreamid);
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_STREAMID_DESCR:
+				return DMAAP_STREAMID_DESCR_EDEFAULT == null ? dmaapStreamidDescr != null : !DMAAP_STREAMID_DESCR_EDEFAULT.equals(dmaapStreamidDescr);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == ControllerServiceDmaapDrsubServiceConfiguration.class) {
+			switch (derivedFeatureID) {
+				case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__CDAP_URL: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__CDAP_URL;
+				case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__NUMBER_OF_CDAP_RECORDS: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__NUMBER_OF_CDAP_RECORDS;
+				case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__NUMBER_OF_CDAP_ERRORS: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__NUMBER_OF_CDAP_ERRORS;
+				case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_URI: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_URI;
+				case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_URI_DESCR: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_URI_DESCR;
+				case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_PERSIST_LOC: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_PERSIST_LOC;
+				case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_PERSIST_LOC_DESCR: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_PERSIST_LOC_DESCR;
+				case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_CONF_FILE: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_CONF_FILE;
+				case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_CONF_FILE_DESCR: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_CONF_FILE_DESCR;
+				case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_STREAMID: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_STREAMID;
+				case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_STREAMID_DESCR: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_STREAMID_DESCR;
+				default: return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == ControllerServiceDmaapDrsubServiceConfiguration.class) {
+			switch (baseFeatureID) {
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__CDAP_URL: return ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__CDAP_URL;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__NUMBER_OF_CDAP_RECORDS: return ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__NUMBER_OF_CDAP_RECORDS;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__NUMBER_OF_CDAP_ERRORS: return ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__NUMBER_OF_CDAP_ERRORS;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_URI: return ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_URI;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_URI_DESCR: return ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_URI_DESCR;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_PERSIST_LOC: return ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_PERSIST_LOC;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_PERSIST_LOC_DESCR: return ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__HDFS_PERSIST_LOC_DESCR;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_CONF_FILE: return ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_CONF_FILE;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_CONF_FILE_DESCR: return ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_CONF_FILE_DESCR;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_STREAMID: return ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_STREAMID;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_STREAMID_DESCR: return ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER__DMAAP_STREAMID_DESCR;
+				default: return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (cdapUrl: ");
+		result.append(cdapUrl);
+		result.append(", numberOfCdapRecords: ");
+		result.append(numberOfCdapRecords);
+		result.append(", numberOfCdapErrors: ");
+		result.append(numberOfCdapErrors);
+		result.append(", hdfsUri: ");
+		result.append(hdfsUri);
+		result.append(", hdfsUriDescr: ");
+		result.append(hdfsUriDescr);
+		result.append(", hdfsPersistLoc: ");
+		result.append(hdfsPersistLoc);
+		result.append(", hdfsPersistLocDescr: ");
+		result.append(hdfsPersistLocDescr);
+		result.append(", dmaapConfFile: ");
+		result.append(dmaapConfFile);
+		result.append(", dmaapConfFileDescr: ");
+		result.append(dmaapConfFileDescr);
+		result.append(", dmaapStreamid: ");
+		result.append(dmaapStreamid);
+		result.append(", dmaapStreamidDescr: ");
+		result.append(dmaapStreamidDescr);
+		result.append(')');
+		return result.toString();
+	}
+
+} //ControllerServiceDmaapDrsubManagerImpl
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/impl/ManagerFactoryImpl.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/impl/ManagerFactoryImpl.java
new file mode 100644
index 0000000..cdaa90b
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/impl/ManagerFactoryImpl.java
@@ -0,0 +1,116 @@
+
+/*-
+ * ============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.service.dmaap.drsub.manager.impl;
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.manager.*;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ManagerFactoryImpl extends EFactoryImpl implements ManagerFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static ManagerFactory init() {
+		try {
+			ManagerFactory theManagerFactory = (ManagerFactory)EPackage.Registry.INSTANCE.getEFactory(ManagerPackage.eNS_URI);
+			if (theManagerFactory != null) {
+				return theManagerFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new ManagerFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ManagerFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER: return createControllerServiceDmaapDrsubManager();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ControllerServiceDmaapDrsubManager createControllerServiceDmaapDrsubManager() {
+		ControllerServiceDmaapDrsubManagerImpl controllerServiceDmaapDrsubManager = new ControllerServiceDmaapDrsubManagerImpl();
+		return controllerServiceDmaapDrsubManager;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ManagerPackage getManagerPackage() {
+		return (ManagerPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static ManagerPackage getPackage() {
+		return ManagerPackage.eINSTANCE;
+	}
+
+} //ManagerFactoryImpl
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/impl/ManagerPackageImpl.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/impl/ManagerPackageImpl.java
new file mode 100644
index 0000000..b837457
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/impl/ManagerPackageImpl.java
@@ -0,0 +1,196 @@
+
+/*-
+ * ============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.service.dmaap.drsub.manager.impl;
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.manager.ControllerServiceDmaapDrsubManager;
+import org.openecomp.dcae.controller.service.dmaap.drsub.manager.ManagerFactory;
+import org.openecomp.dcae.controller.service.dmaap.drsub.manager.ManagerPackage;
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage;
+import org.openecomp.dcae.controller.service.vmmanager.VmmanagerPackage;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ManagerPackageImpl extends EPackageImpl implements ManagerPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass controllerServiceDmaapDrsubManagerEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.manager.ManagerPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private ManagerPackageImpl() {
+		super(eNS_URI, ManagerFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link ManagerPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static ManagerPackage init() {
+		if (isInited) return (ManagerPackage)EPackage.Registry.INSTANCE.getEPackage(ManagerPackage.eNS_URI);
+
+		// Obtain or create and register package
+		ManagerPackageImpl theManagerPackage = (ManagerPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ManagerPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ManagerPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		ServicePackage.eINSTANCE.eClass();
+		VmmanagerPackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theManagerPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theManagerPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theManagerPackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(ManagerPackage.eNS_URI, theManagerPackage);
+		return theManagerPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getControllerServiceDmaapDrsubManager() {
+		return controllerServiceDmaapDrsubManagerEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ManagerFactory getManagerFactory() {
+		return (ManagerFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		controllerServiceDmaapDrsubManagerEClass = createEClass(CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		VmmanagerPackage theVmmanagerPackage = (VmmanagerPackage)EPackage.Registry.INSTANCE.getEPackage(VmmanagerPackage.eNS_URI);
+		ServicePackage theServicePackage = (ServicePackage)EPackage.Registry.INSTANCE.getEPackage(ServicePackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		controllerServiceDmaapDrsubManagerEClass.getESuperTypes().add(theVmmanagerPackage.getVirtualMachineManager());
+		controllerServiceDmaapDrsubManagerEClass.getESuperTypes().add(theServicePackage.getControllerServiceDmaapDrsubServiceConfiguration());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(controllerServiceDmaapDrsubManagerEClass, ControllerServiceDmaapDrsubManager.class, "ControllerServiceDmaapDrsubManager", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
+
+} //ManagerPackageImpl
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/util/ManagerAdapterFactory.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/util/ManagerAdapterFactory.java
new file mode 100644
index 0000000..b02a36f
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/util/ManagerAdapterFactory.java
@@ -0,0 +1,259 @@
+
+/*-
+ * ============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.service.dmaap.drsub.manager.util;
+
+import org.openecomp.dcae.controller.core.manager.DcaeManager;
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.manager.*;
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration;
+
+import org.openecomp.dcae.controller.service.vmmanager.VirtualMachineManager;
+
+import org.openecomp.ncomp.sirius.manager.server.AbstractManagementServer;
+import org.openecomp.ncomp.sirius.manager.server.SouthBoundApi;
+import org.openecomp.ncomp.sirius.manager.server.SouthBoundApiWithProxy;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.service.dmaap.drsub.manager.ManagerPackage
+ * @generated
+ */
+public class ManagerAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static ManagerPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ManagerAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = ManagerPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ManagerSwitch<Adapter> modelSwitch =
+		new ManagerSwitch<Adapter>() {
+			@Override
+			public Adapter caseControllerServiceDmaapDrsubManager(ControllerServiceDmaapDrsubManager object) {
+				return createControllerServiceDmaapDrsubManagerAdapter();
+			}
+			@Override
+			public Adapter caseDcaeManager(DcaeManager object) {
+				return createDcaeManagerAdapter();
+			}
+			@Override
+			public Adapter caseSouthBoundApi(SouthBoundApi object) {
+				return createSouthBoundApiAdapter();
+			}
+			@Override
+			public Adapter caseSouthBoundApiWithProxy(SouthBoundApiWithProxy object) {
+				return createSouthBoundApiWithProxyAdapter();
+			}
+			@Override
+			public Adapter caseAbstractManagementServer(AbstractManagementServer object) {
+				return createAbstractManagementServerAdapter();
+			}
+			@Override
+			public Adapter caseVirtualMachineManager(VirtualMachineManager object) {
+				return createVirtualMachineManagerAdapter();
+			}
+			@Override
+			public Adapter caseControllerServiceDmaapDrsubServiceConfiguration(ControllerServiceDmaapDrsubServiceConfiguration object) {
+				return createControllerServiceDmaapDrsubServiceConfigurationAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.dmaap.drsub.manager.ControllerServiceDmaapDrsubManager <em>Controller Service Dmaap Drsub Manager</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.manager.ControllerServiceDmaapDrsubManager
+	 * @generated
+	 */
+	public Adapter createControllerServiceDmaapDrsubManagerAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.manager.DcaeManager <em>Dcae Manager</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.core.manager.DcaeManager
+	 * @generated
+	 */
+	public Adapter createDcaeManagerAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.ncomp.sirius.manager.server.SouthBoundApi <em>South Bound Api</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.ncomp.sirius.manager.server.SouthBoundApi
+	 * @generated
+	 */
+	public Adapter createSouthBoundApiAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.ncomp.sirius.manager.server.SouthBoundApiWithProxy <em>South Bound Api With Proxy</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.ncomp.sirius.manager.server.SouthBoundApiWithProxy
+	 * @generated
+	 */
+	public Adapter createSouthBoundApiWithProxyAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.ncomp.sirius.manager.server.AbstractManagementServer <em>Abstract Management Server</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.ncomp.sirius.manager.server.AbstractManagementServer
+	 * @generated
+	 */
+	public Adapter createAbstractManagementServerAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.vmmanager.VirtualMachineManager <em>Virtual Machine Manager</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.service.vmmanager.VirtualMachineManager
+	 * @generated
+	 */
+	public Adapter createVirtualMachineManagerAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration <em>Controller Service Dmaap Drsub Service Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration
+	 * @generated
+	 */
+	public Adapter createControllerServiceDmaapDrsubServiceConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} //ManagerAdapterFactory
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/util/ManagerSwitch.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/util/ManagerSwitch.java
new file mode 100644
index 0000000..dfbb3a9
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/util/ManagerSwitch.java
@@ -0,0 +1,237 @@
+
+/*-
+ * ============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.service.dmaap.drsub.manager.util;
+
+import org.openecomp.dcae.controller.core.manager.DcaeManager;
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.manager.*;
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration;
+
+import org.openecomp.dcae.controller.service.vmmanager.VirtualMachineManager;
+
+import org.openecomp.ncomp.sirius.manager.server.AbstractManagementServer;
+import org.openecomp.ncomp.sirius.manager.server.SouthBoundApi;
+import org.openecomp.ncomp.sirius.manager.server.SouthBoundApiWithProxy;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.Switch;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.service.dmaap.drsub.manager.ManagerPackage
+ * @generated
+ */
+public class ManagerSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static ManagerPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ManagerSwitch() {
+		if (modelPackage == null) {
+			modelPackage = ManagerPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @parameter ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case ManagerPackage.CONTROLLER_SERVICE_DMAAP_DRSUB_MANAGER: {
+				ControllerServiceDmaapDrsubManager controllerServiceDmaapDrsubManager = (ControllerServiceDmaapDrsubManager)theEObject;
+				T result = caseControllerServiceDmaapDrsubManager(controllerServiceDmaapDrsubManager);
+				if (result == null) result = caseVirtualMachineManager(controllerServiceDmaapDrsubManager);
+				if (result == null) result = caseControllerServiceDmaapDrsubServiceConfiguration(controllerServiceDmaapDrsubManager);
+				if (result == null) result = caseDcaeManager(controllerServiceDmaapDrsubManager);
+				if (result == null) result = caseAbstractManagementServer(controllerServiceDmaapDrsubManager);
+				if (result == null) result = caseSouthBoundApiWithProxy(controllerServiceDmaapDrsubManager);
+				if (result == null) result = caseSouthBoundApi(controllerServiceDmaapDrsubManager);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Controller Service Dmaap Drsub Manager</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Controller Service Dmaap Drsub Manager</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseControllerServiceDmaapDrsubManager(ControllerServiceDmaapDrsubManager object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Dcae Manager</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Dcae Manager</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDcaeManager(DcaeManager object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>South Bound Api</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>South Bound Api</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseSouthBoundApi(SouthBoundApi object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>South Bound Api With Proxy</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>South Bound Api With Proxy</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseSouthBoundApiWithProxy(SouthBoundApiWithProxy object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Abstract Management Server</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Abstract Management Server</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAbstractManagementServer(AbstractManagementServer object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Virtual Machine Manager</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Virtual Machine Manager</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseVirtualMachineManager(VirtualMachineManager object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Controller Service Dmaap Drsub Service Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Controller Service Dmaap Drsub Service Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseControllerServiceDmaapDrsubServiceConfiguration(ControllerServiceDmaapDrsubServiceConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} //ManagerSwitch
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/ContrailController.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/ContrailController.java
new file mode 100644
index 0000000..40bbcfa
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/ContrailController.java
@@ -0,0 +1,130 @@
+
+/*-
+ * ============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.service.dmaap.drsub.service;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Contrail Controller</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ContrailController#getContrailIp <em>Contrail Ip</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ContrailController#getNumberOfRecords <em>Number Of Records</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ContrailController#getNumberOfErrors <em>Number Of Errors</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage#getContrailController()
+ * @model
+ * @generated
+ */
+public interface ContrailController extends NamedEntity {
+	/**
+	 * Returns the value of the '<em><b>Contrail Ip</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Contrail Ip</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Contrail Ip</em>' attribute.
+	 * @see #setContrailIp(String)
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage#getContrailController_ContrailIp()
+	 * @model unique="false"
+	 *        annotation="http://openecomp.org type='configuration'"
+	 * @generated
+	 */
+	String getContrailIp();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ContrailController#getContrailIp <em>Contrail Ip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Contrail Ip</em>' attribute.
+	 * @see #getContrailIp()
+	 * @generated
+	 */
+	void setContrailIp(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Number Of Records</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Number Of Records</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Number Of Records</em>' attribute.
+	 * @see #setNumberOfRecords(IncreasingULongMetricAttribute)
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage#getContrailController_NumberOfRecords()
+	 * @model unique="false" dataType="org.openecomp.ncomp.core.IncreasingULongMetricAttribute"
+	 *        annotation="http://openecomp.org type='operational'"
+	 * @generated
+	 */
+	IncreasingULongMetricAttribute getNumberOfRecords();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ContrailController#getNumberOfRecords <em>Number Of Records</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Number Of Records</em>' attribute.
+	 * @see #getNumberOfRecords()
+	 * @generated
+	 */
+	void setNumberOfRecords(IncreasingULongMetricAttribute value);
+
+	/**
+	 * Returns the value of the '<em><b>Number Of Errors</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Number Of Errors</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Number Of Errors</em>' attribute.
+	 * @see #setNumberOfErrors(IncreasingULongMetricAttribute)
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage#getContrailController_NumberOfErrors()
+	 * @model unique="false" dataType="org.openecomp.ncomp.core.IncreasingULongMetricAttribute"
+	 *        annotation="http://openecomp.org type='operational'"
+	 * @generated
+	 */
+	IncreasingULongMetricAttribute getNumberOfErrors();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ContrailController#getNumberOfErrors <em>Number Of Errors</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Number Of Errors</em>' attribute.
+	 * @see #getNumberOfErrors()
+	 * @generated
+	 */
+	void setNumberOfErrors(IncreasingULongMetricAttribute value);
+
+} // ContrailController
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/ControllerServiceDmaapDrsubService.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/ControllerServiceDmaapDrsubService.java
new file mode 100644
index 0000000..4a931ed
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/ControllerServiceDmaapDrsubService.java
@@ -0,0 +1,40 @@
+
+/*-
+ * ============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.service.dmaap.drsub.service;
+
+import org.openecomp.dcae.controller.service.vm.VirtualMachineService;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Controller Service Dmaap Drsub Service</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage#getControllerServiceDmaapDrsubService()
+ * @model
+ * @generated
+ */
+public interface ControllerServiceDmaapDrsubService extends VirtualMachineService {
+
+} // ControllerServiceDmaapDrsubService
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/ControllerServiceDmaapDrsubServiceConfiguration.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/ControllerServiceDmaapDrsubServiceConfiguration.java
new file mode 100644
index 0000000..d9cb8c1
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/ControllerServiceDmaapDrsubServiceConfiguration.java
@@ -0,0 +1,353 @@
+
+/*-
+ * ============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.service.dmaap.drsub.service;
+
+import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Controller Service Dmaap Drsub Service Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getCdapUrl <em>Cdap Url</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getNumberOfCdapRecords <em>Number Of Cdap Records</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getNumberOfCdapErrors <em>Number Of Cdap Errors</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getHdfsUri <em>Hdfs Uri</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getHdfsUriDescr <em>Hdfs Uri Descr</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getHdfsPersistLoc <em>Hdfs Persist Loc</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getHdfsPersistLocDescr <em>Hdfs Persist Loc Descr</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getDmaapConfFile <em>Dmaap Conf File</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getDmaapConfFileDescr <em>Dmaap Conf File Descr</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getDmaapStreamid <em>Dmaap Streamid</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getDmaapStreamidDescr <em>Dmaap Streamid Descr</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage#getControllerServiceDmaapDrsubServiceConfiguration()
+ * @model
+ * @generated
+ */
+public interface ControllerServiceDmaapDrsubServiceConfiguration extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Cdap Url</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Cdap Url</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Cdap Url</em>' attribute.
+	 * @see #setCdapUrl(String)
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage#getControllerServiceDmaapDrsubServiceConfiguration_CdapUrl()
+	 * @model unique="false"
+	 *        annotation="http://openecomp.org type='configuration'"
+	 * @generated
+	 */
+	String getCdapUrl();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getCdapUrl <em>Cdap Url</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Cdap Url</em>' attribute.
+	 * @see #getCdapUrl()
+	 * @generated
+	 */
+	void setCdapUrl(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Number Of Cdap Records</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Number Of Cdap Records</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Number Of Cdap Records</em>' attribute.
+	 * @see #setNumberOfCdapRecords(IncreasingULongMetricAttribute)
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage#getControllerServiceDmaapDrsubServiceConfiguration_NumberOfCdapRecords()
+	 * @model unique="false" dataType="org.openecomp.ncomp.core.IncreasingULongMetricAttribute"
+	 *        annotation="http://openecomp.org type='operational'"
+	 * @generated
+	 */
+	IncreasingULongMetricAttribute getNumberOfCdapRecords();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getNumberOfCdapRecords <em>Number Of Cdap Records</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Number Of Cdap Records</em>' attribute.
+	 * @see #getNumberOfCdapRecords()
+	 * @generated
+	 */
+	void setNumberOfCdapRecords(IncreasingULongMetricAttribute value);
+
+	/**
+	 * Returns the value of the '<em><b>Number Of Cdap Errors</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Number Of Cdap Errors</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Number Of Cdap Errors</em>' attribute.
+	 * @see #setNumberOfCdapErrors(IncreasingULongMetricAttribute)
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage#getControllerServiceDmaapDrsubServiceConfiguration_NumberOfCdapErrors()
+	 * @model unique="false" dataType="org.openecomp.ncomp.core.IncreasingULongMetricAttribute"
+	 *        annotation="http://openecomp.org type='operational'"
+	 * @generated
+	 */
+	IncreasingULongMetricAttribute getNumberOfCdapErrors();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getNumberOfCdapErrors <em>Number Of Cdap Errors</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Number Of Cdap Errors</em>' attribute.
+	 * @see #getNumberOfCdapErrors()
+	 * @generated
+	 */
+	void setNumberOfCdapErrors(IncreasingULongMetricAttribute value);
+
+	/**
+	 * Returns the value of the '<em><b>Hdfs Uri</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Hdfs Uri</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Hdfs Uri</em>' attribute.
+	 * @see #setHdfsUri(String)
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage#getControllerServiceDmaapDrsubServiceConfiguration_HdfsUri()
+	 * @model unique="false"
+	 *        annotation="http://openecomp.org type='configuration'"
+	 * @generated
+	 */
+	String getHdfsUri();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getHdfsUri <em>Hdfs Uri</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Hdfs Uri</em>' attribute.
+	 * @see #getHdfsUri()
+	 * @generated
+	 */
+	void setHdfsUri(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Hdfs Uri Descr</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Hdfs Uri Descr</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Hdfs Uri Descr</em>' attribute.
+	 * @see #setHdfsUriDescr(String)
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage#getControllerServiceDmaapDrsubServiceConfiguration_HdfsUriDescr()
+	 * @model unique="false"
+	 *        annotation="http://openecomp.org type='configuration'"
+	 * @generated
+	 */
+	String getHdfsUriDescr();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getHdfsUriDescr <em>Hdfs Uri Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Hdfs Uri Descr</em>' attribute.
+	 * @see #getHdfsUriDescr()
+	 * @generated
+	 */
+	void setHdfsUriDescr(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Hdfs Persist Loc</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Hdfs Persist Loc</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Hdfs Persist Loc</em>' attribute.
+	 * @see #setHdfsPersistLoc(String)
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage#getControllerServiceDmaapDrsubServiceConfiguration_HdfsPersistLoc()
+	 * @model unique="false"
+	 *        annotation="http://openecomp.org type='configuration'"
+	 * @generated
+	 */
+	String getHdfsPersistLoc();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getHdfsPersistLoc <em>Hdfs Persist Loc</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Hdfs Persist Loc</em>' attribute.
+	 * @see #getHdfsPersistLoc()
+	 * @generated
+	 */
+	void setHdfsPersistLoc(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Hdfs Persist Loc Descr</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Hdfs Persist Loc Descr</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Hdfs Persist Loc Descr</em>' attribute.
+	 * @see #setHdfsPersistLocDescr(String)
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage#getControllerServiceDmaapDrsubServiceConfiguration_HdfsPersistLocDescr()
+	 * @model unique="false"
+	 *        annotation="http://openecomp.org type='configuration'"
+	 * @generated
+	 */
+	String getHdfsPersistLocDescr();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getHdfsPersistLocDescr <em>Hdfs Persist Loc Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Hdfs Persist Loc Descr</em>' attribute.
+	 * @see #getHdfsPersistLocDescr()
+	 * @generated
+	 */
+	void setHdfsPersistLocDescr(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Dmaap Conf File</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Dmaap Conf File</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Dmaap Conf File</em>' attribute.
+	 * @see #setDmaapConfFile(String)
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage#getControllerServiceDmaapDrsubServiceConfiguration_DmaapConfFile()
+	 * @model unique="false"
+	 *        annotation="http://openecomp.org type='configuration'"
+	 * @generated
+	 */
+	String getDmaapConfFile();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getDmaapConfFile <em>Dmaap Conf File</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Dmaap Conf File</em>' attribute.
+	 * @see #getDmaapConfFile()
+	 * @generated
+	 */
+	void setDmaapConfFile(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Dmaap Conf File Descr</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Dmaap Conf File Descr</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Dmaap Conf File Descr</em>' attribute.
+	 * @see #setDmaapConfFileDescr(String)
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage#getControllerServiceDmaapDrsubServiceConfiguration_DmaapConfFileDescr()
+	 * @model unique="false"
+	 *        annotation="http://openecomp.org type='configuration'"
+	 * @generated
+	 */
+	String getDmaapConfFileDescr();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getDmaapConfFileDescr <em>Dmaap Conf File Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Dmaap Conf File Descr</em>' attribute.
+	 * @see #getDmaapConfFileDescr()
+	 * @generated
+	 */
+	void setDmaapConfFileDescr(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Dmaap Streamid</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Dmaap Streamid</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Dmaap Streamid</em>' attribute.
+	 * @see #setDmaapStreamid(String)
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage#getControllerServiceDmaapDrsubServiceConfiguration_DmaapStreamid()
+	 * @model unique="false"
+	 *        annotation="http://openecomp.org type='configuration'"
+	 * @generated
+	 */
+	String getDmaapStreamid();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getDmaapStreamid <em>Dmaap Streamid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Dmaap Streamid</em>' attribute.
+	 * @see #getDmaapStreamid()
+	 * @generated
+	 */
+	void setDmaapStreamid(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Dmaap Streamid Descr</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Dmaap Streamid Descr</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Dmaap Streamid Descr</em>' attribute.
+	 * @see #setDmaapStreamidDescr(String)
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage#getControllerServiceDmaapDrsubServiceConfiguration_DmaapStreamidDescr()
+	 * @model unique="false"
+	 *        annotation="http://openecomp.org type='configuration'"
+	 * @generated
+	 */
+	String getDmaapStreamidDescr();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getDmaapStreamidDescr <em>Dmaap Streamid Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Dmaap Streamid Descr</em>' attribute.
+	 * @see #getDmaapStreamidDescr()
+	 * @generated
+	 */
+	void setDmaapStreamidDescr(String value);
+
+} // ControllerServiceDmaapDrsubServiceConfiguration
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/ControllerServiceDmaapDrsubServiceInstance.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/ControllerServiceDmaapDrsubServiceInstance.java
new file mode 100644
index 0000000..4abe40d
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/ControllerServiceDmaapDrsubServiceInstance.java
@@ -0,0 +1,99 @@
+
+/*-
+ * ============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.service.dmaap.drsub.service;
+
+import org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterServiceInstance;
+import org.openecomp.dcae.controller.service.vm.VirtualMachineServiceInstance;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Controller Service Dmaap Drsub Service Instance</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceInstance#getCdapClusterInstance <em>Cdap Cluster Instance</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceInstance#getCdapServiceName <em>Cdap Service Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage#getControllerServiceDmaapDrsubServiceInstance()
+ * @model
+ * @generated
+ */
+public interface ControllerServiceDmaapDrsubServiceInstance extends VirtualMachineServiceInstance, ControllerServiceDmaapDrsubServiceConfiguration {
+
+	/**
+	 * Returns the value of the '<em><b>Cdap Cluster Instance</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Cdap Cluster Instance</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Cdap Cluster Instance</em>' reference.
+	 * @see #setCdapClusterInstance(CdapClusterServiceInstance)
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage#getControllerServiceDmaapDrsubServiceInstance_CdapClusterInstance()
+	 * @model
+	 * @generated
+	 */
+	CdapClusterServiceInstance getCdapClusterInstance();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceInstance#getCdapClusterInstance <em>Cdap Cluster Instance</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Cdap Cluster Instance</em>' reference.
+	 * @see #getCdapClusterInstance()
+	 * @generated
+	 */
+	void setCdapClusterInstance(CdapClusterServiceInstance value);
+
+	/**
+	 * Returns the value of the '<em><b>Cdap Service Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Cdap Service Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Cdap Service Name</em>' attribute.
+	 * @see #setCdapServiceName(String)
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage#getControllerServiceDmaapDrsubServiceInstance_CdapServiceName()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getCdapServiceName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceInstance#getCdapServiceName <em>Cdap Service Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Cdap Service Name</em>' attribute.
+	 * @see #getCdapServiceName()
+	 * @generated
+	 */
+	void setCdapServiceName(String value);
+} // ControllerServiceDmaapDrsubServiceInstance
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/ServiceFactory.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/ServiceFactory.java
new file mode 100644
index 0000000..b63c6f5
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/ServiceFactory.java
@@ -0,0 +1,81 @@
+
+/*-
+ * ============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.service.dmaap.drsub.service;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage
+ * @generated
+ */
+public interface ServiceFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	ServiceFactory eINSTANCE = org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ServiceFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Controller Service Dmaap Drsub Service</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Controller Service Dmaap Drsub Service</em>'.
+	 * @generated
+	 */
+	ControllerServiceDmaapDrsubService createControllerServiceDmaapDrsubService();
+
+	/**
+	 * Returns a new object of class '<em>Controller Service Dmaap Drsub Service Instance</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Controller Service Dmaap Drsub Service Instance</em>'.
+	 * @generated
+	 */
+	ControllerServiceDmaapDrsubServiceInstance createControllerServiceDmaapDrsubServiceInstance();
+
+	/**
+	 * Returns a new object of class '<em>Controller Service Dmaap Drsub Service Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Controller Service Dmaap Drsub Service Configuration</em>'.
+	 * @generated
+	 */
+	ControllerServiceDmaapDrsubServiceConfiguration createControllerServiceDmaapDrsubServiceConfiguration();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	ServicePackage getServicePackage();
+
+} //ServiceFactory
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/ServicePackage.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/ServicePackage.java
new file mode 100644
index 0000000..511d3cf
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/ServicePackage.java
@@ -0,0 +1,1165 @@
+
+/*-
+ * ============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.service.dmaap.drsub.service;
+
+import org.openecomp.dcae.controller.service.vm.VmPackage;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ServiceFactory
+ * @model kind="package"
+ *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen' basePackage='org.openecomp.dcae.controller.service.dmaap.drsub'"
+ *        annotation="http://www.eclipse.org/emf/2011/Xcore ecomp='http://openecomp.org'"
+ * @generated
+ */
+public interface ServicePackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "service";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "org.openecomp.dcae.controller.service.dmaap.drsub.service";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "service";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	ServicePackage eINSTANCE = org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ServicePackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceImpl <em>Controller Service Dmaap Drsub Service</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceImpl
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ServicePackageImpl#getControllerServiceDmaapDrsubService()
+	 * @generated
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE = 0;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE__NAME = VmPackage.VIRTUAL_MACHINE_SERVICE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE__LAST_POLLED = VmPackage.VIRTUAL_MACHINE_SERVICE__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE__LAST_CHANGED = VmPackage.VIRTUAL_MACHINE_SERVICE__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE__CREATED = VmPackage.VIRTUAL_MACHINE_SERVICE__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Instances</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE__INSTANCES = VmPackage.VIRTUAL_MACHINE_SERVICE__INSTANCES;
+
+	/**
+	 * The feature id for the '<em><b>Manager Port Number</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE__MANAGER_PORT_NUMBER = VmPackage.VIRTUAL_MACHINE_SERVICE__MANAGER_PORT_NUMBER;
+
+	/**
+	 * The number of structural features of the '<em>Controller Service Dmaap Drsub Service</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_FEATURE_COUNT = VmPackage.VIRTUAL_MACHINE_SERVICE_FEATURE_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Deploy</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE___DEPLOY__STRING_STRING = VmPackage.VIRTUAL_MACHINE_SERVICE___DEPLOY__STRING_STRING;
+
+	/**
+	 * The operation id for the '<em>Undeploy</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE___UNDEPLOY__STRING = VmPackage.VIRTUAL_MACHINE_SERVICE___UNDEPLOY__STRING;
+
+	/**
+	 * The operation id for the '<em>Test</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE___TEST__STRING = VmPackage.VIRTUAL_MACHINE_SERVICE___TEST__STRING;
+
+	/**
+	 * The operation id for the '<em>Suspend</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE___SUSPEND__STRING = VmPackage.VIRTUAL_MACHINE_SERVICE___SUSPEND__STRING;
+
+	/**
+	 * The operation id for the '<em>Resume</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE___RESUME__STRING = VmPackage.VIRTUAL_MACHINE_SERVICE___RESUME__STRING;
+
+	/**
+	 * The operation id for the '<em>Push Manager Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE___PUSH_MANAGER_CONFIGURATION__STRING = VmPackage.VIRTUAL_MACHINE_SERVICE___PUSH_MANAGER_CONFIGURATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Poll Manager Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE___POLL_MANAGER_CONFIGURATION__STRING = VmPackage.VIRTUAL_MACHINE_SERVICE___POLL_MANAGER_CONFIGURATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Manager Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE___MANAGER_CONFIGURATION__STRING = VmPackage.VIRTUAL_MACHINE_SERVICE___MANAGER_CONFIGURATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Manager Operation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE___MANAGER_OPERATION__STRING_STRING_JSONOBJECT = VmPackage.VIRTUAL_MACHINE_SERVICE___MANAGER_OPERATION__STRING_STRING_JSONOBJECT;
+
+	/**
+	 * The operation id for the '<em>Update Configuration From Policy</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE___UPDATE_CONFIGURATION_FROM_POLICY__STRING = VmPackage.VIRTUAL_MACHINE_SERVICE___UPDATE_CONFIGURATION_FROM_POLICY__STRING;
+
+	/**
+	 * The operation id for the '<em>Run Health Tests</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE___RUN_HEALTH_TESTS = VmPackage.VIRTUAL_MACHINE_SERVICE___RUN_HEALTH_TESTS;
+
+	/**
+	 * The operation id for the '<em>Update Deployment Status</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE___UPDATE_DEPLOYMENT_STATUS = VmPackage.VIRTUAL_MACHINE_SERVICE___UPDATE_DEPLOYMENT_STATUS;
+
+	/**
+	 * The number of operations of the '<em>Controller Service Dmaap Drsub Service</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_OPERATION_COUNT = VmPackage.VIRTUAL_MACHINE_SERVICE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceInstanceImpl <em>Controller Service Dmaap Drsub Service Instance</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceInstanceImpl
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ServicePackageImpl#getControllerServiceDmaapDrsubServiceInstance()
+	 * @generated
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE = 1;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__NAME = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__LAST_POLLED = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__LAST_CHANGED = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CREATED = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Service Container</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__SERVICE_CONTAINER = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__SERVICE_CONTAINER;
+
+	/**
+	 * The feature id for the '<em><b>Status</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__STATUS = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__STATUS;
+
+	/**
+	 * The feature id for the '<em><b>Input Streams</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__INPUT_STREAMS = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__INPUT_STREAMS;
+
+	/**
+	 * The feature id for the '<em><b>Output Streams</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__OUTPUT_STREAMS = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__OUTPUT_STREAMS;
+
+	/**
+	 * The feature id for the '<em><b>Last Health Test</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__LAST_HEALTH_TEST = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__LAST_HEALTH_TEST;
+
+	/**
+	 * The feature id for the '<em><b>Health Test Status</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HEALTH_TEST_STATUS = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__HEALTH_TEST_STATUS;
+
+	/**
+	 * The feature id for the '<em><b>Health Test Message Code</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HEALTH_TEST_MESSAGE_CODE = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__HEALTH_TEST_MESSAGE_CODE;
+
+	/**
+	 * The feature id for the '<em><b>Configuration</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CONFIGURATION = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Location</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__LOCATION = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__LOCATION;
+
+	/**
+	 * The feature id for the '<em><b>Vm Type</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__VM_TYPE = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__VM_TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Users</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__USERS = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__USERS;
+
+	/**
+	 * The feature id for the '<em><b>Admin Users</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__ADMIN_USERS = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__ADMIN_USERS;
+
+	/**
+	 * The feature id for the '<em><b>Application Ids</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__APPLICATION_IDS = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__APPLICATION_IDS;
+
+	/**
+	 * The feature id for the '<em><b>Admin Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__ADMIN_ID = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__ADMIN_ID;
+
+	/**
+	 * The feature id for the '<em><b>Number Of Servers</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__NUMBER_OF_SERVERS = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__NUMBER_OF_SERVERS;
+
+	/**
+	 * The feature id for the '<em><b>Availability Zone</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__AVAILABILITY_ZONE = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__AVAILABILITY_ZONE;
+
+	/**
+	 * The feature id for the '<em><b>Manager Port Number</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__MANAGER_PORT_NUMBER = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__MANAGER_PORT_NUMBER;
+
+	/**
+	 * The feature id for the '<em><b>Servers</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__SERVERS = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__SERVERS;
+
+	/**
+	 * The feature id for the '<em><b>Leader Server</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__LEADER_SERVER = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__LEADER_SERVER;
+
+	/**
+	 * The feature id for the '<em><b>Service</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__SERVICE = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__SERVICE;
+
+	/**
+	 * The feature id for the '<em><b>Ieds Admin</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__IEDS_ADMIN = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__IEDS_ADMIN;
+
+	/**
+	 * The feature id for the '<em><b>Chef User</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CHEF_USER = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__CHEF_USER;
+
+	/**
+	 * The feature id for the '<em><b>Chef Org</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CHEF_ORG = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__CHEF_ORG;
+
+	/**
+	 * The feature id for the '<em><b>Chef Topology</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CHEF_TOPOLOGY = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__CHEF_TOPOLOGY;
+
+	/**
+	 * The feature id for the '<em><b>Openstack Flavor</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__OPENSTACK_FLAVOR = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__OPENSTACK_FLAVOR;
+
+	/**
+	 * The feature id for the '<em><b>Service Fqdn</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__SERVICE_FQDN = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__SERVICE_FQDN;
+
+	/**
+	 * The feature id for the '<em><b>Deployment Timeout Minutes</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DEPLOYMENT_TIMEOUT_MINUTES = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__DEPLOYMENT_TIMEOUT_MINUTES;
+
+	/**
+	 * The feature id for the '<em><b>Steps</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__STEPS = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE__STEPS;
+
+	/**
+	 * The feature id for the '<em><b>Cdap Url</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CDAP_URL = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Number Of Cdap Records</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__NUMBER_OF_CDAP_RECORDS = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Number Of Cdap Errors</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__NUMBER_OF_CDAP_ERRORS = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Hdfs Uri</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_URI = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Hdfs Uri Descr</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_URI_DESCR = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Hdfs Persist Loc</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_PERSIST_LOC = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Hdfs Persist Loc Descr</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_PERSIST_LOC_DESCR = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE_FEATURE_COUNT + 6;
+
+	/**
+	 * The feature id for the '<em><b>Dmaap Conf File</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_CONF_FILE = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE_FEATURE_COUNT + 7;
+
+	/**
+	 * The feature id for the '<em><b>Dmaap Conf File Descr</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_CONF_FILE_DESCR = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE_FEATURE_COUNT + 8;
+
+	/**
+	 * The feature id for the '<em><b>Dmaap Streamid</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_STREAMID = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE_FEATURE_COUNT + 9;
+
+	/**
+	 * The feature id for the '<em><b>Dmaap Streamid Descr</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_STREAMID_DESCR = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE_FEATURE_COUNT + 10;
+
+	/**
+	 * The feature id for the '<em><b>Cdap Cluster Instance</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CDAP_CLUSTER_INSTANCE = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE_FEATURE_COUNT + 11;
+
+	/**
+	 * The feature id for the '<em><b>Cdap Service Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CDAP_SERVICE_NAME = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE_FEATURE_COUNT + 12;
+
+	/**
+	 * The number of structural features of the '<em>Controller Service Dmaap Drsub Service Instance</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE_FEATURE_COUNT = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE_FEATURE_COUNT + 13;
+
+	/**
+	 * The number of operations of the '<em>Controller Service Dmaap Drsub Service Instance</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE_OPERATION_COUNT = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceConfigurationImpl <em>Controller Service Dmaap Drsub Service Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceConfigurationImpl
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ServicePackageImpl#getControllerServiceDmaapDrsubServiceConfiguration()
+	 * @generated
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION = 2;
+
+	/**
+	 * The feature id for the '<em><b>Cdap Url</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__CDAP_URL = 0;
+
+	/**
+	 * The feature id for the '<em><b>Number Of Cdap Records</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__NUMBER_OF_CDAP_RECORDS = 1;
+
+	/**
+	 * The feature id for the '<em><b>Number Of Cdap Errors</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__NUMBER_OF_CDAP_ERRORS = 2;
+
+	/**
+	 * The feature id for the '<em><b>Hdfs Uri</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_URI = 3;
+
+	/**
+	 * The feature id for the '<em><b>Hdfs Uri Descr</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_URI_DESCR = 4;
+
+	/**
+	 * The feature id for the '<em><b>Hdfs Persist Loc</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_PERSIST_LOC = 5;
+
+	/**
+	 * The feature id for the '<em><b>Hdfs Persist Loc Descr</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_PERSIST_LOC_DESCR = 6;
+
+	/**
+	 * The feature id for the '<em><b>Dmaap Conf File</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_CONF_FILE = 7;
+
+	/**
+	 * The feature id for the '<em><b>Dmaap Conf File Descr</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_CONF_FILE_DESCR = 8;
+
+	/**
+	 * The feature id for the '<em><b>Dmaap Streamid</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_STREAMID = 9;
+
+	/**
+	 * The feature id for the '<em><b>Dmaap Streamid Descr</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_STREAMID_DESCR = 10;
+
+	/**
+	 * The number of structural features of the '<em>Controller Service Dmaap Drsub Service Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION_FEATURE_COUNT = 11;
+
+	/**
+	 * The number of operations of the '<em>Controller Service Dmaap Drsub Service Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION_OPERATION_COUNT = 0;
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubService <em>Controller Service Dmaap Drsub Service</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Controller Service Dmaap Drsub Service</em>'.
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubService
+	 * @generated
+	 */
+	EClass getControllerServiceDmaapDrsubService();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceInstance <em>Controller Service Dmaap Drsub Service Instance</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Controller Service Dmaap Drsub Service Instance</em>'.
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceInstance
+	 * @generated
+	 */
+	EClass getControllerServiceDmaapDrsubServiceInstance();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceInstance#getCdapClusterInstance <em>Cdap Cluster Instance</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Cdap Cluster Instance</em>'.
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceInstance#getCdapClusterInstance()
+	 * @see #getControllerServiceDmaapDrsubServiceInstance()
+	 * @generated
+	 */
+	EReference getControllerServiceDmaapDrsubServiceInstance_CdapClusterInstance();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceInstance#getCdapServiceName <em>Cdap Service Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Cdap Service Name</em>'.
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceInstance#getCdapServiceName()
+	 * @see #getControllerServiceDmaapDrsubServiceInstance()
+	 * @generated
+	 */
+	EAttribute getControllerServiceDmaapDrsubServiceInstance_CdapServiceName();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration <em>Controller Service Dmaap Drsub Service Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Controller Service Dmaap Drsub Service Configuration</em>'.
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration
+	 * @generated
+	 */
+	EClass getControllerServiceDmaapDrsubServiceConfiguration();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getCdapUrl <em>Cdap Url</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Cdap Url</em>'.
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getCdapUrl()
+	 * @see #getControllerServiceDmaapDrsubServiceConfiguration()
+	 * @generated
+	 */
+	EAttribute getControllerServiceDmaapDrsubServiceConfiguration_CdapUrl();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getNumberOfCdapRecords <em>Number Of Cdap Records</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Number Of Cdap Records</em>'.
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getNumberOfCdapRecords()
+	 * @see #getControllerServiceDmaapDrsubServiceConfiguration()
+	 * @generated
+	 */
+	EAttribute getControllerServiceDmaapDrsubServiceConfiguration_NumberOfCdapRecords();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getNumberOfCdapErrors <em>Number Of Cdap Errors</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Number Of Cdap Errors</em>'.
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getNumberOfCdapErrors()
+	 * @see #getControllerServiceDmaapDrsubServiceConfiguration()
+	 * @generated
+	 */
+	EAttribute getControllerServiceDmaapDrsubServiceConfiguration_NumberOfCdapErrors();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getHdfsUri <em>Hdfs Uri</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Hdfs Uri</em>'.
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getHdfsUri()
+	 * @see #getControllerServiceDmaapDrsubServiceConfiguration()
+	 * @generated
+	 */
+	EAttribute getControllerServiceDmaapDrsubServiceConfiguration_HdfsUri();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getHdfsUriDescr <em>Hdfs Uri Descr</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Hdfs Uri Descr</em>'.
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getHdfsUriDescr()
+	 * @see #getControllerServiceDmaapDrsubServiceConfiguration()
+	 * @generated
+	 */
+	EAttribute getControllerServiceDmaapDrsubServiceConfiguration_HdfsUriDescr();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getHdfsPersistLoc <em>Hdfs Persist Loc</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Hdfs Persist Loc</em>'.
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getHdfsPersistLoc()
+	 * @see #getControllerServiceDmaapDrsubServiceConfiguration()
+	 * @generated
+	 */
+	EAttribute getControllerServiceDmaapDrsubServiceConfiguration_HdfsPersistLoc();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getHdfsPersistLocDescr <em>Hdfs Persist Loc Descr</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Hdfs Persist Loc Descr</em>'.
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getHdfsPersistLocDescr()
+	 * @see #getControllerServiceDmaapDrsubServiceConfiguration()
+	 * @generated
+	 */
+	EAttribute getControllerServiceDmaapDrsubServiceConfiguration_HdfsPersistLocDescr();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getDmaapConfFile <em>Dmaap Conf File</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Dmaap Conf File</em>'.
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getDmaapConfFile()
+	 * @see #getControllerServiceDmaapDrsubServiceConfiguration()
+	 * @generated
+	 */
+	EAttribute getControllerServiceDmaapDrsubServiceConfiguration_DmaapConfFile();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getDmaapConfFileDescr <em>Dmaap Conf File Descr</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Dmaap Conf File Descr</em>'.
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getDmaapConfFileDescr()
+	 * @see #getControllerServiceDmaapDrsubServiceConfiguration()
+	 * @generated
+	 */
+	EAttribute getControllerServiceDmaapDrsubServiceConfiguration_DmaapConfFileDescr();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getDmaapStreamid <em>Dmaap Streamid</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Dmaap Streamid</em>'.
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getDmaapStreamid()
+	 * @see #getControllerServiceDmaapDrsubServiceConfiguration()
+	 * @generated
+	 */
+	EAttribute getControllerServiceDmaapDrsubServiceConfiguration_DmaapStreamid();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getDmaapStreamidDescr <em>Dmaap Streamid Descr</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Dmaap Streamid Descr</em>'.
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration#getDmaapStreamidDescr()
+	 * @see #getControllerServiceDmaapDrsubServiceConfiguration()
+	 * @generated
+	 */
+	EAttribute getControllerServiceDmaapDrsubServiceConfiguration_DmaapStreamidDescr();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	ServiceFactory getServiceFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each operation of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceImpl <em>Controller Service Dmaap Drsub Service</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceImpl
+		 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ServicePackageImpl#getControllerServiceDmaapDrsubService()
+		 * @generated
+		 */
+		EClass CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE = eINSTANCE.getControllerServiceDmaapDrsubService();
+
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceInstanceImpl <em>Controller Service Dmaap Drsub Service Instance</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceInstanceImpl
+		 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ServicePackageImpl#getControllerServiceDmaapDrsubServiceInstance()
+		 * @generated
+		 */
+		EClass CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE = eINSTANCE.getControllerServiceDmaapDrsubServiceInstance();
+
+		/**
+		 * The meta object literal for the '<em><b>Cdap Cluster Instance</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CDAP_CLUSTER_INSTANCE = eINSTANCE.getControllerServiceDmaapDrsubServiceInstance_CdapClusterInstance();
+
+		/**
+		 * The meta object literal for the '<em><b>Cdap Service Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CDAP_SERVICE_NAME = eINSTANCE.getControllerServiceDmaapDrsubServiceInstance_CdapServiceName();
+
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceConfigurationImpl <em>Controller Service Dmaap Drsub Service Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceConfigurationImpl
+		 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ServicePackageImpl#getControllerServiceDmaapDrsubServiceConfiguration()
+		 * @generated
+		 */
+		EClass CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION = eINSTANCE.getControllerServiceDmaapDrsubServiceConfiguration();
+
+		/**
+		 * The meta object literal for the '<em><b>Cdap Url</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__CDAP_URL = eINSTANCE.getControllerServiceDmaapDrsubServiceConfiguration_CdapUrl();
+
+		/**
+		 * The meta object literal for the '<em><b>Number Of Cdap Records</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__NUMBER_OF_CDAP_RECORDS = eINSTANCE.getControllerServiceDmaapDrsubServiceConfiguration_NumberOfCdapRecords();
+
+		/**
+		 * The meta object literal for the '<em><b>Number Of Cdap Errors</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__NUMBER_OF_CDAP_ERRORS = eINSTANCE.getControllerServiceDmaapDrsubServiceConfiguration_NumberOfCdapErrors();
+
+		/**
+		 * The meta object literal for the '<em><b>Hdfs Uri</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_URI = eINSTANCE.getControllerServiceDmaapDrsubServiceConfiguration_HdfsUri();
+
+		/**
+		 * The meta object literal for the '<em><b>Hdfs Uri Descr</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_URI_DESCR = eINSTANCE.getControllerServiceDmaapDrsubServiceConfiguration_HdfsUriDescr();
+
+		/**
+		 * The meta object literal for the '<em><b>Hdfs Persist Loc</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_PERSIST_LOC = eINSTANCE.getControllerServiceDmaapDrsubServiceConfiguration_HdfsPersistLoc();
+
+		/**
+		 * The meta object literal for the '<em><b>Hdfs Persist Loc Descr</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_PERSIST_LOC_DESCR = eINSTANCE.getControllerServiceDmaapDrsubServiceConfiguration_HdfsPersistLocDescr();
+
+		/**
+		 * The meta object literal for the '<em><b>Dmaap Conf File</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_CONF_FILE = eINSTANCE.getControllerServiceDmaapDrsubServiceConfiguration_DmaapConfFile();
+
+		/**
+		 * The meta object literal for the '<em><b>Dmaap Conf File Descr</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_CONF_FILE_DESCR = eINSTANCE.getControllerServiceDmaapDrsubServiceConfiguration_DmaapConfFileDescr();
+
+		/**
+		 * The meta object literal for the '<em><b>Dmaap Streamid</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_STREAMID = eINSTANCE.getControllerServiceDmaapDrsubServiceConfiguration_DmaapStreamid();
+
+		/**
+		 * The meta object literal for the '<em><b>Dmaap Streamid Descr</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_STREAMID_DESCR = eINSTANCE.getControllerServiceDmaapDrsubServiceConfiguration_DmaapStreamidDescr();
+
+	}
+
+} //ServicePackage
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/impl/ControllerServiceDmaapDrsubServiceConfigurationImpl.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/impl/ControllerServiceDmaapDrsubServiceConfigurationImpl.java
new file mode 100644
index 0000000..e0b228c
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/impl/ControllerServiceDmaapDrsubServiceConfigurationImpl.java
@@ -0,0 +1,723 @@
+
+/*-
+ * ============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.service.dmaap.drsub.service.impl;
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration;
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage;
+import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Controller Service Dmaap Drsub Service Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceConfigurationImpl#getCdapUrl <em>Cdap Url</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceConfigurationImpl#getNumberOfCdapRecords <em>Number Of Cdap Records</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceConfigurationImpl#getNumberOfCdapErrors <em>Number Of Cdap Errors</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceConfigurationImpl#getHdfsUri <em>Hdfs Uri</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceConfigurationImpl#getHdfsUriDescr <em>Hdfs Uri Descr</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceConfigurationImpl#getHdfsPersistLoc <em>Hdfs Persist Loc</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceConfigurationImpl#getHdfsPersistLocDescr <em>Hdfs Persist Loc Descr</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceConfigurationImpl#getDmaapConfFile <em>Dmaap Conf File</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceConfigurationImpl#getDmaapConfFileDescr <em>Dmaap Conf File Descr</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceConfigurationImpl#getDmaapStreamid <em>Dmaap Streamid</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceConfigurationImpl#getDmaapStreamidDescr <em>Dmaap Streamid Descr</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ControllerServiceDmaapDrsubServiceConfigurationImpl extends MinimalEObjectImpl.Container implements ControllerServiceDmaapDrsubServiceConfiguration {
+	/**
+	 * The default value of the '{@link #getCdapUrl() <em>Cdap Url</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCdapUrl()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String CDAP_URL_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getCdapUrl() <em>Cdap Url</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCdapUrl()
+	 * @generated
+	 * @ordered
+	 */
+	protected String cdapUrl = CDAP_URL_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getNumberOfCdapRecords() <em>Number Of Cdap Records</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getNumberOfCdapRecords()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final IncreasingULongMetricAttribute NUMBER_OF_CDAP_RECORDS_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getNumberOfCdapRecords() <em>Number Of Cdap Records</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getNumberOfCdapRecords()
+	 * @generated
+	 * @ordered
+	 */
+	protected IncreasingULongMetricAttribute numberOfCdapRecords = NUMBER_OF_CDAP_RECORDS_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getNumberOfCdapErrors() <em>Number Of Cdap Errors</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getNumberOfCdapErrors()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final IncreasingULongMetricAttribute NUMBER_OF_CDAP_ERRORS_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getNumberOfCdapErrors() <em>Number Of Cdap Errors</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getNumberOfCdapErrors()
+	 * @generated
+	 * @ordered
+	 */
+	protected IncreasingULongMetricAttribute numberOfCdapErrors = NUMBER_OF_CDAP_ERRORS_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getHdfsUri() <em>Hdfs Uri</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHdfsUri()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String HDFS_URI_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getHdfsUri() <em>Hdfs Uri</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHdfsUri()
+	 * @generated
+	 * @ordered
+	 */
+	protected String hdfsUri = HDFS_URI_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getHdfsUriDescr() <em>Hdfs Uri Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHdfsUriDescr()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String HDFS_URI_DESCR_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getHdfsUriDescr() <em>Hdfs Uri Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHdfsUriDescr()
+	 * @generated
+	 * @ordered
+	 */
+	protected String hdfsUriDescr = HDFS_URI_DESCR_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getHdfsPersistLoc() <em>Hdfs Persist Loc</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHdfsPersistLoc()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String HDFS_PERSIST_LOC_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getHdfsPersistLoc() <em>Hdfs Persist Loc</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHdfsPersistLoc()
+	 * @generated
+	 * @ordered
+	 */
+	protected String hdfsPersistLoc = HDFS_PERSIST_LOC_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getHdfsPersistLocDescr() <em>Hdfs Persist Loc Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHdfsPersistLocDescr()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String HDFS_PERSIST_LOC_DESCR_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getHdfsPersistLocDescr() <em>Hdfs Persist Loc Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHdfsPersistLocDescr()
+	 * @generated
+	 * @ordered
+	 */
+	protected String hdfsPersistLocDescr = HDFS_PERSIST_LOC_DESCR_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDmaapConfFile() <em>Dmaap Conf File</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapConfFile()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DMAAP_CONF_FILE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDmaapConfFile() <em>Dmaap Conf File</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapConfFile()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dmaapConfFile = DMAAP_CONF_FILE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDmaapConfFileDescr() <em>Dmaap Conf File Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapConfFileDescr()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DMAAP_CONF_FILE_DESCR_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDmaapConfFileDescr() <em>Dmaap Conf File Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapConfFileDescr()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dmaapConfFileDescr = DMAAP_CONF_FILE_DESCR_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDmaapStreamid() <em>Dmaap Streamid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapStreamid()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DMAAP_STREAMID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDmaapStreamid() <em>Dmaap Streamid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapStreamid()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dmaapStreamid = DMAAP_STREAMID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDmaapStreamidDescr() <em>Dmaap Streamid Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapStreamidDescr()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DMAAP_STREAMID_DESCR_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDmaapStreamidDescr() <em>Dmaap Streamid Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapStreamidDescr()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dmaapStreamidDescr = DMAAP_STREAMID_DESCR_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ControllerServiceDmaapDrsubServiceConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ServicePackage.Literals.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getCdapUrl() {
+		return cdapUrl;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCdapUrl(String newCdapUrl) {
+		String oldCdapUrl = cdapUrl;
+		cdapUrl = newCdapUrl;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__CDAP_URL, oldCdapUrl, cdapUrl));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IncreasingULongMetricAttribute getNumberOfCdapRecords() {
+		return numberOfCdapRecords;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setNumberOfCdapRecords(IncreasingULongMetricAttribute newNumberOfCdapRecords) {
+		IncreasingULongMetricAttribute oldNumberOfCdapRecords = numberOfCdapRecords;
+		numberOfCdapRecords = newNumberOfCdapRecords;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__NUMBER_OF_CDAP_RECORDS, oldNumberOfCdapRecords, numberOfCdapRecords));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IncreasingULongMetricAttribute getNumberOfCdapErrors() {
+		return numberOfCdapErrors;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setNumberOfCdapErrors(IncreasingULongMetricAttribute newNumberOfCdapErrors) {
+		IncreasingULongMetricAttribute oldNumberOfCdapErrors = numberOfCdapErrors;
+		numberOfCdapErrors = newNumberOfCdapErrors;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__NUMBER_OF_CDAP_ERRORS, oldNumberOfCdapErrors, numberOfCdapErrors));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getHdfsUri() {
+		return hdfsUri;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHdfsUri(String newHdfsUri) {
+		String oldHdfsUri = hdfsUri;
+		hdfsUri = newHdfsUri;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_URI, oldHdfsUri, hdfsUri));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getHdfsUriDescr() {
+		return hdfsUriDescr;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHdfsUriDescr(String newHdfsUriDescr) {
+		String oldHdfsUriDescr = hdfsUriDescr;
+		hdfsUriDescr = newHdfsUriDescr;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_URI_DESCR, oldHdfsUriDescr, hdfsUriDescr));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getHdfsPersistLoc() {
+		return hdfsPersistLoc;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHdfsPersistLoc(String newHdfsPersistLoc) {
+		String oldHdfsPersistLoc = hdfsPersistLoc;
+		hdfsPersistLoc = newHdfsPersistLoc;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_PERSIST_LOC, oldHdfsPersistLoc, hdfsPersistLoc));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getHdfsPersistLocDescr() {
+		return hdfsPersistLocDescr;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHdfsPersistLocDescr(String newHdfsPersistLocDescr) {
+		String oldHdfsPersistLocDescr = hdfsPersistLocDescr;
+		hdfsPersistLocDescr = newHdfsPersistLocDescr;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_PERSIST_LOC_DESCR, oldHdfsPersistLocDescr, hdfsPersistLocDescr));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDmaapConfFile() {
+		return dmaapConfFile;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDmaapConfFile(String newDmaapConfFile) {
+		String oldDmaapConfFile = dmaapConfFile;
+		dmaapConfFile = newDmaapConfFile;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_CONF_FILE, oldDmaapConfFile, dmaapConfFile));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDmaapConfFileDescr() {
+		return dmaapConfFileDescr;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDmaapConfFileDescr(String newDmaapConfFileDescr) {
+		String oldDmaapConfFileDescr = dmaapConfFileDescr;
+		dmaapConfFileDescr = newDmaapConfFileDescr;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_CONF_FILE_DESCR, oldDmaapConfFileDescr, dmaapConfFileDescr));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDmaapStreamid() {
+		return dmaapStreamid;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDmaapStreamid(String newDmaapStreamid) {
+		String oldDmaapStreamid = dmaapStreamid;
+		dmaapStreamid = newDmaapStreamid;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_STREAMID, oldDmaapStreamid, dmaapStreamid));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDmaapStreamidDescr() {
+		return dmaapStreamidDescr;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDmaapStreamidDescr(String newDmaapStreamidDescr) {
+		String oldDmaapStreamidDescr = dmaapStreamidDescr;
+		dmaapStreamidDescr = newDmaapStreamidDescr;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_STREAMID_DESCR, oldDmaapStreamidDescr, dmaapStreamidDescr));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__CDAP_URL:
+				return getCdapUrl();
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__NUMBER_OF_CDAP_RECORDS:
+				return getNumberOfCdapRecords();
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__NUMBER_OF_CDAP_ERRORS:
+				return getNumberOfCdapErrors();
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_URI:
+				return getHdfsUri();
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_URI_DESCR:
+				return getHdfsUriDescr();
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_PERSIST_LOC:
+				return getHdfsPersistLoc();
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_PERSIST_LOC_DESCR:
+				return getHdfsPersistLocDescr();
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_CONF_FILE:
+				return getDmaapConfFile();
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_CONF_FILE_DESCR:
+				return getDmaapConfFileDescr();
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_STREAMID:
+				return getDmaapStreamid();
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_STREAMID_DESCR:
+				return getDmaapStreamidDescr();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__CDAP_URL:
+				setCdapUrl((String)newValue);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__NUMBER_OF_CDAP_RECORDS:
+				setNumberOfCdapRecords((IncreasingULongMetricAttribute)newValue);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__NUMBER_OF_CDAP_ERRORS:
+				setNumberOfCdapErrors((IncreasingULongMetricAttribute)newValue);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_URI:
+				setHdfsUri((String)newValue);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_URI_DESCR:
+				setHdfsUriDescr((String)newValue);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_PERSIST_LOC:
+				setHdfsPersistLoc((String)newValue);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_PERSIST_LOC_DESCR:
+				setHdfsPersistLocDescr((String)newValue);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_CONF_FILE:
+				setDmaapConfFile((String)newValue);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_CONF_FILE_DESCR:
+				setDmaapConfFileDescr((String)newValue);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_STREAMID:
+				setDmaapStreamid((String)newValue);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_STREAMID_DESCR:
+				setDmaapStreamidDescr((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__CDAP_URL:
+				setCdapUrl(CDAP_URL_EDEFAULT);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__NUMBER_OF_CDAP_RECORDS:
+				setNumberOfCdapRecords(NUMBER_OF_CDAP_RECORDS_EDEFAULT);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__NUMBER_OF_CDAP_ERRORS:
+				setNumberOfCdapErrors(NUMBER_OF_CDAP_ERRORS_EDEFAULT);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_URI:
+				setHdfsUri(HDFS_URI_EDEFAULT);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_URI_DESCR:
+				setHdfsUriDescr(HDFS_URI_DESCR_EDEFAULT);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_PERSIST_LOC:
+				setHdfsPersistLoc(HDFS_PERSIST_LOC_EDEFAULT);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_PERSIST_LOC_DESCR:
+				setHdfsPersistLocDescr(HDFS_PERSIST_LOC_DESCR_EDEFAULT);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_CONF_FILE:
+				setDmaapConfFile(DMAAP_CONF_FILE_EDEFAULT);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_CONF_FILE_DESCR:
+				setDmaapConfFileDescr(DMAAP_CONF_FILE_DESCR_EDEFAULT);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_STREAMID:
+				setDmaapStreamid(DMAAP_STREAMID_EDEFAULT);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_STREAMID_DESCR:
+				setDmaapStreamidDescr(DMAAP_STREAMID_DESCR_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__CDAP_URL:
+				return CDAP_URL_EDEFAULT == null ? cdapUrl != null : !CDAP_URL_EDEFAULT.equals(cdapUrl);
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__NUMBER_OF_CDAP_RECORDS:
+				return NUMBER_OF_CDAP_RECORDS_EDEFAULT == null ? numberOfCdapRecords != null : !NUMBER_OF_CDAP_RECORDS_EDEFAULT.equals(numberOfCdapRecords);
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__NUMBER_OF_CDAP_ERRORS:
+				return NUMBER_OF_CDAP_ERRORS_EDEFAULT == null ? numberOfCdapErrors != null : !NUMBER_OF_CDAP_ERRORS_EDEFAULT.equals(numberOfCdapErrors);
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_URI:
+				return HDFS_URI_EDEFAULT == null ? hdfsUri != null : !HDFS_URI_EDEFAULT.equals(hdfsUri);
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_URI_DESCR:
+				return HDFS_URI_DESCR_EDEFAULT == null ? hdfsUriDescr != null : !HDFS_URI_DESCR_EDEFAULT.equals(hdfsUriDescr);
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_PERSIST_LOC:
+				return HDFS_PERSIST_LOC_EDEFAULT == null ? hdfsPersistLoc != null : !HDFS_PERSIST_LOC_EDEFAULT.equals(hdfsPersistLoc);
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_PERSIST_LOC_DESCR:
+				return HDFS_PERSIST_LOC_DESCR_EDEFAULT == null ? hdfsPersistLocDescr != null : !HDFS_PERSIST_LOC_DESCR_EDEFAULT.equals(hdfsPersistLocDescr);
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_CONF_FILE:
+				return DMAAP_CONF_FILE_EDEFAULT == null ? dmaapConfFile != null : !DMAAP_CONF_FILE_EDEFAULT.equals(dmaapConfFile);
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_CONF_FILE_DESCR:
+				return DMAAP_CONF_FILE_DESCR_EDEFAULT == null ? dmaapConfFileDescr != null : !DMAAP_CONF_FILE_DESCR_EDEFAULT.equals(dmaapConfFileDescr);
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_STREAMID:
+				return DMAAP_STREAMID_EDEFAULT == null ? dmaapStreamid != null : !DMAAP_STREAMID_EDEFAULT.equals(dmaapStreamid);
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_STREAMID_DESCR:
+				return DMAAP_STREAMID_DESCR_EDEFAULT == null ? dmaapStreamidDescr != null : !DMAAP_STREAMID_DESCR_EDEFAULT.equals(dmaapStreamidDescr);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (cdapUrl: ");
+		result.append(cdapUrl);
+		result.append(", numberOfCdapRecords: ");
+		result.append(numberOfCdapRecords);
+		result.append(", numberOfCdapErrors: ");
+		result.append(numberOfCdapErrors);
+		result.append(", hdfsUri: ");
+		result.append(hdfsUri);
+		result.append(", hdfsUriDescr: ");
+		result.append(hdfsUriDescr);
+		result.append(", hdfsPersistLoc: ");
+		result.append(hdfsPersistLoc);
+		result.append(", hdfsPersistLocDescr: ");
+		result.append(hdfsPersistLocDescr);
+		result.append(", dmaapConfFile: ");
+		result.append(dmaapConfFile);
+		result.append(", dmaapConfFileDescr: ");
+		result.append(dmaapConfFileDescr);
+		result.append(", dmaapStreamid: ");
+		result.append(dmaapStreamid);
+		result.append(", dmaapStreamidDescr: ");
+		result.append(dmaapStreamidDescr);
+		result.append(')');
+		return result.toString();
+	}
+
+} //ControllerServiceDmaapDrsubServiceConfigurationImpl
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/impl/ControllerServiceDmaapDrsubServiceImpl.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/impl/ControllerServiceDmaapDrsubServiceImpl.java
new file mode 100644
index 0000000..4da97f0
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/impl/ControllerServiceDmaapDrsubServiceImpl.java
@@ -0,0 +1,60 @@
+
+/*-
+ * ============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.service.dmaap.drsub.service.impl;
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubService;
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage;
+import org.openecomp.dcae.controller.service.vm.impl.VirtualMachineServiceImpl;
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Controller Service Dmaap Drsub Service</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class ControllerServiceDmaapDrsubServiceImpl extends VirtualMachineServiceImpl implements ControllerServiceDmaapDrsubService {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ControllerServiceDmaapDrsubServiceImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ServicePackage.Literals.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE;
+	}
+
+} //ControllerServiceDmaapDrsubServiceImpl
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/impl/ControllerServiceDmaapDrsubServiceInstanceImpl.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/impl/ControllerServiceDmaapDrsubServiceInstanceImpl.java
new file mode 100644
index 0000000..e328f52
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/impl/ControllerServiceDmaapDrsubServiceInstanceImpl.java
@@ -0,0 +1,892 @@
+
+/*-
+ * ============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.service.dmaap.drsub.service.impl;
+
+import org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterServiceInstance;
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration;
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceInstance;
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage;
+import org.openecomp.dcae.controller.service.vm.impl.VirtualMachineServiceInstanceImpl;
+import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Controller Service Dmaap Drsub Service Instance</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceInstanceImpl#getCdapUrl <em>Cdap Url</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceInstanceImpl#getNumberOfCdapRecords <em>Number Of Cdap Records</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceInstanceImpl#getNumberOfCdapErrors <em>Number Of Cdap Errors</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceInstanceImpl#getHdfsUri <em>Hdfs Uri</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceInstanceImpl#getHdfsUriDescr <em>Hdfs Uri Descr</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceInstanceImpl#getHdfsPersistLoc <em>Hdfs Persist Loc</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceInstanceImpl#getHdfsPersistLocDescr <em>Hdfs Persist Loc Descr</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceInstanceImpl#getDmaapConfFile <em>Dmaap Conf File</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceInstanceImpl#getDmaapConfFileDescr <em>Dmaap Conf File Descr</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceInstanceImpl#getDmaapStreamid <em>Dmaap Streamid</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceInstanceImpl#getDmaapStreamidDescr <em>Dmaap Streamid Descr</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceInstanceImpl#getCdapClusterInstance <em>Cdap Cluster Instance</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceInstanceImpl#getCdapServiceName <em>Cdap Service Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ControllerServiceDmaapDrsubServiceInstanceImpl extends VirtualMachineServiceInstanceImpl implements ControllerServiceDmaapDrsubServiceInstance {
+	/**
+	 * The default value of the '{@link #getCdapUrl() <em>Cdap Url</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCdapUrl()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String CDAP_URL_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getCdapUrl() <em>Cdap Url</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCdapUrl()
+	 * @generated
+	 * @ordered
+	 */
+	protected String cdapUrl = CDAP_URL_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getNumberOfCdapRecords() <em>Number Of Cdap Records</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getNumberOfCdapRecords()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final IncreasingULongMetricAttribute NUMBER_OF_CDAP_RECORDS_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getNumberOfCdapRecords() <em>Number Of Cdap Records</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getNumberOfCdapRecords()
+	 * @generated
+	 * @ordered
+	 */
+	protected IncreasingULongMetricAttribute numberOfCdapRecords = NUMBER_OF_CDAP_RECORDS_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getNumberOfCdapErrors() <em>Number Of Cdap Errors</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getNumberOfCdapErrors()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final IncreasingULongMetricAttribute NUMBER_OF_CDAP_ERRORS_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getNumberOfCdapErrors() <em>Number Of Cdap Errors</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getNumberOfCdapErrors()
+	 * @generated
+	 * @ordered
+	 */
+	protected IncreasingULongMetricAttribute numberOfCdapErrors = NUMBER_OF_CDAP_ERRORS_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getHdfsUri() <em>Hdfs Uri</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHdfsUri()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String HDFS_URI_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getHdfsUri() <em>Hdfs Uri</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHdfsUri()
+	 * @generated
+	 * @ordered
+	 */
+	protected String hdfsUri = HDFS_URI_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getHdfsUriDescr() <em>Hdfs Uri Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHdfsUriDescr()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String HDFS_URI_DESCR_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getHdfsUriDescr() <em>Hdfs Uri Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHdfsUriDescr()
+	 * @generated
+	 * @ordered
+	 */
+	protected String hdfsUriDescr = HDFS_URI_DESCR_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getHdfsPersistLoc() <em>Hdfs Persist Loc</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHdfsPersistLoc()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String HDFS_PERSIST_LOC_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getHdfsPersistLoc() <em>Hdfs Persist Loc</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHdfsPersistLoc()
+	 * @generated
+	 * @ordered
+	 */
+	protected String hdfsPersistLoc = HDFS_PERSIST_LOC_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getHdfsPersistLocDescr() <em>Hdfs Persist Loc Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHdfsPersistLocDescr()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String HDFS_PERSIST_LOC_DESCR_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getHdfsPersistLocDescr() <em>Hdfs Persist Loc Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHdfsPersistLocDescr()
+	 * @generated
+	 * @ordered
+	 */
+	protected String hdfsPersistLocDescr = HDFS_PERSIST_LOC_DESCR_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDmaapConfFile() <em>Dmaap Conf File</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapConfFile()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DMAAP_CONF_FILE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDmaapConfFile() <em>Dmaap Conf File</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapConfFile()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dmaapConfFile = DMAAP_CONF_FILE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDmaapConfFileDescr() <em>Dmaap Conf File Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapConfFileDescr()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DMAAP_CONF_FILE_DESCR_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDmaapConfFileDescr() <em>Dmaap Conf File Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapConfFileDescr()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dmaapConfFileDescr = DMAAP_CONF_FILE_DESCR_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDmaapStreamid() <em>Dmaap Streamid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapStreamid()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DMAAP_STREAMID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDmaapStreamid() <em>Dmaap Streamid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapStreamid()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dmaapStreamid = DMAAP_STREAMID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDmaapStreamidDescr() <em>Dmaap Streamid Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapStreamidDescr()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DMAAP_STREAMID_DESCR_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDmaapStreamidDescr() <em>Dmaap Streamid Descr</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapStreamidDescr()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dmaapStreamidDescr = DMAAP_STREAMID_DESCR_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getCdapClusterInstance() <em>Cdap Cluster Instance</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCdapClusterInstance()
+	 * @generated
+	 * @ordered
+	 */
+	protected CdapClusterServiceInstance cdapClusterInstance;
+
+	/**
+	 * The default value of the '{@link #getCdapServiceName() <em>Cdap Service Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCdapServiceName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String CDAP_SERVICE_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getCdapServiceName() <em>Cdap Service Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCdapServiceName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String cdapServiceName = CDAP_SERVICE_NAME_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ControllerServiceDmaapDrsubServiceInstanceImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ServicePackage.Literals.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getCdapUrl() {
+		return cdapUrl;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCdapUrl(String newCdapUrl) {
+		String oldCdapUrl = cdapUrl;
+		cdapUrl = newCdapUrl;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CDAP_URL, oldCdapUrl, cdapUrl));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IncreasingULongMetricAttribute getNumberOfCdapRecords() {
+		return numberOfCdapRecords;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setNumberOfCdapRecords(IncreasingULongMetricAttribute newNumberOfCdapRecords) {
+		IncreasingULongMetricAttribute oldNumberOfCdapRecords = numberOfCdapRecords;
+		numberOfCdapRecords = newNumberOfCdapRecords;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__NUMBER_OF_CDAP_RECORDS, oldNumberOfCdapRecords, numberOfCdapRecords));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IncreasingULongMetricAttribute getNumberOfCdapErrors() {
+		return numberOfCdapErrors;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setNumberOfCdapErrors(IncreasingULongMetricAttribute newNumberOfCdapErrors) {
+		IncreasingULongMetricAttribute oldNumberOfCdapErrors = numberOfCdapErrors;
+		numberOfCdapErrors = newNumberOfCdapErrors;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__NUMBER_OF_CDAP_ERRORS, oldNumberOfCdapErrors, numberOfCdapErrors));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getHdfsUri() {
+		return hdfsUri;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHdfsUri(String newHdfsUri) {
+		String oldHdfsUri = hdfsUri;
+		hdfsUri = newHdfsUri;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_URI, oldHdfsUri, hdfsUri));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getHdfsUriDescr() {
+		return hdfsUriDescr;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHdfsUriDescr(String newHdfsUriDescr) {
+		String oldHdfsUriDescr = hdfsUriDescr;
+		hdfsUriDescr = newHdfsUriDescr;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_URI_DESCR, oldHdfsUriDescr, hdfsUriDescr));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getHdfsPersistLoc() {
+		return hdfsPersistLoc;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHdfsPersistLoc(String newHdfsPersistLoc) {
+		String oldHdfsPersistLoc = hdfsPersistLoc;
+		hdfsPersistLoc = newHdfsPersistLoc;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_PERSIST_LOC, oldHdfsPersistLoc, hdfsPersistLoc));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getHdfsPersistLocDescr() {
+		return hdfsPersistLocDescr;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHdfsPersistLocDescr(String newHdfsPersistLocDescr) {
+		String oldHdfsPersistLocDescr = hdfsPersistLocDescr;
+		hdfsPersistLocDescr = newHdfsPersistLocDescr;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_PERSIST_LOC_DESCR, oldHdfsPersistLocDescr, hdfsPersistLocDescr));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDmaapConfFile() {
+		return dmaapConfFile;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDmaapConfFile(String newDmaapConfFile) {
+		String oldDmaapConfFile = dmaapConfFile;
+		dmaapConfFile = newDmaapConfFile;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_CONF_FILE, oldDmaapConfFile, dmaapConfFile));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDmaapConfFileDescr() {
+		return dmaapConfFileDescr;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDmaapConfFileDescr(String newDmaapConfFileDescr) {
+		String oldDmaapConfFileDescr = dmaapConfFileDescr;
+		dmaapConfFileDescr = newDmaapConfFileDescr;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_CONF_FILE_DESCR, oldDmaapConfFileDescr, dmaapConfFileDescr));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDmaapStreamid() {
+		return dmaapStreamid;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDmaapStreamid(String newDmaapStreamid) {
+		String oldDmaapStreamid = dmaapStreamid;
+		dmaapStreamid = newDmaapStreamid;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_STREAMID, oldDmaapStreamid, dmaapStreamid));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDmaapStreamidDescr() {
+		return dmaapStreamidDescr;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDmaapStreamidDescr(String newDmaapStreamidDescr) {
+		String oldDmaapStreamidDescr = dmaapStreamidDescr;
+		dmaapStreamidDescr = newDmaapStreamidDescr;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_STREAMID_DESCR, oldDmaapStreamidDescr, dmaapStreamidDescr));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapClusterServiceInstance getCdapClusterInstance() {
+		if (cdapClusterInstance != null && cdapClusterInstance.eIsProxy()) {
+			InternalEObject oldCdapClusterInstance = (InternalEObject)cdapClusterInstance;
+			cdapClusterInstance = (CdapClusterServiceInstance)eResolveProxy(oldCdapClusterInstance);
+			if (cdapClusterInstance != oldCdapClusterInstance) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CDAP_CLUSTER_INSTANCE, oldCdapClusterInstance, cdapClusterInstance));
+			}
+		}
+		return cdapClusterInstance;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapClusterServiceInstance basicGetCdapClusterInstance() {
+		return cdapClusterInstance;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCdapClusterInstance(CdapClusterServiceInstance newCdapClusterInstance) {
+		CdapClusterServiceInstance oldCdapClusterInstance = cdapClusterInstance;
+		cdapClusterInstance = newCdapClusterInstance;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CDAP_CLUSTER_INSTANCE, oldCdapClusterInstance, cdapClusterInstance));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getCdapServiceName() {
+		return cdapServiceName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCdapServiceName(String newCdapServiceName) {
+		String oldCdapServiceName = cdapServiceName;
+		cdapServiceName = newCdapServiceName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CDAP_SERVICE_NAME, oldCdapServiceName, cdapServiceName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CDAP_URL:
+				return getCdapUrl();
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__NUMBER_OF_CDAP_RECORDS:
+				return getNumberOfCdapRecords();
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__NUMBER_OF_CDAP_ERRORS:
+				return getNumberOfCdapErrors();
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_URI:
+				return getHdfsUri();
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_URI_DESCR:
+				return getHdfsUriDescr();
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_PERSIST_LOC:
+				return getHdfsPersistLoc();
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_PERSIST_LOC_DESCR:
+				return getHdfsPersistLocDescr();
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_CONF_FILE:
+				return getDmaapConfFile();
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_CONF_FILE_DESCR:
+				return getDmaapConfFileDescr();
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_STREAMID:
+				return getDmaapStreamid();
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_STREAMID_DESCR:
+				return getDmaapStreamidDescr();
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CDAP_CLUSTER_INSTANCE:
+				if (resolve) return getCdapClusterInstance();
+				return basicGetCdapClusterInstance();
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CDAP_SERVICE_NAME:
+				return getCdapServiceName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CDAP_URL:
+				setCdapUrl((String)newValue);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__NUMBER_OF_CDAP_RECORDS:
+				setNumberOfCdapRecords((IncreasingULongMetricAttribute)newValue);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__NUMBER_OF_CDAP_ERRORS:
+				setNumberOfCdapErrors((IncreasingULongMetricAttribute)newValue);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_URI:
+				setHdfsUri((String)newValue);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_URI_DESCR:
+				setHdfsUriDescr((String)newValue);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_PERSIST_LOC:
+				setHdfsPersistLoc((String)newValue);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_PERSIST_LOC_DESCR:
+				setHdfsPersistLocDescr((String)newValue);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_CONF_FILE:
+				setDmaapConfFile((String)newValue);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_CONF_FILE_DESCR:
+				setDmaapConfFileDescr((String)newValue);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_STREAMID:
+				setDmaapStreamid((String)newValue);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_STREAMID_DESCR:
+				setDmaapStreamidDescr((String)newValue);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CDAP_CLUSTER_INSTANCE:
+				setCdapClusterInstance((CdapClusterServiceInstance)newValue);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CDAP_SERVICE_NAME:
+				setCdapServiceName((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CDAP_URL:
+				setCdapUrl(CDAP_URL_EDEFAULT);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__NUMBER_OF_CDAP_RECORDS:
+				setNumberOfCdapRecords(NUMBER_OF_CDAP_RECORDS_EDEFAULT);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__NUMBER_OF_CDAP_ERRORS:
+				setNumberOfCdapErrors(NUMBER_OF_CDAP_ERRORS_EDEFAULT);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_URI:
+				setHdfsUri(HDFS_URI_EDEFAULT);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_URI_DESCR:
+				setHdfsUriDescr(HDFS_URI_DESCR_EDEFAULT);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_PERSIST_LOC:
+				setHdfsPersistLoc(HDFS_PERSIST_LOC_EDEFAULT);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_PERSIST_LOC_DESCR:
+				setHdfsPersistLocDescr(HDFS_PERSIST_LOC_DESCR_EDEFAULT);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_CONF_FILE:
+				setDmaapConfFile(DMAAP_CONF_FILE_EDEFAULT);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_CONF_FILE_DESCR:
+				setDmaapConfFileDescr(DMAAP_CONF_FILE_DESCR_EDEFAULT);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_STREAMID:
+				setDmaapStreamid(DMAAP_STREAMID_EDEFAULT);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_STREAMID_DESCR:
+				setDmaapStreamidDescr(DMAAP_STREAMID_DESCR_EDEFAULT);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CDAP_CLUSTER_INSTANCE:
+				setCdapClusterInstance((CdapClusterServiceInstance)null);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CDAP_SERVICE_NAME:
+				setCdapServiceName(CDAP_SERVICE_NAME_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CDAP_URL:
+				return CDAP_URL_EDEFAULT == null ? cdapUrl != null : !CDAP_URL_EDEFAULT.equals(cdapUrl);
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__NUMBER_OF_CDAP_RECORDS:
+				return NUMBER_OF_CDAP_RECORDS_EDEFAULT == null ? numberOfCdapRecords != null : !NUMBER_OF_CDAP_RECORDS_EDEFAULT.equals(numberOfCdapRecords);
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__NUMBER_OF_CDAP_ERRORS:
+				return NUMBER_OF_CDAP_ERRORS_EDEFAULT == null ? numberOfCdapErrors != null : !NUMBER_OF_CDAP_ERRORS_EDEFAULT.equals(numberOfCdapErrors);
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_URI:
+				return HDFS_URI_EDEFAULT == null ? hdfsUri != null : !HDFS_URI_EDEFAULT.equals(hdfsUri);
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_URI_DESCR:
+				return HDFS_URI_DESCR_EDEFAULT == null ? hdfsUriDescr != null : !HDFS_URI_DESCR_EDEFAULT.equals(hdfsUriDescr);
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_PERSIST_LOC:
+				return HDFS_PERSIST_LOC_EDEFAULT == null ? hdfsPersistLoc != null : !HDFS_PERSIST_LOC_EDEFAULT.equals(hdfsPersistLoc);
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_PERSIST_LOC_DESCR:
+				return HDFS_PERSIST_LOC_DESCR_EDEFAULT == null ? hdfsPersistLocDescr != null : !HDFS_PERSIST_LOC_DESCR_EDEFAULT.equals(hdfsPersistLocDescr);
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_CONF_FILE:
+				return DMAAP_CONF_FILE_EDEFAULT == null ? dmaapConfFile != null : !DMAAP_CONF_FILE_EDEFAULT.equals(dmaapConfFile);
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_CONF_FILE_DESCR:
+				return DMAAP_CONF_FILE_DESCR_EDEFAULT == null ? dmaapConfFileDescr != null : !DMAAP_CONF_FILE_DESCR_EDEFAULT.equals(dmaapConfFileDescr);
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_STREAMID:
+				return DMAAP_STREAMID_EDEFAULT == null ? dmaapStreamid != null : !DMAAP_STREAMID_EDEFAULT.equals(dmaapStreamid);
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_STREAMID_DESCR:
+				return DMAAP_STREAMID_DESCR_EDEFAULT == null ? dmaapStreamidDescr != null : !DMAAP_STREAMID_DESCR_EDEFAULT.equals(dmaapStreamidDescr);
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CDAP_CLUSTER_INSTANCE:
+				return cdapClusterInstance != null;
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CDAP_SERVICE_NAME:
+				return CDAP_SERVICE_NAME_EDEFAULT == null ? cdapServiceName != null : !CDAP_SERVICE_NAME_EDEFAULT.equals(cdapServiceName);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == ControllerServiceDmaapDrsubServiceConfiguration.class) {
+			switch (derivedFeatureID) {
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CDAP_URL: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__CDAP_URL;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__NUMBER_OF_CDAP_RECORDS: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__NUMBER_OF_CDAP_RECORDS;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__NUMBER_OF_CDAP_ERRORS: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__NUMBER_OF_CDAP_ERRORS;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_URI: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_URI;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_URI_DESCR: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_URI_DESCR;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_PERSIST_LOC: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_PERSIST_LOC;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_PERSIST_LOC_DESCR: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_PERSIST_LOC_DESCR;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_CONF_FILE: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_CONF_FILE;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_CONF_FILE_DESCR: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_CONF_FILE_DESCR;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_STREAMID: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_STREAMID;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_STREAMID_DESCR: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_STREAMID_DESCR;
+				default: return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == ControllerServiceDmaapDrsubServiceConfiguration.class) {
+			switch (baseFeatureID) {
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__CDAP_URL: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CDAP_URL;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__NUMBER_OF_CDAP_RECORDS: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__NUMBER_OF_CDAP_RECORDS;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__NUMBER_OF_CDAP_ERRORS: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__NUMBER_OF_CDAP_ERRORS;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_URI: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_URI;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_URI_DESCR: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_URI_DESCR;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_PERSIST_LOC: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_PERSIST_LOC;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_PERSIST_LOC_DESCR: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__HDFS_PERSIST_LOC_DESCR;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_CONF_FILE: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_CONF_FILE;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_CONF_FILE_DESCR: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_CONF_FILE_DESCR;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_STREAMID: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_STREAMID;
+				case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_STREAMID_DESCR: return ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__DMAAP_STREAMID_DESCR;
+				default: return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (cdapUrl: ");
+		result.append(cdapUrl);
+		result.append(", numberOfCdapRecords: ");
+		result.append(numberOfCdapRecords);
+		result.append(", numberOfCdapErrors: ");
+		result.append(numberOfCdapErrors);
+		result.append(", hdfsUri: ");
+		result.append(hdfsUri);
+		result.append(", hdfsUriDescr: ");
+		result.append(hdfsUriDescr);
+		result.append(", hdfsPersistLoc: ");
+		result.append(hdfsPersistLoc);
+		result.append(", hdfsPersistLocDescr: ");
+		result.append(hdfsPersistLocDescr);
+		result.append(", dmaapConfFile: ");
+		result.append(dmaapConfFile);
+		result.append(", dmaapConfFileDescr: ");
+		result.append(dmaapConfFileDescr);
+		result.append(", dmaapStreamid: ");
+		result.append(dmaapStreamid);
+		result.append(", dmaapStreamidDescr: ");
+		result.append(dmaapStreamidDescr);
+		result.append(", cdapServiceName: ");
+		result.append(cdapServiceName);
+		result.append(')');
+		return result.toString();
+	}
+
+} //ControllerServiceDmaapDrsubServiceInstanceImpl
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/impl/ServiceFactoryImpl.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/impl/ServiceFactoryImpl.java
new file mode 100644
index 0000000..2f97110
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/impl/ServiceFactoryImpl.java
@@ -0,0 +1,138 @@
+
+/*-
+ * ============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.service.dmaap.drsub.service.impl;
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.*;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ServiceFactoryImpl extends EFactoryImpl implements ServiceFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static ServiceFactory init() {
+		try {
+			ServiceFactory theServiceFactory = (ServiceFactory)EPackage.Registry.INSTANCE.getEFactory(ServicePackage.eNS_URI);
+			if (theServiceFactory != null) {
+				return theServiceFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new ServiceFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ServiceFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE: return createControllerServiceDmaapDrsubService();
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE: return createControllerServiceDmaapDrsubServiceInstance();
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION: return createControllerServiceDmaapDrsubServiceConfiguration();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ControllerServiceDmaapDrsubService createControllerServiceDmaapDrsubService() {
+		ControllerServiceDmaapDrsubServiceImpl controllerServiceDmaapDrsubService = new ControllerServiceDmaapDrsubServiceImpl();
+		return controllerServiceDmaapDrsubService;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ControllerServiceDmaapDrsubServiceInstance createControllerServiceDmaapDrsubServiceInstance() {
+		ControllerServiceDmaapDrsubServiceInstanceImpl controllerServiceDmaapDrsubServiceInstance = new ControllerServiceDmaapDrsubServiceInstanceImpl();
+		return controllerServiceDmaapDrsubServiceInstance;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ControllerServiceDmaapDrsubServiceConfiguration createControllerServiceDmaapDrsubServiceConfiguration() {
+		ControllerServiceDmaapDrsubServiceConfigurationImpl controllerServiceDmaapDrsubServiceConfiguration = new ControllerServiceDmaapDrsubServiceConfigurationImpl();
+		return controllerServiceDmaapDrsubServiceConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ServicePackage getServicePackage() {
+		return (ServicePackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static ServicePackage getPackage() {
+		return ServicePackage.eINSTANCE;
+	}
+
+} //ServiceFactoryImpl
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/impl/ServicePackageImpl.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/impl/ServicePackageImpl.java
new file mode 100644
index 0000000..e958f0b
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/impl/ServicePackageImpl.java
@@ -0,0 +1,484 @@
+
+/*-
+ * ============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.service.dmaap.drsub.service.impl;
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubService;
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration;
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceInstance;
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.ServiceFactory;
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage;
+import org.openecomp.dcae.controller.service.vm.VmPackage;
+import org.openecomp.ncomp.core.CorePackage;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ServicePackageImpl extends EPackageImpl implements ServicePackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass controllerServiceDmaapDrsubServiceEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass controllerServiceDmaapDrsubServiceInstanceEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass controllerServiceDmaapDrsubServiceConfigurationEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private ServicePackageImpl() {
+		super(eNS_URI, ServiceFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link ServicePackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static ServicePackage init() {
+		if (isInited) return (ServicePackage)EPackage.Registry.INSTANCE.getEPackage(ServicePackage.eNS_URI);
+
+		// Obtain or create and register package
+		ServicePackageImpl theServicePackage = (ServicePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ServicePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ServicePackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		org.openecomp.dcae.controller.service.cdap.cluster.service.ServicePackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theServicePackage.createPackageContents();
+
+		// Initialize created meta-data
+		theServicePackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theServicePackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(ServicePackage.eNS_URI, theServicePackage);
+		return theServicePackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getControllerServiceDmaapDrsubService() {
+		return controllerServiceDmaapDrsubServiceEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getControllerServiceDmaapDrsubServiceInstance() {
+		return controllerServiceDmaapDrsubServiceInstanceEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getControllerServiceDmaapDrsubServiceInstance_CdapClusterInstance() {
+		return (EReference)controllerServiceDmaapDrsubServiceInstanceEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getControllerServiceDmaapDrsubServiceInstance_CdapServiceName() {
+		return (EAttribute)controllerServiceDmaapDrsubServiceInstanceEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getControllerServiceDmaapDrsubServiceConfiguration() {
+		return controllerServiceDmaapDrsubServiceConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getControllerServiceDmaapDrsubServiceConfiguration_CdapUrl() {
+		return (EAttribute)controllerServiceDmaapDrsubServiceConfigurationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getControllerServiceDmaapDrsubServiceConfiguration_NumberOfCdapRecords() {
+		return (EAttribute)controllerServiceDmaapDrsubServiceConfigurationEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getControllerServiceDmaapDrsubServiceConfiguration_NumberOfCdapErrors() {
+		return (EAttribute)controllerServiceDmaapDrsubServiceConfigurationEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getControllerServiceDmaapDrsubServiceConfiguration_HdfsUri() {
+		return (EAttribute)controllerServiceDmaapDrsubServiceConfigurationEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getControllerServiceDmaapDrsubServiceConfiguration_HdfsUriDescr() {
+		return (EAttribute)controllerServiceDmaapDrsubServiceConfigurationEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getControllerServiceDmaapDrsubServiceConfiguration_HdfsPersistLoc() {
+		return (EAttribute)controllerServiceDmaapDrsubServiceConfigurationEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getControllerServiceDmaapDrsubServiceConfiguration_HdfsPersistLocDescr() {
+		return (EAttribute)controllerServiceDmaapDrsubServiceConfigurationEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getControllerServiceDmaapDrsubServiceConfiguration_DmaapConfFile() {
+		return (EAttribute)controllerServiceDmaapDrsubServiceConfigurationEClass.getEStructuralFeatures().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getControllerServiceDmaapDrsubServiceConfiguration_DmaapConfFileDescr() {
+		return (EAttribute)controllerServiceDmaapDrsubServiceConfigurationEClass.getEStructuralFeatures().get(8);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getControllerServiceDmaapDrsubServiceConfiguration_DmaapStreamid() {
+		return (EAttribute)controllerServiceDmaapDrsubServiceConfigurationEClass.getEStructuralFeatures().get(9);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getControllerServiceDmaapDrsubServiceConfiguration_DmaapStreamidDescr() {
+		return (EAttribute)controllerServiceDmaapDrsubServiceConfigurationEClass.getEStructuralFeatures().get(10);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ServiceFactory getServiceFactory() {
+		return (ServiceFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		controllerServiceDmaapDrsubServiceEClass = createEClass(CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE);
+
+		controllerServiceDmaapDrsubServiceInstanceEClass = createEClass(CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE);
+		createEReference(controllerServiceDmaapDrsubServiceInstanceEClass, CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CDAP_CLUSTER_INSTANCE);
+		createEAttribute(controllerServiceDmaapDrsubServiceInstanceEClass, CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE__CDAP_SERVICE_NAME);
+
+		controllerServiceDmaapDrsubServiceConfigurationEClass = createEClass(CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION);
+		createEAttribute(controllerServiceDmaapDrsubServiceConfigurationEClass, CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__CDAP_URL);
+		createEAttribute(controllerServiceDmaapDrsubServiceConfigurationEClass, CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__NUMBER_OF_CDAP_RECORDS);
+		createEAttribute(controllerServiceDmaapDrsubServiceConfigurationEClass, CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__NUMBER_OF_CDAP_ERRORS);
+		createEAttribute(controllerServiceDmaapDrsubServiceConfigurationEClass, CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_URI);
+		createEAttribute(controllerServiceDmaapDrsubServiceConfigurationEClass, CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_URI_DESCR);
+		createEAttribute(controllerServiceDmaapDrsubServiceConfigurationEClass, CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_PERSIST_LOC);
+		createEAttribute(controllerServiceDmaapDrsubServiceConfigurationEClass, CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__HDFS_PERSIST_LOC_DESCR);
+		createEAttribute(controllerServiceDmaapDrsubServiceConfigurationEClass, CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_CONF_FILE);
+		createEAttribute(controllerServiceDmaapDrsubServiceConfigurationEClass, CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_CONF_FILE_DESCR);
+		createEAttribute(controllerServiceDmaapDrsubServiceConfigurationEClass, CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_STREAMID);
+		createEAttribute(controllerServiceDmaapDrsubServiceConfigurationEClass, CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION__DMAAP_STREAMID_DESCR);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		VmPackage theVmPackage = (VmPackage)EPackage.Registry.INSTANCE.getEPackage(VmPackage.eNS_URI);
+		org.openecomp.dcae.controller.service.cdap.cluster.service.ServicePackage theServicePackage_1 = (org.openecomp.dcae.controller.service.cdap.cluster.service.ServicePackage)EPackage.Registry.INSTANCE.getEPackage(org.openecomp.dcae.controller.service.cdap.cluster.service.ServicePackage.eNS_URI);
+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+		CorePackage theCorePackage = (CorePackage)EPackage.Registry.INSTANCE.getEPackage(CorePackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		controllerServiceDmaapDrsubServiceEClass.getESuperTypes().add(theVmPackage.getVirtualMachineService());
+		controllerServiceDmaapDrsubServiceInstanceEClass.getESuperTypes().add(theVmPackage.getVirtualMachineServiceInstance());
+		controllerServiceDmaapDrsubServiceInstanceEClass.getESuperTypes().add(this.getControllerServiceDmaapDrsubServiceConfiguration());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(controllerServiceDmaapDrsubServiceEClass, ControllerServiceDmaapDrsubService.class, "ControllerServiceDmaapDrsubService", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(controllerServiceDmaapDrsubServiceInstanceEClass, ControllerServiceDmaapDrsubServiceInstance.class, "ControllerServiceDmaapDrsubServiceInstance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getControllerServiceDmaapDrsubServiceInstance_CdapClusterInstance(), theServicePackage_1.getCdapClusterServiceInstance(), null, "cdapClusterInstance", null, 0, 1, ControllerServiceDmaapDrsubServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getControllerServiceDmaapDrsubServiceInstance_CdapServiceName(), theEcorePackage.getEString(), "cdapServiceName", null, 0, 1, ControllerServiceDmaapDrsubServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(controllerServiceDmaapDrsubServiceConfigurationEClass, ControllerServiceDmaapDrsubServiceConfiguration.class, "ControllerServiceDmaapDrsubServiceConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getControllerServiceDmaapDrsubServiceConfiguration_CdapUrl(), theEcorePackage.getEString(), "cdapUrl", null, 0, 1, ControllerServiceDmaapDrsubServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getControllerServiceDmaapDrsubServiceConfiguration_NumberOfCdapRecords(), theCorePackage.getIncreasingULongMetricAttribute(), "numberOfCdapRecords", null, 0, 1, ControllerServiceDmaapDrsubServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getControllerServiceDmaapDrsubServiceConfiguration_NumberOfCdapErrors(), theCorePackage.getIncreasingULongMetricAttribute(), "numberOfCdapErrors", null, 0, 1, ControllerServiceDmaapDrsubServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getControllerServiceDmaapDrsubServiceConfiguration_HdfsUri(), theEcorePackage.getEString(), "hdfsUri", null, 0, 1, ControllerServiceDmaapDrsubServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getControllerServiceDmaapDrsubServiceConfiguration_HdfsUriDescr(), theEcorePackage.getEString(), "hdfsUriDescr", null, 0, 1, ControllerServiceDmaapDrsubServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getControllerServiceDmaapDrsubServiceConfiguration_HdfsPersistLoc(), theEcorePackage.getEString(), "hdfsPersistLoc", null, 0, 1, ControllerServiceDmaapDrsubServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getControllerServiceDmaapDrsubServiceConfiguration_HdfsPersistLocDescr(), theEcorePackage.getEString(), "hdfsPersistLocDescr", null, 0, 1, ControllerServiceDmaapDrsubServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getControllerServiceDmaapDrsubServiceConfiguration_DmaapConfFile(), theEcorePackage.getEString(), "dmaapConfFile", null, 0, 1, ControllerServiceDmaapDrsubServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getControllerServiceDmaapDrsubServiceConfiguration_DmaapConfFileDescr(), theEcorePackage.getEString(), "dmaapConfFileDescr", null, 0, 1, ControllerServiceDmaapDrsubServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getControllerServiceDmaapDrsubServiceConfiguration_DmaapStreamid(), theEcorePackage.getEString(), "dmaapStreamid", null, 0, 1, ControllerServiceDmaapDrsubServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getControllerServiceDmaapDrsubServiceConfiguration_DmaapStreamidDescr(), theEcorePackage.getEString(), "dmaapStreamidDescr", null, 0, 1, ControllerServiceDmaapDrsubServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		// Create resource
+		createResource(eNS_URI);
+
+		// Create annotations
+		// http://www.eclipse.org/emf/2011/Xcore
+		createXcoreAnnotations();
+		// http://openecomp.org
+		createEcompAnnotations();
+	}
+
+	/**
+	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2011/Xcore</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createXcoreAnnotations() {
+		String source = "http://www.eclipse.org/emf/2011/Xcore";	
+		addAnnotation
+		  (this, 
+		   source, 
+		   new String[] {
+			 "ecomp", "http://openecomp.org"
+		   });
+	}
+
+	/**
+	 * Initializes the annotations for <b>http://openecomp.org</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createEcompAnnotations() {
+		String source = "http://openecomp.org";	
+		addAnnotation
+		  (getControllerServiceDmaapDrsubServiceConfiguration_CdapUrl(), 
+		   source, 
+		   new String[] {
+			 "type", "configuration"
+		   });	
+		addAnnotation
+		  (getControllerServiceDmaapDrsubServiceConfiguration_NumberOfCdapRecords(), 
+		   source, 
+		   new String[] {
+			 "type", "operational"
+		   });	
+		addAnnotation
+		  (getControllerServiceDmaapDrsubServiceConfiguration_NumberOfCdapErrors(), 
+		   source, 
+		   new String[] {
+			 "type", "operational"
+		   });	
+		addAnnotation
+		  (getControllerServiceDmaapDrsubServiceConfiguration_HdfsUri(), 
+		   source, 
+		   new String[] {
+			 "type", "configuration"
+		   });	
+		addAnnotation
+		  (getControllerServiceDmaapDrsubServiceConfiguration_HdfsUriDescr(), 
+		   source, 
+		   new String[] {
+			 "type", "configuration"
+		   });	
+		addAnnotation
+		  (getControllerServiceDmaapDrsubServiceConfiguration_HdfsPersistLoc(), 
+		   source, 
+		   new String[] {
+			 "type", "configuration"
+		   });	
+		addAnnotation
+		  (getControllerServiceDmaapDrsubServiceConfiguration_HdfsPersistLocDescr(), 
+		   source, 
+		   new String[] {
+			 "type", "configuration"
+		   });	
+		addAnnotation
+		  (getControllerServiceDmaapDrsubServiceConfiguration_DmaapConfFile(), 
+		   source, 
+		   new String[] {
+			 "type", "configuration"
+		   });	
+		addAnnotation
+		  (getControllerServiceDmaapDrsubServiceConfiguration_DmaapConfFileDescr(), 
+		   source, 
+		   new String[] {
+			 "type", "configuration"
+		   });	
+		addAnnotation
+		  (getControllerServiceDmaapDrsubServiceConfiguration_DmaapStreamid(), 
+		   source, 
+		   new String[] {
+			 "type", "configuration"
+		   });	
+		addAnnotation
+		  (getControllerServiceDmaapDrsubServiceConfiguration_DmaapStreamidDescr(), 
+		   source, 
+		   new String[] {
+			 "type", "configuration"
+		   });
+	}
+
+} //ServicePackageImpl
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/util/ServiceAdapterFactory.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/util/ServiceAdapterFactory.java
new file mode 100644
index 0000000..c2fa1e5
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/util/ServiceAdapterFactory.java
@@ -0,0 +1,294 @@
+
+/*-
+ * ============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.service.dmaap.drsub.service.util;
+
+import org.openecomp.dcae.controller.core.service.DcaeService;
+import org.openecomp.dcae.controller.core.service.DcaeServiceInstance;
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.*;
+
+import org.openecomp.dcae.controller.service.vm.VirtualMachineService;
+import org.openecomp.dcae.controller.service.vm.VirtualMachineServiceConfiguration;
+import org.openecomp.dcae.controller.service.vm.VirtualMachineServiceInstance;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage
+ * @generated
+ */
+public class ServiceAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static ServicePackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ServiceAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = ServicePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ServiceSwitch<Adapter> modelSwitch =
+		new ServiceSwitch<Adapter>() {
+			@Override
+			public Adapter caseControllerServiceDmaapDrsubService(ControllerServiceDmaapDrsubService object) {
+				return createControllerServiceDmaapDrsubServiceAdapter();
+			}
+			@Override
+			public Adapter caseControllerServiceDmaapDrsubServiceInstance(ControllerServiceDmaapDrsubServiceInstance object) {
+				return createControllerServiceDmaapDrsubServiceInstanceAdapter();
+			}
+			@Override
+			public Adapter caseControllerServiceDmaapDrsubServiceConfiguration(ControllerServiceDmaapDrsubServiceConfiguration object) {
+				return createControllerServiceDmaapDrsubServiceConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseNamedEntity(NamedEntity object) {
+				return createNamedEntityAdapter();
+			}
+			@Override
+			public Adapter caseDcaeService(DcaeService object) {
+				return createDcaeServiceAdapter();
+			}
+			@Override
+			public Adapter caseVirtualMachineService(VirtualMachineService object) {
+				return createVirtualMachineServiceAdapter();
+			}
+			@Override
+			public Adapter caseDcaeServiceInstance(DcaeServiceInstance object) {
+				return createDcaeServiceInstanceAdapter();
+			}
+			@Override
+			public Adapter caseVirtualMachineServiceConfiguration(VirtualMachineServiceConfiguration object) {
+				return createVirtualMachineServiceConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseVirtualMachineServiceInstance(VirtualMachineServiceInstance object) {
+				return createVirtualMachineServiceInstanceAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubService <em>Controller Service Dmaap Drsub Service</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubService
+	 * @generated
+	 */
+	public Adapter createControllerServiceDmaapDrsubServiceAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceInstance <em>Controller Service Dmaap Drsub Service Instance</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceInstance
+	 * @generated
+	 */
+	public Adapter createControllerServiceDmaapDrsubServiceInstanceAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration <em>Controller Service Dmaap Drsub Service Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration
+	 * @generated
+	 */
+	public Adapter createControllerServiceDmaapDrsubServiceConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.ncomp.core.NamedEntity <em>Named Entity</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.ncomp.core.NamedEntity
+	 * @generated
+	 */
+	public Adapter createNamedEntityAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.service.DcaeService <em>Dcae Service</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeService
+	 * @generated
+	 */
+	public Adapter createDcaeServiceAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.vm.VirtualMachineService <em>Virtual Machine Service</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.service.vm.VirtualMachineService
+	 * @generated
+	 */
+	public Adapter createVirtualMachineServiceAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.service.DcaeServiceInstance <em>Dcae Service Instance</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeServiceInstance
+	 * @generated
+	 */
+	public Adapter createDcaeServiceInstanceAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.vm.VirtualMachineServiceConfiguration <em>Virtual Machine Service Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.service.vm.VirtualMachineServiceConfiguration
+	 * @generated
+	 */
+	public Adapter createVirtualMachineServiceConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.vm.VirtualMachineServiceInstance <em>Virtual Machine Service Instance</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.service.vm.VirtualMachineServiceInstance
+	 * @generated
+	 */
+	public Adapter createVirtualMachineServiceInstanceAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} //ServiceAdapterFactory
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/util/ServiceSwitch.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/util/ServiceSwitch.java
new file mode 100644
index 0000000..2c30b4c
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/service/util/ServiceSwitch.java
@@ -0,0 +1,280 @@
+
+/*-
+ * ============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.service.dmaap.drsub.service.util;
+
+import org.openecomp.dcae.controller.core.service.DcaeService;
+import org.openecomp.dcae.controller.core.service.DcaeServiceInstance;
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.*;
+
+import org.openecomp.dcae.controller.service.vm.VirtualMachineService;
+import org.openecomp.dcae.controller.service.vm.VirtualMachineServiceConfiguration;
+import org.openecomp.dcae.controller.service.vm.VirtualMachineServiceInstance;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.Switch;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage
+ * @generated
+ */
+public class ServiceSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static ServicePackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ServiceSwitch() {
+		if (modelPackage == null) {
+			modelPackage = ServicePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @parameter ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE: {
+				ControllerServiceDmaapDrsubService controllerServiceDmaapDrsubService = (ControllerServiceDmaapDrsubService)theEObject;
+				T result = caseControllerServiceDmaapDrsubService(controllerServiceDmaapDrsubService);
+				if (result == null) result = caseVirtualMachineService(controllerServiceDmaapDrsubService);
+				if (result == null) result = caseDcaeService(controllerServiceDmaapDrsubService);
+				if (result == null) result = caseNamedEntity(controllerServiceDmaapDrsubService);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_INSTANCE: {
+				ControllerServiceDmaapDrsubServiceInstance controllerServiceDmaapDrsubServiceInstance = (ControllerServiceDmaapDrsubServiceInstance)theEObject;
+				T result = caseControllerServiceDmaapDrsubServiceInstance(controllerServiceDmaapDrsubServiceInstance);
+				if (result == null) result = caseVirtualMachineServiceInstance(controllerServiceDmaapDrsubServiceInstance);
+				if (result == null) result = caseControllerServiceDmaapDrsubServiceConfiguration(controllerServiceDmaapDrsubServiceInstance);
+				if (result == null) result = caseDcaeServiceInstance(controllerServiceDmaapDrsubServiceInstance);
+				if (result == null) result = caseVirtualMachineServiceConfiguration(controllerServiceDmaapDrsubServiceInstance);
+				if (result == null) result = caseNamedEntity(controllerServiceDmaapDrsubServiceInstance);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ServicePackage.CONTROLLER_SERVICE_DMAAP_DRSUB_SERVICE_CONFIGURATION: {
+				ControllerServiceDmaapDrsubServiceConfiguration controllerServiceDmaapDrsubServiceConfiguration = (ControllerServiceDmaapDrsubServiceConfiguration)theEObject;
+				T result = caseControllerServiceDmaapDrsubServiceConfiguration(controllerServiceDmaapDrsubServiceConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Controller Service Dmaap Drsub Service</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Controller Service Dmaap Drsub Service</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseControllerServiceDmaapDrsubService(ControllerServiceDmaapDrsubService object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Controller Service Dmaap Drsub Service Instance</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Controller Service Dmaap Drsub Service Instance</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseControllerServiceDmaapDrsubServiceInstance(ControllerServiceDmaapDrsubServiceInstance object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Controller Service Dmaap Drsub Service Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Controller Service Dmaap Drsub Service Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseControllerServiceDmaapDrsubServiceConfiguration(ControllerServiceDmaapDrsubServiceConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Named Entity</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Named Entity</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseNamedEntity(NamedEntity object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Dcae Service</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Dcae Service</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDcaeService(DcaeService object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Virtual Machine Service</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Virtual Machine Service</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseVirtualMachineService(VirtualMachineService object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Dcae Service Instance</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Dcae Service Instance</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDcaeServiceInstance(DcaeServiceInstance object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Virtual Machine Service Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Virtual Machine Service Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseVirtualMachineServiceConfiguration(VirtualMachineServiceConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Virtual Machine Service Instance</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Virtual Machine Service Instance</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseVirtualMachineServiceInstance(VirtualMachineServiceInstance object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} //ServiceSwitch
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore/manager.xcore b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore/manager.xcore
new file mode 100644
index 0000000..512863b
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore/manager.xcore
@@ -0,0 +1,35 @@
+
+/*-
+ * ============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============================================
+ */
+	
+@GenModel(modelDirectory="/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen")

+

+

+package org.openecomp.dcae.controller.service.dmaap.drsub.manager

+

+

+import org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceConfiguration 

+import org.openecomp.dcae.controller.service.vmmanager.VirtualMachineManager

+

+// state of manager 

+class ControllerServiceDmaapDrsubManager extends VirtualMachineManager, ControllerServiceDmaapDrsubServiceConfiguration {    

+

+}

+

diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore/service.xcore b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore/service.xcore
new file mode 100644
index 0000000..ebdc44a
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore/service.xcore
@@ -0,0 +1,72 @@
+
+/*-
+ * ============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============================================
+ */
+	
+@GenModel(modelDirectory="/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen")

+

+

+package org.openecomp.dcae.controller.service.dmaap.drsub.service

+

+

+import org.openecomp.ncomp.core.IncreasingULongMetricAttribute

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

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

+import org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterServiceInstance 

+

+annotation "http://openecomp.org" as ecomp

+

+class ControllerServiceDmaapDrsubService extends VirtualMachineService {

+	    

+} 

+

+// state in the controller

+class ControllerServiceDmaapDrsubServiceInstance extends VirtualMachineServiceInstance, ControllerServiceDmaapDrsubServiceConfiguration {

+	refers CdapClusterServiceInstance cdapClusterInstance

+	String cdapServiceName

+}

+

+// state in both controller and manager

+class ControllerServiceDmaapDrsubServiceConfiguration { 

+	@ecomp(^type = "configuration")

+	String cdapUrl

+	@ecomp(^type = "operational")

+	IncreasingULongMetricAttribute numberOfCdapRecords

+	@ecomp(^type = "operational")

+	IncreasingULongMetricAttribute numberOfCdapErrors

+	@ecomp(^type = "configuration")

+	String hdfsUri

+	@ecomp(^type = "configuration")

+	String hdfsUriDescr

+	@ecomp(^type = "configuration")

+	String hdfsPersistLoc

+	@ecomp(^type = "configuration")

+	String hdfsPersistLocDescr

+	@ecomp(^type = "configuration")

+	String dmaapConfFile

+	@ecomp(^type = "configuration")

+	String dmaapConfFileDescr

+	@ecomp(^type = "configuration")

+	String dmaapStreamid

+	@ecomp(^type = "configuration")

+	String dmaapStreamidDescr

+}

+

+

+