Init dcae.controller

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

31 files changed, 8398 insertions, 0 deletions

diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapApplication.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapApplication.java
new file mode 100644
index 0000000..8ba630c
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapApplication.java
@@ -0,0 +1,152 @@
+
+/*-
+ * ============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.cdap;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Application</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapApplication#getJarFile <em>Jar File</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapApplication#getArtifactName <em>Artifact Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapApplication#getVersion <em>Version</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapApplication#getAppConfigFileContent <em>App Config File Content</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapApplication()
+ * @model
+ * @generated
+ */
+public interface CdapApplication extends NamedEntity {
+
+	/**
+	 * Returns the value of the '<em><b>Jar File</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Jar 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>Jar File</em>' attribute.
+	 * @see #setJarFile(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapApplication_JarFile()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getJarFile();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapApplication#getJarFile <em>Jar File</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Jar File</em>' attribute.
+	 * @see #getJarFile()
+	 * @generated
+	 */
+	void setJarFile(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Artifact Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Artifact 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>Artifact Name</em>' attribute.
+	 * @see #setArtifactName(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapApplication_ArtifactName()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getArtifactName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapApplication#getArtifactName <em>Artifact Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Artifact Name</em>' attribute.
+	 * @see #getArtifactName()
+	 * @generated
+	 */
+	void setArtifactName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Version</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Version</em>' attribute.
+	 * @see #setVersion(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapApplication_Version()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getVersion();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapApplication#getVersion <em>Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Version</em>' attribute.
+	 * @see #getVersion()
+	 * @generated
+	 */
+	void setVersion(String value);
+
+	/**
+	 * Returns the value of the '<em><b>App Config File Content</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Config File Content</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>App Config File Content</em>' attribute.
+	 * @see #setAppConfigFileContent(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapApplication_AppConfigFileContent()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppConfigFileContent();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapApplication#getAppConfigFileContent <em>App Config File Content</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Config File Content</em>' attribute.
+	 * @see #getAppConfigFileContent()
+	 * @generated
+	 */
+	void setAppConfigFileContent(String value);
+} // CdapApplication
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapArtifact.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapArtifact.java
new file mode 100644
index 0000000..f7a72e4
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapArtifact.java
@@ -0,0 +1,98 @@
+
+/*-
+ * ============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.cdap;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Artifact</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapArtifact#getJarFile <em>Jar File</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapArtifact#getVersion <em>Version</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapArtifact()
+ * @model
+ * @generated
+ */
+public interface CdapArtifact extends NamedEntity {
+	/**
+	 * Returns the value of the '<em><b>Jar File</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Jar 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>Jar File</em>' attribute.
+	 * @see #setJarFile(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapArtifact_JarFile()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getJarFile();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapArtifact#getJarFile <em>Jar File</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Jar File</em>' attribute.
+	 * @see #getJarFile()
+	 * @generated
+	 */
+	void setJarFile(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Version</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Version</em>' attribute.
+	 * @see #setVersion(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapArtifact_Version()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getVersion();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapArtifact#getVersion <em>Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Version</em>' attribute.
+	 * @see #getVersion()
+	 * @generated
+	 */
+	void setVersion(String value);
+
+} // CdapArtifact
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapArtifacts.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapArtifacts.java
new file mode 100644
index 0000000..ff35cc8
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapArtifacts.java
@@ -0,0 +1,98 @@
+
+/*-
+ * ============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.cdap;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Artifacts</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapArtifacts#getJarFile <em>Jar File</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapArtifacts#getVersion <em>Version</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapArtifacts()
+ * @model
+ * @generated
+ */
+public interface CdapArtifacts extends NamedEntity {
+
+	/**
+	 * Returns the value of the '<em><b>Jar File</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Jar 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>Jar File</em>' attribute.
+	 * @see #setJarFile(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapArtifacts_JarFile()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getJarFile();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapArtifacts#getJarFile <em>Jar File</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Jar File</em>' attribute.
+	 * @see #getJarFile()
+	 * @generated
+	 */
+	void setJarFile(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Version</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Version</em>' attribute.
+	 * @see #setVersion(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapArtifacts_Version()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getVersion();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapArtifacts#getVersion <em>Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Version</em>' attribute.
+	 * @see #getVersion()
+	 * @generated
+	 */
+	void setVersion(String value);
+} // CdapArtifacts
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapFactory.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapFactory.java
new file mode 100644
index 0000000..b15b7d5
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapFactory.java
@@ -0,0 +1,117 @@
+
+/*-
+ * ============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.cdap;
+
+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.cdap.CdapPackage
+ * @generated
+ */
+public interface CdapFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	CdapFactory eINSTANCE = org.openecomp.dcae.controller.service.cdap.impl.CdapFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Service</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Service</em>'.
+	 * @generated
+	 */
+	CdapService createCdapService();
+
+	/**
+	 * Returns a new object of class '<em>Service Instance</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Service Instance</em>'.
+	 * @generated
+	 */
+	CdapServiceInstance createCdapServiceInstance();
+
+	/**
+	 * Returns a new object of class '<em>Application</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Application</em>'.
+	 * @generated
+	 */
+	CdapApplication createCdapApplication();
+
+	/**
+	 * Returns a new object of class '<em>Artifact</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Artifact</em>'.
+	 * @generated
+	 */
+	CdapArtifact createCdapArtifact();
+
+	/**
+	 * Returns a new object of class '<em>Service Instance Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Service Instance Configuration</em>'.
+	 * @generated
+	 */
+	CdapServiceInstanceConfiguration createCdapServiceInstanceConfiguration();
+
+	/**
+	 * Returns a new object of class '<em>Internal Application Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Internal Application Configuration</em>'.
+	 * @generated
+	 */
+	CdapInternalApplicationConfiguration createCdapInternalApplicationConfiguration();
+
+	/**
+	 * Returns a new object of class '<em>Service Descriptor</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Service Descriptor</em>'.
+	 * @generated
+	 */
+	CdapServiceDescriptor createCdapServiceDescriptor();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	CdapPackage getCdapPackage();
+
+} //CdapFactory
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapInternalApplicationConfiguration.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapInternalApplicationConfiguration.java
new file mode 100644
index 0000000..51b9b5c
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapInternalApplicationConfiguration.java
@@ -0,0 +1,151 @@
+
+/*-
+ * ============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.cdap;
+
+import org.openecomp.ncomp.cdap.CdapEntityWithPreferences;
+import org.openecomp.ncomp.cdap.CdapKeyPair;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Internal Application Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration#getConfig <em>Config</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration#getPreferences <em>Preferences</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration#getApps <em>Apps</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration#getWorkers <em>Workers</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration#getFlows <em>Flows</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration#getServices <em>Services</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapInternalApplicationConfiguration()
+ * @model
+ * @generated
+ */
+public interface CdapInternalApplicationConfiguration extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Config</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.ncomp.cdap.CdapKeyPair}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Config</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Config</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapInternalApplicationConfiguration_Config()
+	 * @model containment="true" ordered="false"
+	 * @generated
+	 */
+	EList<CdapKeyPair> getConfig();
+
+	/**
+	 * Returns the value of the '<em><b>Preferences</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.ncomp.cdap.CdapKeyPair}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Preferences</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Preferences</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapInternalApplicationConfiguration_Preferences()
+	 * @model containment="true" ordered="false"
+	 * @generated
+	 */
+	EList<CdapKeyPair> getPreferences();
+
+	/**
+	 * Returns the value of the '<em><b>Apps</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.ncomp.cdap.CdapEntityWithPreferences}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Apps</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Apps</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapInternalApplicationConfiguration_Apps()
+	 * @model containment="true" ordered="false"
+	 * @generated
+	 */
+	EList<CdapEntityWithPreferences> getApps();
+
+	/**
+	 * Returns the value of the '<em><b>Workers</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.ncomp.cdap.CdapEntityWithPreferences}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Workers</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Workers</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapInternalApplicationConfiguration_Workers()
+	 * @model containment="true" ordered="false"
+	 * @generated
+	 */
+	EList<CdapEntityWithPreferences> getWorkers();
+
+	/**
+	 * Returns the value of the '<em><b>Flows</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.ncomp.cdap.CdapEntityWithPreferences}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Flows</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Flows</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapInternalApplicationConfiguration_Flows()
+	 * @model containment="true" ordered="false"
+	 * @generated
+	 */
+	EList<CdapEntityWithPreferences> getFlows();
+
+	/**
+	 * Returns the value of the '<em><b>Services</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.ncomp.cdap.CdapEntityWithPreferences}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Services</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Services</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapInternalApplicationConfiguration_Services()
+	 * @model containment="true" ordered="false"
+	 * @generated
+	 */
+	EList<CdapEntityWithPreferences> getServices();
+
+} // CdapInternalApplicationConfiguration
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapPackage.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapPackage.java
new file mode 100644
index 0000000..afcb67b
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapPackage.java
@@ -0,0 +1,1702 @@
+
+/*-
+ * ============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.cdap;
+
+import org.openecomp.dcae.controller.core.service.ServicePackage;
+import org.openecomp.ncomp.core.CorePackage;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EOperation;
+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.cdap.CdapFactory
+ * @model kind="package"
+ *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/dcae-controller-service-cdap-model/src/main/xcore-gen' basePackage='org.openecomp.dcae.controller.service'"
+ *        annotation="http://www.eclipse.org/emf/2011/Xcore ecomp='http://openecomp.org' cdap='http://openecomp.org/cdap'"
+ * @generated
+ */
+public interface CdapPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "cdap";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "org.openecomp.dcae.controller.service.cdap";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "cdap";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	CdapPackage eINSTANCE = org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceImpl <em>Service</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapServiceImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapService()
+	 * @generated
+	 */
+	int CDAP_SERVICE = 0;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE__NAME = ServicePackage.DCAE_SERVICE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE__LAST_POLLED = ServicePackage.DCAE_SERVICE__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE__LAST_CHANGED = ServicePackage.DCAE_SERVICE__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE__CREATED = ServicePackage.DCAE_SERVICE__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Instances</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE__INSTANCES = ServicePackage.DCAE_SERVICE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Service</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_FEATURE_COUNT = ServicePackage.DCAE_SERVICE_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Deploy</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE___DEPLOY__STRING_STRING = ServicePackage.DCAE_SERVICE___DEPLOY__STRING_STRING;
+
+	/**
+	 * The operation id for the '<em>Undeploy</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE___UNDEPLOY__STRING = ServicePackage.DCAE_SERVICE___UNDEPLOY__STRING;
+
+	/**
+	 * The operation id for the '<em>Test</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE___TEST__STRING = ServicePackage.DCAE_SERVICE___TEST__STRING;
+
+	/**
+	 * The operation id for the '<em>Suspend</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE___SUSPEND__STRING = ServicePackage.DCAE_SERVICE___SUSPEND__STRING;
+
+	/**
+	 * The operation id for the '<em>Resume</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE___RESUME__STRING = ServicePackage.DCAE_SERVICE___RESUME__STRING;
+
+	/**
+	 * The operation id for the '<em>Push Manager Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE___PUSH_MANAGER_CONFIGURATION__STRING = ServicePackage.DCAE_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 CDAP_SERVICE___POLL_MANAGER_CONFIGURATION__STRING = ServicePackage.DCAE_SERVICE___POLL_MANAGER_CONFIGURATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Manager Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE___MANAGER_CONFIGURATION__STRING = ServicePackage.DCAE_SERVICE___MANAGER_CONFIGURATION__STRING;
+
+	/**
+	 * The operation id for the '<em>Manager Operation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE___MANAGER_OPERATION__STRING_STRING_JSONOBJECT = ServicePackage.DCAE_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 CDAP_SERVICE___UPDATE_CONFIGURATION_FROM_POLICY__STRING = ServicePackage.DCAE_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 CDAP_SERVICE___RUN_HEALTH_TESTS = ServicePackage.DCAE_SERVICE___RUN_HEALTH_TESTS;
+
+	/**
+	 * The operation id for the '<em>Update Instance Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE___UPDATE_INSTANCE_CONFIGURATION__STRING = ServicePackage.DCAE_SERVICE_OPERATION_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Service</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_OPERATION_COUNT = ServicePackage.DCAE_SERVICE_OPERATION_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl <em>Service Instance</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapServiceInstance()
+	 * @generated
+	 */
+	int CDAP_SERVICE_INSTANCE = 1;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__NAME = ServicePackage.DCAE_SERVICE_INSTANCE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__LAST_POLLED = ServicePackage.DCAE_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 CDAP_SERVICE_INSTANCE__LAST_CHANGED = ServicePackage.DCAE_SERVICE_INSTANCE__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__CREATED = ServicePackage.DCAE_SERVICE_INSTANCE__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Service Container</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__SERVICE_CONTAINER = ServicePackage.DCAE_SERVICE_INSTANCE__SERVICE_CONTAINER;
+
+	/**
+	 * The feature id for the '<em><b>Status</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__STATUS = ServicePackage.DCAE_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 CDAP_SERVICE_INSTANCE__INPUT_STREAMS = ServicePackage.DCAE_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 CDAP_SERVICE_INSTANCE__OUTPUT_STREAMS = ServicePackage.DCAE_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 CDAP_SERVICE_INSTANCE__LAST_HEALTH_TEST = ServicePackage.DCAE_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 CDAP_SERVICE_INSTANCE__HEALTH_TEST_STATUS = ServicePackage.DCAE_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 CDAP_SERVICE_INSTANCE__HEALTH_TEST_MESSAGE_CODE = ServicePackage.DCAE_SERVICE_INSTANCE__HEALTH_TEST_MESSAGE_CODE;
+
+	/**
+	 * The feature id for the '<em><b>Cdap Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__CDAP_NAME = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Namespace</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__NAMESPACE = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>App Jar</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__APP_JAR = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>App Config File</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__APP_CONFIG_FILE = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Artifacts</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__ARTIFACTS = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Apps</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__APPS = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>App Names</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__APP_NAMES = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 6;
+
+	/**
+	 * The feature id for the '<em><b>Worker Names</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__WORKER_NAMES = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 7;
+
+	/**
+	 * The feature id for the '<em><b>Flow Names</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__FLOW_NAMES = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 8;
+
+	/**
+	 * The feature id for the '<em><b>Service Names</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__SERVICE_NAMES = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 9;
+
+	/**
+	 * The feature id for the '<em><b>Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__CONFIGURATION = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 10;
+
+	/**
+	 * The feature id for the '<em><b>Cdap Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__CDAP_CONFIGURATION = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 11;
+
+	/**
+	 * The feature id for the '<em><b>Cluster Service</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__CLUSTER_SERVICE = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 12;
+
+	/**
+	 * The feature id for the '<em><b>Cdap Namespace</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__CDAP_NAMESPACE = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 13;
+
+	/**
+	 * The feature id for the '<em><b>Service</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__SERVICE = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 14;
+
+	/**
+	 * The number of structural features of the '<em>Service Instance</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE_FEATURE_COUNT = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 15;
+
+	/**
+	 * The number of operations of the '<em>Service Instance</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE_OPERATION_COUNT = ServicePackage.DCAE_SERVICE_INSTANCE_OPERATION_COUNT + 0;
+
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapApplicationImpl <em>Application</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapApplicationImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapApplication()
+	 * @generated
+	 */
+	int CDAP_APPLICATION = 2;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_APPLICATION__NAME = CorePackage.NAMED_ENTITY__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_APPLICATION__LAST_POLLED = CorePackage.NAMED_ENTITY__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_APPLICATION__LAST_CHANGED = CorePackage.NAMED_ENTITY__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_APPLICATION__CREATED = CorePackage.NAMED_ENTITY__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Jar File</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_APPLICATION__JAR_FILE = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Artifact Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_APPLICATION__ARTIFACT_NAME = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_APPLICATION__VERSION = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>App Config File Content</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_APPLICATION__APP_CONFIG_FILE_CONTENT = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of structural features of the '<em>Application</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_APPLICATION_FEATURE_COUNT = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 4;
+
+	/**
+	 * The number of operations of the '<em>Application</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_APPLICATION_OPERATION_COUNT = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapArtifactImpl <em>Artifact</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapArtifactImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapArtifact()
+	 * @generated
+	 */
+	int CDAP_ARTIFACT = 3;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_ARTIFACT__NAME = CorePackage.NAMED_ENTITY__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_ARTIFACT__LAST_POLLED = CorePackage.NAMED_ENTITY__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_ARTIFACT__LAST_CHANGED = CorePackage.NAMED_ENTITY__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_ARTIFACT__CREATED = CorePackage.NAMED_ENTITY__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Jar File</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_ARTIFACT__JAR_FILE = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_ARTIFACT__VERSION = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Artifact</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_ARTIFACT_FEATURE_COUNT = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of operations of the '<em>Artifact</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_ARTIFACT_OPERATION_COUNT = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceConfigurationImpl <em>Service Instance Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceConfigurationImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapServiceInstanceConfiguration()
+	 * @generated
+	 */
+	int CDAP_SERVICE_INSTANCE_CONFIGURATION = 4;
+
+	/**
+	 * The number of structural features of the '<em>Service Instance Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE_CONFIGURATION_FEATURE_COUNT = 0;
+
+	/**
+	 * The number of operations of the '<em>Service Instance Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE_CONFIGURATION_OPERATION_COUNT = 0;
+
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapInternalApplicationConfigurationImpl <em>Internal Application Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapInternalApplicationConfigurationImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapInternalApplicationConfiguration()
+	 * @generated
+	 */
+	int CDAP_INTERNAL_APPLICATION_CONFIGURATION = 5;
+
+	/**
+	 * The feature id for the '<em><b>Config</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_INTERNAL_APPLICATION_CONFIGURATION__CONFIG = 0;
+
+	/**
+	 * The feature id for the '<em><b>Preferences</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_INTERNAL_APPLICATION_CONFIGURATION__PREFERENCES = 1;
+
+	/**
+	 * The feature id for the '<em><b>Apps</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_INTERNAL_APPLICATION_CONFIGURATION__APPS = 2;
+
+	/**
+	 * The feature id for the '<em><b>Workers</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_INTERNAL_APPLICATION_CONFIGURATION__WORKERS = 3;
+
+	/**
+	 * The feature id for the '<em><b>Flows</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_INTERNAL_APPLICATION_CONFIGURATION__FLOWS = 4;
+
+	/**
+	 * The feature id for the '<em><b>Services</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_INTERNAL_APPLICATION_CONFIGURATION__SERVICES = 5;
+
+	/**
+	 * The number of structural features of the '<em>Internal Application Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_INTERNAL_APPLICATION_CONFIGURATION_FEATURE_COUNT = 6;
+
+	/**
+	 * The number of operations of the '<em>Internal Application Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_INTERNAL_APPLICATION_CONFIGURATION_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceDescriptorImpl <em>Service Descriptor</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapServiceDescriptorImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapServiceDescriptor()
+	 * @generated
+	 */
+	int CDAP_SERVICE_DESCRIPTOR = 6;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_DESCRIPTOR__NAME = ServicePackage.DCAE_SERVICE_DESCRIPTOR__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_DESCRIPTOR__LAST_POLLED = ServicePackage.DCAE_SERVICE_DESCRIPTOR__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_DESCRIPTOR__LAST_CHANGED = ServicePackage.DCAE_SERVICE_DESCRIPTOR__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_DESCRIPTOR__CREATED = ServicePackage.DCAE_SERVICE_DESCRIPTOR__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Group Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_DESCRIPTOR__GROUP_ID = ServicePackage.DCAE_SERVICE_DESCRIPTOR__GROUP_ID;
+
+	/**
+	 * The feature id for the '<em><b>Artifact</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_DESCRIPTOR__ARTIFACT = ServicePackage.DCAE_SERVICE_DESCRIPTOR__ARTIFACT;
+
+	/**
+	 * The feature id for the '<em><b>Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_DESCRIPTOR__VERSION = ServicePackage.DCAE_SERVICE_DESCRIPTOR__VERSION;
+
+	/**
+	 * The feature id for the '<em><b>Service Package</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_DESCRIPTOR__SERVICE_PACKAGE = ServicePackage.DCAE_SERVICE_DESCRIPTOR_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Service Class</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_DESCRIPTOR__SERVICE_CLASS = ServicePackage.DCAE_SERVICE_DESCRIPTOR_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Service Instance Class</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_DESCRIPTOR__SERVICE_INSTANCE_CLASS = ServicePackage.DCAE_SERVICE_DESCRIPTOR_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Jar File</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_DESCRIPTOR__JAR_FILE = ServicePackage.DCAE_SERVICE_DESCRIPTOR_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of structural features of the '<em>Service Descriptor</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_DESCRIPTOR_FEATURE_COUNT = ServicePackage.DCAE_SERVICE_DESCRIPTOR_FEATURE_COUNT + 4;
+
+	/**
+	 * The number of operations of the '<em>Service Descriptor</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_DESCRIPTOR_OPERATION_COUNT = ServicePackage.DCAE_SERVICE_DESCRIPTOR_OPERATION_COUNT + 0;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapService <em>Service</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Service</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapService
+	 * @generated
+	 */
+	EClass getCdapService();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.service.cdap.CdapService#getInstances <em>Instances</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Instances</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapService#getInstances()
+	 * @see #getCdapService()
+	 * @generated
+	 */
+	EReference getCdapService_Instances();
+
+	/**
+	 * Returns the meta object for the '{@link org.openecomp.dcae.controller.service.cdap.CdapService#updateInstanceConfiguration(java.lang.String) <em>Update Instance Configuration</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Update Instance Configuration</em>' operation.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapService#updateInstanceConfiguration(java.lang.String)
+	 * @generated
+	 */
+	EOperation getCdapService__UpdateInstanceConfiguration__String();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance <em>Service Instance</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Service Instance</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceInstance
+	 * @generated
+	 */
+	EClass getCdapServiceInstance();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getCdapName <em>Cdap Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Cdap Name</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getCdapName()
+	 * @see #getCdapServiceInstance()
+	 * @generated
+	 */
+	EAttribute getCdapServiceInstance_CdapName();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getCdapNamespace <em>Cdap Namespace</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Cdap Namespace</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getCdapNamespace()
+	 * @see #getCdapServiceInstance()
+	 * @generated
+	 */
+	EReference getCdapServiceInstance_CdapNamespace();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getNamespace <em>Namespace</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Namespace</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getNamespace()
+	 * @see #getCdapServiceInstance()
+	 * @generated
+	 */
+	EAttribute getCdapServiceInstance_Namespace();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getAppJar <em>App Jar</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Jar</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getAppJar()
+	 * @see #getCdapServiceInstance()
+	 * @generated
+	 */
+	EAttribute getCdapServiceInstance_AppJar();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getAppConfigFile <em>App Config File</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Config File</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getAppConfigFile()
+	 * @see #getCdapServiceInstance()
+	 * @generated
+	 */
+	EAttribute getCdapServiceInstance_AppConfigFile();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getArtifacts <em>Artifacts</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Artifacts</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getArtifacts()
+	 * @see #getCdapServiceInstance()
+	 * @generated
+	 */
+	EReference getCdapServiceInstance_Artifacts();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getApps <em>Apps</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Apps</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getApps()
+	 * @see #getCdapServiceInstance()
+	 * @generated
+	 */
+	EReference getCdapServiceInstance_Apps();
+
+	/**
+	 * Returns the meta object for the attribute list '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getAppNames <em>App Names</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute list '<em>App Names</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getAppNames()
+	 * @see #getCdapServiceInstance()
+	 * @generated
+	 */
+	EAttribute getCdapServiceInstance_AppNames();
+
+	/**
+	 * Returns the meta object for the attribute list '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getWorkerNames <em>Worker Names</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute list '<em>Worker Names</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getWorkerNames()
+	 * @see #getCdapServiceInstance()
+	 * @generated
+	 */
+	EAttribute getCdapServiceInstance_WorkerNames();
+
+	/**
+	 * Returns the meta object for the attribute list '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getFlowNames <em>Flow Names</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute list '<em>Flow Names</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getFlowNames()
+	 * @see #getCdapServiceInstance()
+	 * @generated
+	 */
+	EAttribute getCdapServiceInstance_FlowNames();
+
+	/**
+	 * Returns the meta object for the attribute list '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getServiceNames <em>Service Names</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute list '<em>Service Names</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getServiceNames()
+	 * @see #getCdapServiceInstance()
+	 * @generated
+	 */
+	EAttribute getCdapServiceInstance_ServiceNames();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getConfiguration <em>Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Configuration</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getConfiguration()
+	 * @see #getCdapServiceInstance()
+	 * @generated
+	 */
+	EReference getCdapServiceInstance_Configuration();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getCdapConfiguration <em>Cdap Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Cdap Configuration</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getCdapConfiguration()
+	 * @see #getCdapServiceInstance()
+	 * @generated
+	 */
+	EReference getCdapServiceInstance_CdapConfiguration();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getClusterService <em>Cluster Service</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Cluster Service</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getClusterService()
+	 * @see #getCdapServiceInstance()
+	 * @generated
+	 */
+	EReference getCdapServiceInstance_ClusterService();
+
+	/**
+	 * Returns the meta object for the container reference '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getService <em>Service</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the container reference '<em>Service</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getService()
+	 * @see #getCdapServiceInstance()
+	 * @generated
+	 */
+	EReference getCdapServiceInstance_Service();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapApplication <em>Application</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Application</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapApplication
+	 * @generated
+	 */
+	EClass getCdapApplication();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapApplication#getJarFile <em>Jar File</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Jar File</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapApplication#getJarFile()
+	 * @see #getCdapApplication()
+	 * @generated
+	 */
+	EAttribute getCdapApplication_JarFile();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapApplication#getArtifactName <em>Artifact Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Artifact Name</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapApplication#getArtifactName()
+	 * @see #getCdapApplication()
+	 * @generated
+	 */
+	EAttribute getCdapApplication_ArtifactName();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapApplication#getVersion <em>Version</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Version</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapApplication#getVersion()
+	 * @see #getCdapApplication()
+	 * @generated
+	 */
+	EAttribute getCdapApplication_Version();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapApplication#getAppConfigFileContent <em>App Config File Content</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Config File Content</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapApplication#getAppConfigFileContent()
+	 * @see #getCdapApplication()
+	 * @generated
+	 */
+	EAttribute getCdapApplication_AppConfigFileContent();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapArtifact <em>Artifact</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Artifact</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapArtifact
+	 * @generated
+	 */
+	EClass getCdapArtifact();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapArtifact#getJarFile <em>Jar File</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Jar File</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapArtifact#getJarFile()
+	 * @see #getCdapArtifact()
+	 * @generated
+	 */
+	EAttribute getCdapArtifact_JarFile();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapArtifact#getVersion <em>Version</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Version</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapArtifact#getVersion()
+	 * @see #getCdapArtifact()
+	 * @generated
+	 */
+	EAttribute getCdapArtifact_Version();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstanceConfiguration <em>Service Instance Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Service Instance Configuration</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceInstanceConfiguration
+	 * @generated
+	 */
+	EClass getCdapServiceInstanceConfiguration();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration <em>Internal Application Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Internal Application Configuration</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration
+	 * @generated
+	 */
+	EClass getCdapInternalApplicationConfiguration();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration#getConfig <em>Config</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Config</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration#getConfig()
+	 * @see #getCdapInternalApplicationConfiguration()
+	 * @generated
+	 */
+	EReference getCdapInternalApplicationConfiguration_Config();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration#getPreferences <em>Preferences</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Preferences</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration#getPreferences()
+	 * @see #getCdapInternalApplicationConfiguration()
+	 * @generated
+	 */
+	EReference getCdapInternalApplicationConfiguration_Preferences();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration#getApps <em>Apps</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Apps</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration#getApps()
+	 * @see #getCdapInternalApplicationConfiguration()
+	 * @generated
+	 */
+	EReference getCdapInternalApplicationConfiguration_Apps();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration#getWorkers <em>Workers</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Workers</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration#getWorkers()
+	 * @see #getCdapInternalApplicationConfiguration()
+	 * @generated
+	 */
+	EReference getCdapInternalApplicationConfiguration_Workers();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration#getFlows <em>Flows</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Flows</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration#getFlows()
+	 * @see #getCdapInternalApplicationConfiguration()
+	 * @generated
+	 */
+	EReference getCdapInternalApplicationConfiguration_Flows();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration#getServices <em>Services</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Services</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration#getServices()
+	 * @see #getCdapInternalApplicationConfiguration()
+	 * @generated
+	 */
+	EReference getCdapInternalApplicationConfiguration_Services();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor <em>Service Descriptor</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Service Descriptor</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor
+	 * @generated
+	 */
+	EClass getCdapServiceDescriptor();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor#getServicePackage <em>Service Package</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Service Package</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor#getServicePackage()
+	 * @see #getCdapServiceDescriptor()
+	 * @generated
+	 */
+	EAttribute getCdapServiceDescriptor_ServicePackage();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor#getServiceClass <em>Service Class</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Service Class</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor#getServiceClass()
+	 * @see #getCdapServiceDescriptor()
+	 * @generated
+	 */
+	EAttribute getCdapServiceDescriptor_ServiceClass();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor#getServiceInstanceClass <em>Service Instance Class</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Service Instance Class</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor#getServiceInstanceClass()
+	 * @see #getCdapServiceDescriptor()
+	 * @generated
+	 */
+	EAttribute getCdapServiceDescriptor_ServiceInstanceClass();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor#getJarFile <em>Jar File</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Jar File</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor#getJarFile()
+	 * @see #getCdapServiceDescriptor()
+	 * @generated
+	 */
+	EAttribute getCdapServiceDescriptor_JarFile();
+
+	/**
+	 * 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
+	 */
+	CdapFactory getCdapFactory();
+
+	/**
+	 * <!-- 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.cdap.impl.CdapServiceImpl <em>Service</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapServiceImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapService()
+		 * @generated
+		 */
+		EClass CDAP_SERVICE = eINSTANCE.getCdapService();
+		/**
+		 * The meta object literal for the '<em><b>Instances</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CDAP_SERVICE__INSTANCES = eINSTANCE.getCdapService_Instances();
+		/**
+		 * The meta object literal for the '<em><b>Update Instance Configuration</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation CDAP_SERVICE___UPDATE_INSTANCE_CONFIGURATION__STRING = eINSTANCE.getCdapService__UpdateInstanceConfiguration__String();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl <em>Service Instance</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapServiceInstance()
+		 * @generated
+		 */
+		EClass CDAP_SERVICE_INSTANCE = eINSTANCE.getCdapServiceInstance();
+		/**
+		 * The meta object literal for the '<em><b>Cdap Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_SERVICE_INSTANCE__CDAP_NAME = eINSTANCE.getCdapServiceInstance_CdapName();
+		/**
+		 * The meta object literal for the '<em><b>Cdap Namespace</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CDAP_SERVICE_INSTANCE__CDAP_NAMESPACE = eINSTANCE.getCdapServiceInstance_CdapNamespace();
+		/**
+		 * The meta object literal for the '<em><b>Namespace</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_SERVICE_INSTANCE__NAMESPACE = eINSTANCE.getCdapServiceInstance_Namespace();
+		/**
+		 * The meta object literal for the '<em><b>App Jar</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_SERVICE_INSTANCE__APP_JAR = eINSTANCE.getCdapServiceInstance_AppJar();
+		/**
+		 * The meta object literal for the '<em><b>App Config File</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_SERVICE_INSTANCE__APP_CONFIG_FILE = eINSTANCE.getCdapServiceInstance_AppConfigFile();
+		/**
+		 * The meta object literal for the '<em><b>Artifacts</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CDAP_SERVICE_INSTANCE__ARTIFACTS = eINSTANCE.getCdapServiceInstance_Artifacts();
+		/**
+		 * The meta object literal for the '<em><b>Apps</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CDAP_SERVICE_INSTANCE__APPS = eINSTANCE.getCdapServiceInstance_Apps();
+		/**
+		 * The meta object literal for the '<em><b>App Names</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_SERVICE_INSTANCE__APP_NAMES = eINSTANCE.getCdapServiceInstance_AppNames();
+		/**
+		 * The meta object literal for the '<em><b>Worker Names</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_SERVICE_INSTANCE__WORKER_NAMES = eINSTANCE.getCdapServiceInstance_WorkerNames();
+		/**
+		 * The meta object literal for the '<em><b>Flow Names</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_SERVICE_INSTANCE__FLOW_NAMES = eINSTANCE.getCdapServiceInstance_FlowNames();
+		/**
+		 * The meta object literal for the '<em><b>Service Names</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_SERVICE_INSTANCE__SERVICE_NAMES = eINSTANCE.getCdapServiceInstance_ServiceNames();
+		/**
+		 * The meta object literal for the '<em><b>Configuration</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CDAP_SERVICE_INSTANCE__CONFIGURATION = eINSTANCE.getCdapServiceInstance_Configuration();
+		/**
+		 * The meta object literal for the '<em><b>Cdap Configuration</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CDAP_SERVICE_INSTANCE__CDAP_CONFIGURATION = eINSTANCE.getCdapServiceInstance_CdapConfiguration();
+		/**
+		 * The meta object literal for the '<em><b>Cluster Service</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CDAP_SERVICE_INSTANCE__CLUSTER_SERVICE = eINSTANCE.getCdapServiceInstance_ClusterService();
+		/**
+		 * The meta object literal for the '<em><b>Service</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CDAP_SERVICE_INSTANCE__SERVICE = eINSTANCE.getCdapServiceInstance_Service();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapApplicationImpl <em>Application</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapApplicationImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapApplication()
+		 * @generated
+		 */
+		EClass CDAP_APPLICATION = eINSTANCE.getCdapApplication();
+		/**
+		 * The meta object literal for the '<em><b>Jar File</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_APPLICATION__JAR_FILE = eINSTANCE.getCdapApplication_JarFile();
+		/**
+		 * The meta object literal for the '<em><b>Artifact Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_APPLICATION__ARTIFACT_NAME = eINSTANCE.getCdapApplication_ArtifactName();
+		/**
+		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_APPLICATION__VERSION = eINSTANCE.getCdapApplication_Version();
+		/**
+		 * The meta object literal for the '<em><b>App Config File Content</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_APPLICATION__APP_CONFIG_FILE_CONTENT = eINSTANCE.getCdapApplication_AppConfigFileContent();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapArtifactImpl <em>Artifact</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapArtifactImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapArtifact()
+		 * @generated
+		 */
+		EClass CDAP_ARTIFACT = eINSTANCE.getCdapArtifact();
+		/**
+		 * The meta object literal for the '<em><b>Jar File</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_ARTIFACT__JAR_FILE = eINSTANCE.getCdapArtifact_JarFile();
+		/**
+		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_ARTIFACT__VERSION = eINSTANCE.getCdapArtifact_Version();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceConfigurationImpl <em>Service Instance Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceConfigurationImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapServiceInstanceConfiguration()
+		 * @generated
+		 */
+		EClass CDAP_SERVICE_INSTANCE_CONFIGURATION = eINSTANCE.getCdapServiceInstanceConfiguration();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapInternalApplicationConfigurationImpl <em>Internal Application Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapInternalApplicationConfigurationImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapInternalApplicationConfiguration()
+		 * @generated
+		 */
+		EClass CDAP_INTERNAL_APPLICATION_CONFIGURATION = eINSTANCE.getCdapInternalApplicationConfiguration();
+		/**
+		 * The meta object literal for the '<em><b>Config</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CDAP_INTERNAL_APPLICATION_CONFIGURATION__CONFIG = eINSTANCE.getCdapInternalApplicationConfiguration_Config();
+		/**
+		 * The meta object literal for the '<em><b>Preferences</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CDAP_INTERNAL_APPLICATION_CONFIGURATION__PREFERENCES = eINSTANCE.getCdapInternalApplicationConfiguration_Preferences();
+		/**
+		 * The meta object literal for the '<em><b>Apps</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CDAP_INTERNAL_APPLICATION_CONFIGURATION__APPS = eINSTANCE.getCdapInternalApplicationConfiguration_Apps();
+		/**
+		 * The meta object literal for the '<em><b>Workers</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CDAP_INTERNAL_APPLICATION_CONFIGURATION__WORKERS = eINSTANCE.getCdapInternalApplicationConfiguration_Workers();
+		/**
+		 * The meta object literal for the '<em><b>Flows</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CDAP_INTERNAL_APPLICATION_CONFIGURATION__FLOWS = eINSTANCE.getCdapInternalApplicationConfiguration_Flows();
+		/**
+		 * The meta object literal for the '<em><b>Services</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CDAP_INTERNAL_APPLICATION_CONFIGURATION__SERVICES = eINSTANCE.getCdapInternalApplicationConfiguration_Services();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceDescriptorImpl <em>Service Descriptor</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapServiceDescriptorImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapServiceDescriptor()
+		 * @generated
+		 */
+		EClass CDAP_SERVICE_DESCRIPTOR = eINSTANCE.getCdapServiceDescriptor();
+		/**
+		 * The meta object literal for the '<em><b>Service Package</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_SERVICE_DESCRIPTOR__SERVICE_PACKAGE = eINSTANCE.getCdapServiceDescriptor_ServicePackage();
+		/**
+		 * The meta object literal for the '<em><b>Service Class</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_SERVICE_DESCRIPTOR__SERVICE_CLASS = eINSTANCE.getCdapServiceDescriptor_ServiceClass();
+		/**
+		 * The meta object literal for the '<em><b>Service Instance Class</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_SERVICE_DESCRIPTOR__SERVICE_INSTANCE_CLASS = eINSTANCE.getCdapServiceDescriptor_ServiceInstanceClass();
+		/**
+		 * The meta object literal for the '<em><b>Jar File</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_SERVICE_DESCRIPTOR__JAR_FILE = eINSTANCE.getCdapServiceDescriptor_JarFile();
+
+	}
+
+} //CdapPackage
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapService.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapService.java
new file mode 100644
index 0000000..ff9c57f
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapService.java
@@ -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============================================
+ */
+	
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+import org.openecomp.dcae.controller.core.service.DcaeService;
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Service</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapService#getInstances <em>Instances</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapService()
+ * @model
+ * @generated
+ */
+public interface CdapService extends DcaeService {
+
+	/**
+	 * Returns the value of the '<em><b>Instances</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance}.
+	 * It is bidirectional and its opposite is '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getService <em>Service</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Instances</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Instances</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapService_Instances()
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getService
+	 * @model opposite="service" containment="true"
+	 * @generated
+	 */
+	EList<CdapServiceInstance> getInstances();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model instanceNameUnique="false"
+	 * @generated
+	 */
+	void updateInstanceConfiguration(String instanceName);
+} // CdapService
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapServiceDescriptor.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapServiceDescriptor.java
new file mode 100644
index 0000000..62a853e
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapServiceDescriptor.java
@@ -0,0 +1,152 @@
+
+/*-
+ * ============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.cdap;
+
+import org.openecomp.dcae.controller.core.service.DcaeServiceDescriptor;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Service Descriptor</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor#getServicePackage <em>Service Package</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor#getServiceClass <em>Service Class</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor#getServiceInstanceClass <em>Service Instance Class</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor#getJarFile <em>Jar File</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceDescriptor()
+ * @model
+ * @generated
+ */
+public interface CdapServiceDescriptor extends DcaeServiceDescriptor {
+	/**
+	 * Returns the value of the '<em><b>Service Package</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Service Package</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Service Package</em>' attribute.
+	 * @see #setServicePackage(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceDescriptor_ServicePackage()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getServicePackage();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor#getServicePackage <em>Service Package</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Service Package</em>' attribute.
+	 * @see #getServicePackage()
+	 * @generated
+	 */
+	void setServicePackage(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Service Class</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Service Class</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Service Class</em>' attribute.
+	 * @see #setServiceClass(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceDescriptor_ServiceClass()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getServiceClass();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor#getServiceClass <em>Service Class</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Service Class</em>' attribute.
+	 * @see #getServiceClass()
+	 * @generated
+	 */
+	void setServiceClass(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Service Instance Class</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Service Instance Class</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Service Instance Class</em>' attribute.
+	 * @see #setServiceInstanceClass(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceDescriptor_ServiceInstanceClass()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getServiceInstanceClass();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor#getServiceInstanceClass <em>Service Instance Class</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Service Instance Class</em>' attribute.
+	 * @see #getServiceInstanceClass()
+	 * @generated
+	 */
+	void setServiceInstanceClass(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Jar File</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Jar 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>Jar File</em>' attribute.
+	 * @see #setJarFile(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceDescriptor_JarFile()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getJarFile();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor#getJarFile <em>Jar File</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Jar File</em>' attribute.
+	 * @see #getJarFile()
+	 * @generated
+	 */
+	void setJarFile(String value);
+
+} // CdapServiceDescriptor
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapServiceInstance.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapServiceInstance.java
new file mode 100644
index 0000000..7d695d8
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapServiceInstance.java
@@ -0,0 +1,398 @@
+
+/*-
+ * ============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.cdap;
+
+import org.openecomp.dcae.controller.core.service.DcaeServiceInstance;
+
+import org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterServiceInstance;
+import org.openecomp.ncomp.cdap.CdapNamespace;
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Service Instance</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getCdapName <em>Cdap Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getNamespace <em>Namespace</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getAppJar <em>App Jar</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getAppConfigFile <em>App Config File</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getArtifacts <em>Artifacts</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getApps <em>Apps</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getAppNames <em>App Names</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getWorkerNames <em>Worker Names</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getFlowNames <em>Flow Names</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getServiceNames <em>Service Names</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getConfiguration <em>Configuration</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getCdapConfiguration <em>Cdap Configuration</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getClusterService <em>Cluster Service</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getCdapNamespace <em>Cdap Namespace</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getService <em>Service</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceInstance()
+ * @model
+ * @generated
+ */
+public interface CdapServiceInstance extends DcaeServiceInstance {
+	/**
+	 * Returns the value of the '<em><b>Cdap Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Cdap 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 Name</em>' attribute.
+	 * @see #setCdapName(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceInstance_CdapName()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getCdapName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getCdapName <em>Cdap Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Cdap Name</em>' attribute.
+	 * @see #getCdapName()
+	 * @generated
+	 */
+	void setCdapName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Cdap Namespace</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Cdap Namespace</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 Namespace</em>' reference.
+	 * @see #setCdapNamespace(CdapNamespace)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceInstance_CdapNamespace()
+	 * @model annotation="http://openecomp.org type='operational'"
+	 * @generated
+	 */
+	CdapNamespace getCdapNamespace();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getCdapNamespace <em>Cdap Namespace</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Cdap Namespace</em>' reference.
+	 * @see #getCdapNamespace()
+	 * @generated
+	 */
+	void setCdapNamespace(CdapNamespace value);
+
+	/**
+	 * Returns the value of the '<em><b>Namespace</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Namespace</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Namespace</em>' attribute.
+	 * @see #setNamespace(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceInstance_Namespace()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getNamespace();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getNamespace <em>Namespace</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Namespace</em>' attribute.
+	 * @see #getNamespace()
+	 * @generated
+	 */
+	void setNamespace(String value);
+
+	/**
+	 * Returns the value of the '<em><b>App Jar</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Jar</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>App Jar</em>' attribute.
+	 * @see #setAppJar(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceInstance_AppJar()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppJar();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getAppJar <em>App Jar</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Jar</em>' attribute.
+	 * @see #getAppJar()
+	 * @generated
+	 */
+	void setAppJar(String value);
+
+	/**
+	 * Returns the value of the '<em><b>App Config File</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Config 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>App Config File</em>' attribute.
+	 * @see #setAppConfigFile(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceInstance_AppConfigFile()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppConfigFile();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getAppConfigFile <em>App Config File</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Config File</em>' attribute.
+	 * @see #getAppConfigFile()
+	 * @generated
+	 */
+	void setAppConfigFile(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Artifacts</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.dcae.controller.service.cdap.CdapArtifact}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Artifacts</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Artifacts</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceInstance_Artifacts()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<CdapArtifact> getArtifacts();
+
+	/**
+	 * Returns the value of the '<em><b>Apps</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.dcae.controller.service.cdap.CdapApplication}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Apps</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Apps</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceInstance_Apps()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<CdapApplication> getApps();
+
+	/**
+	 * Returns the value of the '<em><b>App Names</b></em>' attribute list.
+	 * The list contents are of type {@link java.lang.String}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Names</em>' attribute list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>App Names</em>' attribute list.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceInstance_AppNames()
+	 * @model unique="false"
+	 * @generated
+	 */
+	EList<String> getAppNames();
+
+	/**
+	 * Returns the value of the '<em><b>Worker Names</b></em>' attribute list.
+	 * The list contents are of type {@link java.lang.String}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Worker Names</em>' attribute list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Worker Names</em>' attribute list.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceInstance_WorkerNames()
+	 * @model unique="false"
+	 * @generated
+	 */
+	EList<String> getWorkerNames();
+
+	/**
+	 * Returns the value of the '<em><b>Flow Names</b></em>' attribute list.
+	 * The list contents are of type {@link java.lang.String}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Flow Names</em>' attribute list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Flow Names</em>' attribute list.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceInstance_FlowNames()
+	 * @model unique="false"
+	 * @generated
+	 */
+	EList<String> getFlowNames();
+
+	/**
+	 * Returns the value of the '<em><b>Service Names</b></em>' attribute list.
+	 * The list contents are of type {@link java.lang.String}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Service Names</em>' attribute list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Service Names</em>' attribute list.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceInstance_ServiceNames()
+	 * @model unique="false"
+	 * @generated
+	 */
+	EList<String> getServiceNames();
+
+	/**
+	 * Returns the value of the '<em><b>Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Configuration</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Configuration</em>' containment reference.
+	 * @see #setConfiguration(CdapServiceInstanceConfiguration)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceInstance_Configuration()
+	 * @model containment="true"
+	 *        annotation="http://openecomp.org type='configuration'"
+	 * @generated
+	 */
+	CdapServiceInstanceConfiguration getConfiguration();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getConfiguration <em>Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Configuration</em>' containment reference.
+	 * @see #getConfiguration()
+	 * @generated
+	 */
+	void setConfiguration(CdapServiceInstanceConfiguration value);
+
+	/**
+	 * Returns the value of the '<em><b>Cdap Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Cdap Configuration</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Cdap Configuration</em>' containment reference.
+	 * @see #setCdapConfiguration(CdapInternalApplicationConfiguration)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceInstance_CdapConfiguration()
+	 * @model containment="true"
+	 *        annotation="http://openecomp.org type='operational'"
+	 * @generated
+	 */
+	CdapInternalApplicationConfiguration getCdapConfiguration();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getCdapConfiguration <em>Cdap Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Cdap Configuration</em>' containment reference.
+	 * @see #getCdapConfiguration()
+	 * @generated
+	 */
+	void setCdapConfiguration(CdapInternalApplicationConfiguration value);
+
+	/**
+	 * Returns the value of the '<em><b>Cluster Service</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Cluster Service</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Cluster Service</em>' reference.
+	 * @see #setClusterService(CdapClusterServiceInstance)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceInstance_ClusterService()
+	 * @model annotation="http://openecomp.org type='operational'"
+	 * @generated
+	 */
+	CdapClusterServiceInstance getClusterService();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getClusterService <em>Cluster Service</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Cluster Service</em>' reference.
+	 * @see #getClusterService()
+	 * @generated
+	 */
+	void setClusterService(CdapClusterServiceInstance value);
+
+	/**
+	 * Returns the value of the '<em><b>Service</b></em>' container reference.
+	 * It is bidirectional and its opposite is '{@link org.openecomp.dcae.controller.service.cdap.CdapService#getInstances <em>Instances</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Service</em>' container reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Service</em>' container reference.
+	 * @see #setService(CdapService)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceInstance_Service()
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapService#getInstances
+	 * @model opposite="instances" transient="false"
+	 *        annotation="http://openecomp.org type='operational'"
+	 * @generated
+	 */
+	CdapService getService();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getService <em>Service</em>}' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Service</em>' container reference.
+	 * @see #getService()
+	 * @generated
+	 */
+	void setService(CdapService value);
+
+} // CdapServiceInstance
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapServiceInstanceConfiguration.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapServiceInstanceConfiguration.java
new file mode 100644
index 0000000..508eb63
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapServiceInstanceConfiguration.java
@@ -0,0 +1,39 @@
+
+/*-
+ * ============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.cdap;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Service Instance Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceInstanceConfiguration()
+ * @model
+ * @generated
+ */
+public interface CdapServiceInstanceConfiguration extends EObject {
+} // CdapServiceInstanceConfiguration
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/ControllerServiceCdapAdaptor.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/ControllerServiceCdapAdaptor.java
new file mode 100644
index 0000000..dd5f9bd
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/ControllerServiceCdapAdaptor.java
@@ -0,0 +1,39 @@
+
+/*-
+ * ============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.cdap;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Controller Service Cdap Adaptor</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getControllerServiceCdapAdaptor()
+ * @model
+ * @generated
+ */
+public interface ControllerServiceCdapAdaptor extends EObject {
+} // ControllerServiceCdapAdaptor
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapApplicationImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapApplicationImpl.java
new file mode 100644
index 0000000..416472f
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapApplicationImpl.java
@@ -0,0 +1,338 @@
+
+/*-
+ * ============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.cdap.impl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapApplication;
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+
+import org.openecomp.ncomp.core.impl.NamedEntityImpl;
+
+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>Application</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapApplicationImpl#getJarFile <em>Jar File</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapApplicationImpl#getArtifactName <em>Artifact Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapApplicationImpl#getVersion <em>Version</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapApplicationImpl#getAppConfigFileContent <em>App Config File Content</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class CdapApplicationImpl extends NamedEntityImpl implements CdapApplication {
+	/**
+	 * The default value of the '{@link #getJarFile() <em>Jar File</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getJarFile()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String JAR_FILE_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getJarFile() <em>Jar File</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getJarFile()
+	 * @generated
+	 * @ordered
+	 */
+	protected String jarFile = JAR_FILE_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getArtifactName() <em>Artifact Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getArtifactName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ARTIFACT_NAME_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getArtifactName() <em>Artifact Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getArtifactName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String artifactName = ARTIFACT_NAME_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getVersion()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String VERSION_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getVersion()
+	 * @generated
+	 * @ordered
+	 */
+	protected String version = VERSION_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getAppConfigFileContent() <em>App Config File Content</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppConfigFileContent()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_CONFIG_FILE_CONTENT_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getAppConfigFileContent() <em>App Config File Content</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppConfigFileContent()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appConfigFileContent = APP_CONFIG_FILE_CONTENT_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapApplicationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_APPLICATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getJarFile() {
+		return jarFile;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setJarFile(String newJarFile) {
+		String oldJarFile = jarFile;
+		jarFile = newJarFile;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_APPLICATION__JAR_FILE, oldJarFile, jarFile));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getArtifactName() {
+		return artifactName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setArtifactName(String newArtifactName) {
+		String oldArtifactName = artifactName;
+		artifactName = newArtifactName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_APPLICATION__ARTIFACT_NAME, oldArtifactName, artifactName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getVersion() {
+		return version;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setVersion(String newVersion) {
+		String oldVersion = version;
+		version = newVersion;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_APPLICATION__VERSION, oldVersion, version));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppConfigFileContent() {
+		return appConfigFileContent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppConfigFileContent(String newAppConfigFileContent) {
+		String oldAppConfigFileContent = appConfigFileContent;
+		appConfigFileContent = newAppConfigFileContent;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_APPLICATION__APP_CONFIG_FILE_CONTENT, oldAppConfigFileContent, appConfigFileContent));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_APPLICATION__JAR_FILE:
+				return getJarFile();
+			case CdapPackage.CDAP_APPLICATION__ARTIFACT_NAME:
+				return getArtifactName();
+			case CdapPackage.CDAP_APPLICATION__VERSION:
+				return getVersion();
+			case CdapPackage.CDAP_APPLICATION__APP_CONFIG_FILE_CONTENT:
+				return getAppConfigFileContent();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case CdapPackage.CDAP_APPLICATION__JAR_FILE:
+				setJarFile((String)newValue);
+				return;
+			case CdapPackage.CDAP_APPLICATION__ARTIFACT_NAME:
+				setArtifactName((String)newValue);
+				return;
+			case CdapPackage.CDAP_APPLICATION__VERSION:
+				setVersion((String)newValue);
+				return;
+			case CdapPackage.CDAP_APPLICATION__APP_CONFIG_FILE_CONTENT:
+				setAppConfigFileContent((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_APPLICATION__JAR_FILE:
+				setJarFile(JAR_FILE_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_APPLICATION__ARTIFACT_NAME:
+				setArtifactName(ARTIFACT_NAME_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_APPLICATION__VERSION:
+				setVersion(VERSION_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_APPLICATION__APP_CONFIG_FILE_CONTENT:
+				setAppConfigFileContent(APP_CONFIG_FILE_CONTENT_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_APPLICATION__JAR_FILE:
+				return JAR_FILE_EDEFAULT == null ? jarFile != null : !JAR_FILE_EDEFAULT.equals(jarFile);
+			case CdapPackage.CDAP_APPLICATION__ARTIFACT_NAME:
+				return ARTIFACT_NAME_EDEFAULT == null ? artifactName != null : !ARTIFACT_NAME_EDEFAULT.equals(artifactName);
+			case CdapPackage.CDAP_APPLICATION__VERSION:
+				return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
+			case CdapPackage.CDAP_APPLICATION__APP_CONFIG_FILE_CONTENT:
+				return APP_CONFIG_FILE_CONTENT_EDEFAULT == null ? appConfigFileContent != null : !APP_CONFIG_FILE_CONTENT_EDEFAULT.equals(appConfigFileContent);
+		}
+		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(" (jarFile: ");
+		result.append(jarFile);
+		result.append(", artifactName: ");
+		result.append(artifactName);
+		result.append(", version: ");
+		result.append(version);
+		result.append(", appConfigFileContent: ");
+		result.append(appConfigFileContent);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapApplicationImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapArtifactImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapArtifactImpl.java
new file mode 100644
index 0000000..318204e
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapArtifactImpl.java
@@ -0,0 +1,239 @@
+
+/*-
+ * ============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.cdap.impl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapArtifact;
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+
+import org.openecomp.ncomp.core.impl.NamedEntityImpl;
+
+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>Artifact</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapArtifactImpl#getJarFile <em>Jar File</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapArtifactImpl#getVersion <em>Version</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class CdapArtifactImpl extends NamedEntityImpl implements CdapArtifact {
+	/**
+	 * The default value of the '{@link #getJarFile() <em>Jar File</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getJarFile()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String JAR_FILE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getJarFile() <em>Jar File</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getJarFile()
+	 * @generated
+	 * @ordered
+	 */
+	protected String jarFile = JAR_FILE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getVersion()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String VERSION_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getVersion()
+	 * @generated
+	 * @ordered
+	 */
+	protected String version = VERSION_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapArtifactImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_ARTIFACT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getJarFile() {
+		return jarFile;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setJarFile(String newJarFile) {
+		String oldJarFile = jarFile;
+		jarFile = newJarFile;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_ARTIFACT__JAR_FILE, oldJarFile, jarFile));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getVersion() {
+		return version;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setVersion(String newVersion) {
+		String oldVersion = version;
+		version = newVersion;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_ARTIFACT__VERSION, oldVersion, version));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_ARTIFACT__JAR_FILE:
+				return getJarFile();
+			case CdapPackage.CDAP_ARTIFACT__VERSION:
+				return getVersion();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case CdapPackage.CDAP_ARTIFACT__JAR_FILE:
+				setJarFile((String)newValue);
+				return;
+			case CdapPackage.CDAP_ARTIFACT__VERSION:
+				setVersion((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_ARTIFACT__JAR_FILE:
+				setJarFile(JAR_FILE_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_ARTIFACT__VERSION:
+				setVersion(VERSION_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_ARTIFACT__JAR_FILE:
+				return JAR_FILE_EDEFAULT == null ? jarFile != null : !JAR_FILE_EDEFAULT.equals(jarFile);
+			case CdapPackage.CDAP_ARTIFACT__VERSION:
+				return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
+		}
+		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(" (jarFile: ");
+		result.append(jarFile);
+		result.append(", version: ");
+		result.append(version);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapArtifactImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapFactoryImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapFactoryImpl.java
new file mode 100644
index 0000000..d0d0018
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapFactoryImpl.java
@@ -0,0 +1,182 @@
+
+/*-
+ * ============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.cdap.impl;
+
+import org.openecomp.dcae.controller.service.cdap.*;
+
+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 CdapFactoryImpl extends EFactoryImpl implements CdapFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static CdapFactory init() {
+		try {
+			CdapFactory theCdapFactory = (CdapFactory)EPackage.Registry.INSTANCE.getEFactory(CdapPackage.eNS_URI);
+			if (theCdapFactory != null) {
+				return theCdapFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new CdapFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case CdapPackage.CDAP_SERVICE: return createCdapService();
+			case CdapPackage.CDAP_SERVICE_INSTANCE: return createCdapServiceInstance();
+			case CdapPackage.CDAP_APPLICATION: return createCdapApplication();
+			case CdapPackage.CDAP_ARTIFACT: return createCdapArtifact();
+			case CdapPackage.CDAP_SERVICE_INSTANCE_CONFIGURATION: return createCdapServiceInstanceConfiguration();
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION: return createCdapInternalApplicationConfiguration();
+			case CdapPackage.CDAP_SERVICE_DESCRIPTOR: return createCdapServiceDescriptor();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapService createCdapService() {
+		CdapServiceImpl cdapService = new CdapServiceImpl();
+		return cdapService;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapServiceInstance createCdapServiceInstance() {
+		CdapServiceInstanceImpl cdapServiceInstance = new CdapServiceInstanceImpl();
+		return cdapServiceInstance;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapApplication createCdapApplication() {
+		CdapApplicationImpl cdapApplication = new CdapApplicationImpl();
+		return cdapApplication;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapArtifact createCdapArtifact() {
+		CdapArtifactImpl cdapArtifact = new CdapArtifactImpl();
+		return cdapArtifact;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapServiceInstanceConfiguration createCdapServiceInstanceConfiguration() {
+		CdapServiceInstanceConfigurationImpl cdapServiceInstanceConfiguration = new CdapServiceInstanceConfigurationImpl();
+		return cdapServiceInstanceConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapInternalApplicationConfiguration createCdapInternalApplicationConfiguration() {
+		CdapInternalApplicationConfigurationImpl cdapInternalApplicationConfiguration = new CdapInternalApplicationConfigurationImpl();
+		return cdapInternalApplicationConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapServiceDescriptor createCdapServiceDescriptor() {
+		CdapServiceDescriptorImpl cdapServiceDescriptor = new CdapServiceDescriptorImpl();
+		return cdapServiceDescriptor;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapPackage getCdapPackage() {
+		return (CdapPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static CdapPackage getPackage() {
+		return CdapPackage.eINSTANCE;
+	}
+
+} //CdapFactoryImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapInternalApplicationConfigurationImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapInternalApplicationConfigurationImpl.java
new file mode 100644
index 0000000..03941cd
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapInternalApplicationConfigurationImpl.java
@@ -0,0 +1,355 @@
+
+/*-
+ * ============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.cdap.impl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration;
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+
+import org.openecomp.ncomp.cdap.CdapEntityWithPreferences;
+import org.openecomp.ncomp.cdap.CdapKeyPair;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Internal Application Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapInternalApplicationConfigurationImpl#getConfig <em>Config</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapInternalApplicationConfigurationImpl#getPreferences <em>Preferences</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapInternalApplicationConfigurationImpl#getApps <em>Apps</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapInternalApplicationConfigurationImpl#getWorkers <em>Workers</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapInternalApplicationConfigurationImpl#getFlows <em>Flows</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapInternalApplicationConfigurationImpl#getServices <em>Services</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class CdapInternalApplicationConfigurationImpl extends MinimalEObjectImpl.Container implements CdapInternalApplicationConfiguration {
+	/**
+	 * The cached value of the '{@link #getConfig() <em>Config</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getConfig()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<CdapKeyPair> config;
+
+	/**
+	 * The cached value of the '{@link #getPreferences() <em>Preferences</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPreferences()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<CdapKeyPair> preferences;
+
+	/**
+	 * The cached value of the '{@link #getApps() <em>Apps</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getApps()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<CdapEntityWithPreferences> apps;
+
+	/**
+	 * The cached value of the '{@link #getWorkers() <em>Workers</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getWorkers()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<CdapEntityWithPreferences> workers;
+
+	/**
+	 * The cached value of the '{@link #getFlows() <em>Flows</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFlows()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<CdapEntityWithPreferences> flows;
+
+	/**
+	 * The cached value of the '{@link #getServices() <em>Services</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServices()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<CdapEntityWithPreferences> services;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapInternalApplicationConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_INTERNAL_APPLICATION_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<CdapKeyPair> getConfig() {
+		if (config == null) {
+			config = new EObjectContainmentEList<CdapKeyPair>(CdapKeyPair.class, this, CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__CONFIG);
+		}
+		return config;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<CdapKeyPair> getPreferences() {
+		if (preferences == null) {
+			preferences = new EObjectContainmentEList<CdapKeyPair>(CdapKeyPair.class, this, CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__PREFERENCES);
+		}
+		return preferences;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<CdapEntityWithPreferences> getApps() {
+		if (apps == null) {
+			apps = new EObjectContainmentEList<CdapEntityWithPreferences>(CdapEntityWithPreferences.class, this, CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__APPS);
+		}
+		return apps;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<CdapEntityWithPreferences> getWorkers() {
+		if (workers == null) {
+			workers = new EObjectContainmentEList<CdapEntityWithPreferences>(CdapEntityWithPreferences.class, this, CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__WORKERS);
+		}
+		return workers;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<CdapEntityWithPreferences> getFlows() {
+		if (flows == null) {
+			flows = new EObjectContainmentEList<CdapEntityWithPreferences>(CdapEntityWithPreferences.class, this, CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__FLOWS);
+		}
+		return flows;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<CdapEntityWithPreferences> getServices() {
+		if (services == null) {
+			services = new EObjectContainmentEList<CdapEntityWithPreferences>(CdapEntityWithPreferences.class, this, CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__SERVICES);
+		}
+		return services;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__CONFIG:
+				return ((InternalEList<?>)getConfig()).basicRemove(otherEnd, msgs);
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__PREFERENCES:
+				return ((InternalEList<?>)getPreferences()).basicRemove(otherEnd, msgs);
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__APPS:
+				return ((InternalEList<?>)getApps()).basicRemove(otherEnd, msgs);
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__WORKERS:
+				return ((InternalEList<?>)getWorkers()).basicRemove(otherEnd, msgs);
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__FLOWS:
+				return ((InternalEList<?>)getFlows()).basicRemove(otherEnd, msgs);
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__SERVICES:
+				return ((InternalEList<?>)getServices()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__CONFIG:
+				return getConfig();
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__PREFERENCES:
+				return getPreferences();
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__APPS:
+				return getApps();
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__WORKERS:
+				return getWorkers();
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__FLOWS:
+				return getFlows();
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__SERVICES:
+				return getServices();
+		}
+		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 CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__CONFIG:
+				getConfig().clear();
+				getConfig().addAll((Collection<? extends CdapKeyPair>)newValue);
+				return;
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__PREFERENCES:
+				getPreferences().clear();
+				getPreferences().addAll((Collection<? extends CdapKeyPair>)newValue);
+				return;
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__APPS:
+				getApps().clear();
+				getApps().addAll((Collection<? extends CdapEntityWithPreferences>)newValue);
+				return;
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__WORKERS:
+				getWorkers().clear();
+				getWorkers().addAll((Collection<? extends CdapEntityWithPreferences>)newValue);
+				return;
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__FLOWS:
+				getFlows().clear();
+				getFlows().addAll((Collection<? extends CdapEntityWithPreferences>)newValue);
+				return;
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__SERVICES:
+				getServices().clear();
+				getServices().addAll((Collection<? extends CdapEntityWithPreferences>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__CONFIG:
+				getConfig().clear();
+				return;
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__PREFERENCES:
+				getPreferences().clear();
+				return;
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__APPS:
+				getApps().clear();
+				return;
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__WORKERS:
+				getWorkers().clear();
+				return;
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__FLOWS:
+				getFlows().clear();
+				return;
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__SERVICES:
+				getServices().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__CONFIG:
+				return config != null && !config.isEmpty();
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__PREFERENCES:
+				return preferences != null && !preferences.isEmpty();
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__APPS:
+				return apps != null && !apps.isEmpty();
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__WORKERS:
+				return workers != null && !workers.isEmpty();
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__FLOWS:
+				return flows != null && !flows.isEmpty();
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION__SERVICES:
+				return services != null && !services.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //CdapInternalApplicationConfigurationImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapPackageImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapPackageImpl.java
new file mode 100644
index 0000000..e6e6f7c
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapPackageImpl.java
@@ -0,0 +1,759 @@
+
+/*-
+ * ============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.cdap.impl;
+
+import org.openecomp.dcae.controller.core.service.ServicePackage;
+import org.openecomp.dcae.controller.service.cdap.CdapApplication;
+import org.openecomp.dcae.controller.service.cdap.CdapArtifact;
+import org.openecomp.dcae.controller.service.cdap.CdapFactory;
+import org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration;
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapService;
+import org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor;
+import org.openecomp.dcae.controller.service.cdap.CdapServiceInstance;
+import org.openecomp.dcae.controller.service.cdap.CdapServiceInstanceConfiguration;
+import org.openecomp.ncomp.core.CorePackage;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EOperation;
+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 CdapPackageImpl extends EPackageImpl implements CdapPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapServiceEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapServiceInstanceEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapApplicationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapArtifactEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapServiceInstanceConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapInternalApplicationConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapServiceDescriptorEClass = 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.cdap.CdapPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private CdapPackageImpl() {
+		super(eNS_URI, CdapFactory.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 CdapPackage#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 CdapPackage init() {
+		if (isInited) return (CdapPackage)EPackage.Registry.INSTANCE.getEPackage(CdapPackage.eNS_URI);
+
+		// Obtain or create and register package
+		CdapPackageImpl theCdapPackage = (CdapPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CdapPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new CdapPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		org.openecomp.dcae.controller.service.cdap.cluster.service.ServicePackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theCdapPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theCdapPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theCdapPackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(CdapPackage.eNS_URI, theCdapPackage);
+		return theCdapPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapService() {
+		return cdapServiceEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCdapService_Instances() {
+		return (EReference)cdapServiceEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getCdapService__UpdateInstanceConfiguration__String() {
+		return cdapServiceEClass.getEOperations().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapServiceInstance() {
+		return cdapServiceInstanceEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapServiceInstance_CdapName() {
+		return (EAttribute)cdapServiceInstanceEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCdapServiceInstance_CdapNamespace() {
+		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(13);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapServiceInstance_Namespace() {
+		return (EAttribute)cdapServiceInstanceEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapServiceInstance_AppJar() {
+		return (EAttribute)cdapServiceInstanceEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapServiceInstance_AppConfigFile() {
+		return (EAttribute)cdapServiceInstanceEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCdapServiceInstance_Artifacts() {
+		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCdapServiceInstance_Apps() {
+		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapServiceInstance_AppNames() {
+		return (EAttribute)cdapServiceInstanceEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapServiceInstance_WorkerNames() {
+		return (EAttribute)cdapServiceInstanceEClass.getEStructuralFeatures().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapServiceInstance_FlowNames() {
+		return (EAttribute)cdapServiceInstanceEClass.getEStructuralFeatures().get(8);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapServiceInstance_ServiceNames() {
+		return (EAttribute)cdapServiceInstanceEClass.getEStructuralFeatures().get(9);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCdapServiceInstance_Configuration() {
+		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(10);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCdapServiceInstance_CdapConfiguration() {
+		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(11);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCdapServiceInstance_ClusterService() {
+		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(12);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCdapServiceInstance_Service() {
+		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(14);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapApplication() {
+		return cdapApplicationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapApplication_JarFile() {
+		return (EAttribute)cdapApplicationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapApplication_ArtifactName() {
+		return (EAttribute)cdapApplicationEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapApplication_Version() {
+		return (EAttribute)cdapApplicationEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapApplication_AppConfigFileContent() {
+		return (EAttribute)cdapApplicationEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapArtifact() {
+		return cdapArtifactEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapArtifact_JarFile() {
+		return (EAttribute)cdapArtifactEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapArtifact_Version() {
+		return (EAttribute)cdapArtifactEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapServiceInstanceConfiguration() {
+		return cdapServiceInstanceConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapInternalApplicationConfiguration() {
+		return cdapInternalApplicationConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCdapInternalApplicationConfiguration_Config() {
+		return (EReference)cdapInternalApplicationConfigurationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCdapInternalApplicationConfiguration_Preferences() {
+		return (EReference)cdapInternalApplicationConfigurationEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCdapInternalApplicationConfiguration_Apps() {
+		return (EReference)cdapInternalApplicationConfigurationEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCdapInternalApplicationConfiguration_Workers() {
+		return (EReference)cdapInternalApplicationConfigurationEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCdapInternalApplicationConfiguration_Flows() {
+		return (EReference)cdapInternalApplicationConfigurationEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCdapInternalApplicationConfiguration_Services() {
+		return (EReference)cdapInternalApplicationConfigurationEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapServiceDescriptor() {
+		return cdapServiceDescriptorEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapServiceDescriptor_ServicePackage() {
+		return (EAttribute)cdapServiceDescriptorEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapServiceDescriptor_ServiceClass() {
+		return (EAttribute)cdapServiceDescriptorEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapServiceDescriptor_ServiceInstanceClass() {
+		return (EAttribute)cdapServiceDescriptorEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapServiceDescriptor_JarFile() {
+		return (EAttribute)cdapServiceDescriptorEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapFactory getCdapFactory() {
+		return (CdapFactory)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
+		cdapServiceEClass = createEClass(CDAP_SERVICE);
+		createEReference(cdapServiceEClass, CDAP_SERVICE__INSTANCES);
+		createEOperation(cdapServiceEClass, CDAP_SERVICE___UPDATE_INSTANCE_CONFIGURATION__STRING);
+
+		cdapServiceInstanceEClass = createEClass(CDAP_SERVICE_INSTANCE);
+		createEAttribute(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__CDAP_NAME);
+		createEAttribute(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__NAMESPACE);
+		createEAttribute(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__APP_JAR);
+		createEAttribute(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__APP_CONFIG_FILE);
+		createEReference(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__ARTIFACTS);
+		createEReference(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__APPS);
+		createEAttribute(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__APP_NAMES);
+		createEAttribute(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__WORKER_NAMES);
+		createEAttribute(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__FLOW_NAMES);
+		createEAttribute(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__SERVICE_NAMES);
+		createEReference(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__CONFIGURATION);
+		createEReference(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__CDAP_CONFIGURATION);
+		createEReference(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__CLUSTER_SERVICE);
+		createEReference(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__CDAP_NAMESPACE);
+		createEReference(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__SERVICE);
+
+		cdapApplicationEClass = createEClass(CDAP_APPLICATION);
+		createEAttribute(cdapApplicationEClass, CDAP_APPLICATION__JAR_FILE);
+		createEAttribute(cdapApplicationEClass, CDAP_APPLICATION__ARTIFACT_NAME);
+		createEAttribute(cdapApplicationEClass, CDAP_APPLICATION__VERSION);
+		createEAttribute(cdapApplicationEClass, CDAP_APPLICATION__APP_CONFIG_FILE_CONTENT);
+
+		cdapArtifactEClass = createEClass(CDAP_ARTIFACT);
+		createEAttribute(cdapArtifactEClass, CDAP_ARTIFACT__JAR_FILE);
+		createEAttribute(cdapArtifactEClass, CDAP_ARTIFACT__VERSION);
+
+		cdapServiceInstanceConfigurationEClass = createEClass(CDAP_SERVICE_INSTANCE_CONFIGURATION);
+
+		cdapInternalApplicationConfigurationEClass = createEClass(CDAP_INTERNAL_APPLICATION_CONFIGURATION);
+		createEReference(cdapInternalApplicationConfigurationEClass, CDAP_INTERNAL_APPLICATION_CONFIGURATION__CONFIG);
+		createEReference(cdapInternalApplicationConfigurationEClass, CDAP_INTERNAL_APPLICATION_CONFIGURATION__PREFERENCES);
+		createEReference(cdapInternalApplicationConfigurationEClass, CDAP_INTERNAL_APPLICATION_CONFIGURATION__APPS);
+		createEReference(cdapInternalApplicationConfigurationEClass, CDAP_INTERNAL_APPLICATION_CONFIGURATION__WORKERS);
+		createEReference(cdapInternalApplicationConfigurationEClass, CDAP_INTERNAL_APPLICATION_CONFIGURATION__FLOWS);
+		createEReference(cdapInternalApplicationConfigurationEClass, CDAP_INTERNAL_APPLICATION_CONFIGURATION__SERVICES);
+
+		cdapServiceDescriptorEClass = createEClass(CDAP_SERVICE_DESCRIPTOR);
+		createEAttribute(cdapServiceDescriptorEClass, CDAP_SERVICE_DESCRIPTOR__SERVICE_PACKAGE);
+		createEAttribute(cdapServiceDescriptorEClass, CDAP_SERVICE_DESCRIPTOR__SERVICE_CLASS);
+		createEAttribute(cdapServiceDescriptorEClass, CDAP_SERVICE_DESCRIPTOR__SERVICE_INSTANCE_CLASS);
+		createEAttribute(cdapServiceDescriptorEClass, CDAP_SERVICE_DESCRIPTOR__JAR_FILE);
+	}
+
+	/**
+	 * <!-- 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
+		ServicePackage theServicePackage_1 = (ServicePackage)EPackage.Registry.INSTANCE.getEPackage(ServicePackage.eNS_URI);
+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+		org.openecomp.dcae.controller.service.cdap.cluster.service.ServicePackage theServicePackage = (org.openecomp.dcae.controller.service.cdap.cluster.service.ServicePackage)EPackage.Registry.INSTANCE.getEPackage(org.openecomp.dcae.controller.service.cdap.cluster.service.ServicePackage.eNS_URI);
+		org.openecomp.ncomp.cdap.CdapPackage theCdapPackage_1 = (org.openecomp.ncomp.cdap.CdapPackage)EPackage.Registry.INSTANCE.getEPackage(org.openecomp.ncomp.cdap.CdapPackage.eNS_URI);
+		CorePackage theCorePackage = (CorePackage)EPackage.Registry.INSTANCE.getEPackage(CorePackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		cdapServiceEClass.getESuperTypes().add(theServicePackage_1.getDcaeService());
+		cdapServiceInstanceEClass.getESuperTypes().add(theServicePackage_1.getDcaeServiceInstance());
+		cdapApplicationEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
+		cdapArtifactEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
+		cdapServiceDescriptorEClass.getESuperTypes().add(theServicePackage_1.getDcaeServiceDescriptor());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(cdapServiceEClass, CdapService.class, "CdapService", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getCdapService_Instances(), this.getCdapServiceInstance(), this.getCdapServiceInstance_Service(), "instances", null, 0, -1, CdapService.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		EOperation op = initEOperation(getCdapService__UpdateInstanceConfiguration__String(), null, "updateInstanceConfiguration", 0, 1, !IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, theEcorePackage.getEString(), "instanceName", 0, 1, !IS_UNIQUE, IS_ORDERED);
+
+		initEClass(cdapServiceInstanceEClass, CdapServiceInstance.class, "CdapServiceInstance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapServiceInstance_CdapName(), theEcorePackage.getEString(), "cdapName", null, 0, 1, CdapServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapServiceInstance_Namespace(), theEcorePackage.getEString(), "namespace", null, 0, 1, CdapServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapServiceInstance_AppJar(), theEcorePackage.getEString(), "appJar", null, 0, 1, CdapServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapServiceInstance_AppConfigFile(), theEcorePackage.getEString(), "appConfigFile", null, 0, 1, CdapServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCdapServiceInstance_Artifacts(), this.getCdapArtifact(), null, "artifacts", null, 0, -1, CdapServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCdapServiceInstance_Apps(), this.getCdapApplication(), null, "apps", null, 0, -1, CdapServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapServiceInstance_AppNames(), theEcorePackage.getEString(), "appNames", null, 0, -1, CdapServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapServiceInstance_WorkerNames(), theEcorePackage.getEString(), "workerNames", null, 0, -1, CdapServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapServiceInstance_FlowNames(), theEcorePackage.getEString(), "flowNames", null, 0, -1, CdapServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapServiceInstance_ServiceNames(), theEcorePackage.getEString(), "serviceNames", null, 0, -1, CdapServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCdapServiceInstance_Configuration(), this.getCdapServiceInstanceConfiguration(), null, "configuration", null, 0, 1, CdapServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCdapServiceInstance_CdapConfiguration(), this.getCdapInternalApplicationConfiguration(), null, "cdapConfiguration", null, 0, 1, CdapServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCdapServiceInstance_ClusterService(), theServicePackage.getCdapClusterServiceInstance(), null, "clusterService", null, 0, 1, CdapServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCdapServiceInstance_CdapNamespace(), theCdapPackage_1.getCdapNamespace(), null, "cdapNamespace", null, 0, 1, CdapServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCdapServiceInstance_Service(), this.getCdapService(), this.getCdapService_Instances(), "service", null, 0, 1, CdapServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapApplicationEClass, CdapApplication.class, "CdapApplication", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapApplication_JarFile(), theEcorePackage.getEString(), "jarFile", null, 0, 1, CdapApplication.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapApplication_ArtifactName(), theEcorePackage.getEString(), "artifactName", null, 0, 1, CdapApplication.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapApplication_Version(), theEcorePackage.getEString(), "version", null, 0, 1, CdapApplication.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapApplication_AppConfigFileContent(), theEcorePackage.getEString(), "appConfigFileContent", null, 0, 1, CdapApplication.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapArtifactEClass, CdapArtifact.class, "CdapArtifact", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapArtifact_JarFile(), theEcorePackage.getEString(), "jarFile", null, 0, 1, CdapArtifact.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapArtifact_Version(), theEcorePackage.getEString(), "version", null, 0, 1, CdapArtifact.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapServiceInstanceConfigurationEClass, CdapServiceInstanceConfiguration.class, "CdapServiceInstanceConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(cdapInternalApplicationConfigurationEClass, CdapInternalApplicationConfiguration.class, "CdapInternalApplicationConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getCdapInternalApplicationConfiguration_Config(), theCdapPackage_1.getCdapKeyPair(), null, "config", null, 0, -1, CdapInternalApplicationConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getCdapInternalApplicationConfiguration_Preferences(), theCdapPackage_1.getCdapKeyPair(), null, "preferences", null, 0, -1, CdapInternalApplicationConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getCdapInternalApplicationConfiguration_Apps(), theCdapPackage_1.getCdapEntityWithPreferences(), null, "apps", null, 0, -1, CdapInternalApplicationConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getCdapInternalApplicationConfiguration_Workers(), theCdapPackage_1.getCdapEntityWithPreferences(), null, "workers", null, 0, -1, CdapInternalApplicationConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getCdapInternalApplicationConfiguration_Flows(), theCdapPackage_1.getCdapEntityWithPreferences(), null, "flows", null, 0, -1, CdapInternalApplicationConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getCdapInternalApplicationConfiguration_Services(), theCdapPackage_1.getCdapEntityWithPreferences(), null, "services", null, 0, -1, CdapInternalApplicationConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(cdapServiceDescriptorEClass, CdapServiceDescriptor.class, "CdapServiceDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapServiceDescriptor_ServicePackage(), theEcorePackage.getEString(), "servicePackage", null, 0, 1, CdapServiceDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapServiceDescriptor_ServiceClass(), theEcorePackage.getEString(), "serviceClass", null, 0, 1, CdapServiceDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapServiceDescriptor_ServiceInstanceClass(), theEcorePackage.getEString(), "serviceInstanceClass", null, 0, 1, CdapServiceDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapServiceDescriptor_JarFile(), theEcorePackage.getEString(), "jarFile", null, 0, 1, CdapServiceDescriptor.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",
+			 "cdap", "http://openecomp.org/cdap"
+		   });
+	}
+
+	/**
+	 * 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
+		  (getCdapServiceInstance_Configuration(), 
+		   source, 
+		   new String[] {
+			 "type", "configuration"
+		   });	
+		addAnnotation
+		  (getCdapServiceInstance_CdapConfiguration(), 
+		   source, 
+		   new String[] {
+			 "type", "operational"
+		   });	
+		addAnnotation
+		  (getCdapServiceInstance_ClusterService(), 
+		   source, 
+		   new String[] {
+			 "type", "operational"
+		   });	
+		addAnnotation
+		  (getCdapServiceInstance_CdapNamespace(), 
+		   source, 
+		   new String[] {
+			 "type", "operational"
+		   });	
+		addAnnotation
+		  (getCdapServiceInstance_Service(), 
+		   source, 
+		   new String[] {
+			 "type", "operational"
+		   });
+	}
+
+} //CdapPackageImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceDescriptorImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceDescriptorImpl.java
new file mode 100644
index 0000000..7855124
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceDescriptorImpl.java
@@ -0,0 +1,347 @@
+
+/*-
+ * ============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.cdap.impl;
+
+import org.openecomp.dcae.controller.core.service.impl.DcaeServiceDescriptorImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor;
+
+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>Service Descriptor</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceDescriptorImpl#getServicePackage <em>Service Package</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceDescriptorImpl#getServiceClass <em>Service Class</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceDescriptorImpl#getServiceInstanceClass <em>Service Instance Class</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceDescriptorImpl#getJarFile <em>Jar File</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class CdapServiceDescriptorImpl extends DcaeServiceDescriptorImpl implements CdapServiceDescriptor {
+	/**
+	 * The default value of the '{@link #getServicePackage() <em>Service Package</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServicePackage()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SERVICE_PACKAGE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getServicePackage() <em>Service Package</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServicePackage()
+	 * @generated
+	 * @ordered
+	 */
+	protected String servicePackage = SERVICE_PACKAGE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getServiceClass() <em>Service Class</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServiceClass()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SERVICE_CLASS_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getServiceClass() <em>Service Class</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServiceClass()
+	 * @generated
+	 * @ordered
+	 */
+	protected String serviceClass = SERVICE_CLASS_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getServiceInstanceClass() <em>Service Instance Class</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServiceInstanceClass()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SERVICE_INSTANCE_CLASS_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getServiceInstanceClass() <em>Service Instance Class</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServiceInstanceClass()
+	 * @generated
+	 * @ordered
+	 */
+	protected String serviceInstanceClass = SERVICE_INSTANCE_CLASS_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getJarFile() <em>Jar File</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getJarFile()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String JAR_FILE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getJarFile() <em>Jar File</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getJarFile()
+	 * @generated
+	 * @ordered
+	 */
+	protected String jarFile = JAR_FILE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapServiceDescriptorImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_SERVICE_DESCRIPTOR;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getServicePackage() {
+		return servicePackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setServicePackage(String newServicePackage) {
+		String oldServicePackage = servicePackage;
+		servicePackage = newServicePackage;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_SERVICE_DESCRIPTOR__SERVICE_PACKAGE, oldServicePackage, servicePackage));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getServiceClass() {
+		return serviceClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setServiceClass(String newServiceClass) {
+		String oldServiceClass = serviceClass;
+		serviceClass = newServiceClass;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_SERVICE_DESCRIPTOR__SERVICE_CLASS, oldServiceClass, serviceClass));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getServiceInstanceClass() {
+		return serviceInstanceClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setServiceInstanceClass(String newServiceInstanceClass) {
+		String oldServiceInstanceClass = serviceInstanceClass;
+		serviceInstanceClass = newServiceInstanceClass;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_SERVICE_DESCRIPTOR__SERVICE_INSTANCE_CLASS, oldServiceInstanceClass, serviceInstanceClass));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getJarFile() {
+		return jarFile;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setJarFile(String newJarFile) {
+		String oldJarFile = jarFile;
+		jarFile = newJarFile;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_SERVICE_DESCRIPTOR__JAR_FILE, oldJarFile, jarFile));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_SERVICE_DESCRIPTOR__SERVICE_PACKAGE:
+				return getServicePackage();
+			case CdapPackage.CDAP_SERVICE_DESCRIPTOR__SERVICE_CLASS:
+				return getServiceClass();
+			case CdapPackage.CDAP_SERVICE_DESCRIPTOR__SERVICE_INSTANCE_CLASS:
+				return getServiceInstanceClass();
+			case CdapPackage.CDAP_SERVICE_DESCRIPTOR__JAR_FILE:
+				return getJarFile();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case CdapPackage.CDAP_SERVICE_DESCRIPTOR__SERVICE_PACKAGE:
+				setServicePackage((String)newValue);
+				return;
+			case CdapPackage.CDAP_SERVICE_DESCRIPTOR__SERVICE_CLASS:
+				setServiceClass((String)newValue);
+				return;
+			case CdapPackage.CDAP_SERVICE_DESCRIPTOR__SERVICE_INSTANCE_CLASS:
+				setServiceInstanceClass((String)newValue);
+				return;
+			case CdapPackage.CDAP_SERVICE_DESCRIPTOR__JAR_FILE:
+				setJarFile((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_SERVICE_DESCRIPTOR__SERVICE_PACKAGE:
+				setServicePackage(SERVICE_PACKAGE_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_SERVICE_DESCRIPTOR__SERVICE_CLASS:
+				setServiceClass(SERVICE_CLASS_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_SERVICE_DESCRIPTOR__SERVICE_INSTANCE_CLASS:
+				setServiceInstanceClass(SERVICE_INSTANCE_CLASS_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_SERVICE_DESCRIPTOR__JAR_FILE:
+				setJarFile(JAR_FILE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_SERVICE_DESCRIPTOR__SERVICE_PACKAGE:
+				return SERVICE_PACKAGE_EDEFAULT == null ? servicePackage != null : !SERVICE_PACKAGE_EDEFAULT.equals(servicePackage);
+			case CdapPackage.CDAP_SERVICE_DESCRIPTOR__SERVICE_CLASS:
+				return SERVICE_CLASS_EDEFAULT == null ? serviceClass != null : !SERVICE_CLASS_EDEFAULT.equals(serviceClass);
+			case CdapPackage.CDAP_SERVICE_DESCRIPTOR__SERVICE_INSTANCE_CLASS:
+				return SERVICE_INSTANCE_CLASS_EDEFAULT == null ? serviceInstanceClass != null : !SERVICE_INSTANCE_CLASS_EDEFAULT.equals(serviceInstanceClass);
+			case CdapPackage.CDAP_SERVICE_DESCRIPTOR__JAR_FILE:
+				return JAR_FILE_EDEFAULT == null ? jarFile != null : !JAR_FILE_EDEFAULT.equals(jarFile);
+		}
+		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(" (servicePackage: ");
+		result.append(servicePackage);
+		result.append(", serviceClass: ");
+		result.append(serviceClass);
+		result.append(", serviceInstanceClass: ");
+		result.append(serviceInstanceClass);
+		result.append(", jarFile: ");
+		result.append(jarFile);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapServiceDescriptorImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceImpl.java
new file mode 100644
index 0000000..a219229
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceImpl.java
@@ -0,0 +1,209 @@
+
+/*-
+ * ============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.cdap.impl;
+
+import org.openecomp.dcae.controller.core.service.impl.DcaeServiceImpl;
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapService;
+import org.openecomp.dcae.controller.service.cdap.CdapServiceInstance;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collection;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Service</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceImpl#getInstances <em>Instances</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class CdapServiceImpl extends DcaeServiceImpl implements CdapService {
+	/**
+	 * The cached value of the '{@link #getInstances() <em>Instances</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getInstances()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<CdapServiceInstance> instances;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapServiceImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_SERVICE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<CdapServiceInstance> getInstances() {
+		if (instances == null) {
+			instances = new EObjectContainmentWithInverseEList<CdapServiceInstance>(CdapServiceInstance.class, this, CdapPackage.CDAP_SERVICE__INSTANCES, CdapPackage.CDAP_SERVICE_INSTANCE__SERVICE);
+		}
+		return instances;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void updateInstanceConfiguration(String instanceName) {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case CdapPackage.CDAP_SERVICE__INSTANCES:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getInstances()).basicAdd(otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case CdapPackage.CDAP_SERVICE__INSTANCES:
+				return ((InternalEList<?>)getInstances()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_SERVICE__INSTANCES:
+				return getInstances();
+		}
+		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 CdapPackage.CDAP_SERVICE__INSTANCES:
+				getInstances().clear();
+				getInstances().addAll((Collection<? extends CdapServiceInstance>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_SERVICE__INSTANCES:
+				getInstances().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_SERVICE__INSTANCES:
+				return instances != null && !instances.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch (operationID) {
+			case CdapPackage.CDAP_SERVICE___UPDATE_INSTANCE_CONFIGURATION__STRING:
+				updateInstanceConfiguration((String)arguments.get(0));
+				return null;
+		}
+		return super.eInvoke(operationID, arguments);
+	}
+
+} //CdapServiceImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceInstanceConfigurationImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceInstanceConfigurationImpl.java
new file mode 100644
index 0000000..b4fbc69
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceInstanceConfigurationImpl.java
@@ -0,0 +1,62 @@
+
+/*-
+ * ============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.cdap.impl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapServiceInstanceConfiguration;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Service Instance Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class CdapServiceInstanceConfigurationImpl extends MinimalEObjectImpl.Container implements CdapServiceInstanceConfiguration {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapServiceInstanceConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_SERVICE_INSTANCE_CONFIGURATION;
+	}
+
+} //CdapServiceInstanceConfigurationImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceInstanceImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceInstanceImpl.java
new file mode 100644
index 0000000..07ebb3e
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceInstanceImpl.java
@@ -0,0 +1,939 @@
+
+/*-
+ * ============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.cdap.impl;
+
+import org.openecomp.dcae.controller.core.service.impl.DcaeServiceInstanceImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapApplication;
+import org.openecomp.dcae.controller.service.cdap.CdapArtifact;
+import org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration;
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapService;
+import org.openecomp.dcae.controller.service.cdap.CdapServiceInstance;
+
+import org.openecomp.dcae.controller.service.cdap.CdapServiceInstanceConfiguration;
+import org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterServiceInstance;
+import org.openecomp.ncomp.cdap.CdapNamespace;
+
+import java.util.Collection;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EDataTypeEList;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Service Instance</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getCdapName <em>Cdap Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getNamespace <em>Namespace</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getAppJar <em>App Jar</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getAppConfigFile <em>App Config File</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getArtifacts <em>Artifacts</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getApps <em>Apps</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getAppNames <em>App Names</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getWorkerNames <em>Worker Names</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getFlowNames <em>Flow Names</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getServiceNames <em>Service Names</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getConfiguration <em>Configuration</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getCdapConfiguration <em>Cdap Configuration</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getClusterService <em>Cluster Service</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getCdapNamespace <em>Cdap Namespace</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getService <em>Service</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class CdapServiceInstanceImpl extends DcaeServiceInstanceImpl implements CdapServiceInstance {
+	/**
+	 * The default value of the '{@link #getCdapName() <em>Cdap Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCdapName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String CDAP_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getCdapName() <em>Cdap Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCdapName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String cdapName = CDAP_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getNamespace()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAMESPACE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getNamespace()
+	 * @generated
+	 * @ordered
+	 */
+	protected String namespace = NAMESPACE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getAppJar() <em>App Jar</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppJar()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_JAR_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppJar() <em>App Jar</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppJar()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appJar = APP_JAR_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getAppConfigFile() <em>App Config File</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppConfigFile()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_CONFIG_FILE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppConfigFile() <em>App Config File</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppConfigFile()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appConfigFile = APP_CONFIG_FILE_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getArtifacts() <em>Artifacts</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getArtifacts()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<CdapArtifact> artifacts;
+
+	/**
+	 * The cached value of the '{@link #getApps() <em>Apps</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getApps()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<CdapApplication> apps;
+
+	/**
+	 * The cached value of the '{@link #getAppNames() <em>App Names</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppNames()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<String> appNames;
+
+	/**
+	 * The cached value of the '{@link #getWorkerNames() <em>Worker Names</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getWorkerNames()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<String> workerNames;
+
+	/**
+	 * The cached value of the '{@link #getFlowNames() <em>Flow Names</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFlowNames()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<String> flowNames;
+
+	/**
+	 * The cached value of the '{@link #getServiceNames() <em>Service Names</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServiceNames()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<String> serviceNames;
+
+	/**
+	 * The cached value of the '{@link #getConfiguration() <em>Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getConfiguration()
+	 * @generated
+	 * @ordered
+	 */
+	protected CdapServiceInstanceConfiguration configuration;
+
+	/**
+	 * The cached value of the '{@link #getCdapConfiguration() <em>Cdap Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCdapConfiguration()
+	 * @generated
+	 * @ordered
+	 */
+	protected CdapInternalApplicationConfiguration cdapConfiguration;
+
+	/**
+	 * The cached value of the '{@link #getClusterService() <em>Cluster Service</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getClusterService()
+	 * @generated
+	 * @ordered
+	 */
+	protected CdapClusterServiceInstance clusterService;
+
+	/**
+	 * The cached value of the '{@link #getCdapNamespace() <em>Cdap Namespace</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCdapNamespace()
+	 * @generated
+	 * @ordered
+	 */
+	protected CdapNamespace cdapNamespace;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapServiceInstanceImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_SERVICE_INSTANCE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getCdapName() {
+		return cdapName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCdapName(String newCdapName) {
+		String oldCdapName = cdapName;
+		cdapName = newCdapName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_SERVICE_INSTANCE__CDAP_NAME, oldCdapName, cdapName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapNamespace getCdapNamespace() {
+		if (cdapNamespace != null && cdapNamespace.eIsProxy()) {
+			InternalEObject oldCdapNamespace = (InternalEObject)cdapNamespace;
+			cdapNamespace = (CdapNamespace)eResolveProxy(oldCdapNamespace);
+			if (cdapNamespace != oldCdapNamespace) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, CdapPackage.CDAP_SERVICE_INSTANCE__CDAP_NAMESPACE, oldCdapNamespace, cdapNamespace));
+			}
+		}
+		return cdapNamespace;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapNamespace basicGetCdapNamespace() {
+		return cdapNamespace;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCdapNamespace(CdapNamespace newCdapNamespace) {
+		CdapNamespace oldCdapNamespace = cdapNamespace;
+		cdapNamespace = newCdapNamespace;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_SERVICE_INSTANCE__CDAP_NAMESPACE, oldCdapNamespace, cdapNamespace));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getNamespace() {
+		return namespace;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setNamespace(String newNamespace) {
+		String oldNamespace = namespace;
+		namespace = newNamespace;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_SERVICE_INSTANCE__NAMESPACE, oldNamespace, namespace));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppJar() {
+		return appJar;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppJar(String newAppJar) {
+		String oldAppJar = appJar;
+		appJar = newAppJar;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_SERVICE_INSTANCE__APP_JAR, oldAppJar, appJar));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppConfigFile() {
+		return appConfigFile;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppConfigFile(String newAppConfigFile) {
+		String oldAppConfigFile = appConfigFile;
+		appConfigFile = newAppConfigFile;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_SERVICE_INSTANCE__APP_CONFIG_FILE, oldAppConfigFile, appConfigFile));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<CdapArtifact> getArtifacts() {
+		if (artifacts == null) {
+			artifacts = new EObjectContainmentEList<CdapArtifact>(CdapArtifact.class, this, CdapPackage.CDAP_SERVICE_INSTANCE__ARTIFACTS);
+		}
+		return artifacts;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<CdapApplication> getApps() {
+		if (apps == null) {
+			apps = new EObjectContainmentEList<CdapApplication>(CdapApplication.class, this, CdapPackage.CDAP_SERVICE_INSTANCE__APPS);
+		}
+		return apps;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<String> getAppNames() {
+		if (appNames == null) {
+			appNames = new EDataTypeEList<String>(String.class, this, CdapPackage.CDAP_SERVICE_INSTANCE__APP_NAMES);
+		}
+		return appNames;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<String> getWorkerNames() {
+		if (workerNames == null) {
+			workerNames = new EDataTypeEList<String>(String.class, this, CdapPackage.CDAP_SERVICE_INSTANCE__WORKER_NAMES);
+		}
+		return workerNames;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<String> getFlowNames() {
+		if (flowNames == null) {
+			flowNames = new EDataTypeEList<String>(String.class, this, CdapPackage.CDAP_SERVICE_INSTANCE__FLOW_NAMES);
+		}
+		return flowNames;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<String> getServiceNames() {
+		if (serviceNames == null) {
+			serviceNames = new EDataTypeEList<String>(String.class, this, CdapPackage.CDAP_SERVICE_INSTANCE__SERVICE_NAMES);
+		}
+		return serviceNames;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapServiceInstanceConfiguration getConfiguration() {
+		return configuration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetConfiguration(CdapServiceInstanceConfiguration newConfiguration, NotificationChain msgs) {
+		CdapServiceInstanceConfiguration oldConfiguration = configuration;
+		configuration = newConfiguration;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_SERVICE_INSTANCE__CONFIGURATION, oldConfiguration, newConfiguration);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setConfiguration(CdapServiceInstanceConfiguration newConfiguration) {
+		if (newConfiguration != configuration) {
+			NotificationChain msgs = null;
+			if (configuration != null)
+				msgs = ((InternalEObject)configuration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CdapPackage.CDAP_SERVICE_INSTANCE__CONFIGURATION, null, msgs);
+			if (newConfiguration != null)
+				msgs = ((InternalEObject)newConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CdapPackage.CDAP_SERVICE_INSTANCE__CONFIGURATION, null, msgs);
+			msgs = basicSetConfiguration(newConfiguration, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_SERVICE_INSTANCE__CONFIGURATION, newConfiguration, newConfiguration));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapInternalApplicationConfiguration getCdapConfiguration() {
+		return cdapConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetCdapConfiguration(CdapInternalApplicationConfiguration newCdapConfiguration, NotificationChain msgs) {
+		CdapInternalApplicationConfiguration oldCdapConfiguration = cdapConfiguration;
+		cdapConfiguration = newCdapConfiguration;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_SERVICE_INSTANCE__CDAP_CONFIGURATION, oldCdapConfiguration, newCdapConfiguration);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCdapConfiguration(CdapInternalApplicationConfiguration newCdapConfiguration) {
+		if (newCdapConfiguration != cdapConfiguration) {
+			NotificationChain msgs = null;
+			if (cdapConfiguration != null)
+				msgs = ((InternalEObject)cdapConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CdapPackage.CDAP_SERVICE_INSTANCE__CDAP_CONFIGURATION, null, msgs);
+			if (newCdapConfiguration != null)
+				msgs = ((InternalEObject)newCdapConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CdapPackage.CDAP_SERVICE_INSTANCE__CDAP_CONFIGURATION, null, msgs);
+			msgs = basicSetCdapConfiguration(newCdapConfiguration, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_SERVICE_INSTANCE__CDAP_CONFIGURATION, newCdapConfiguration, newCdapConfiguration));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapClusterServiceInstance getClusterService() {
+		if (clusterService != null && clusterService.eIsProxy()) {
+			InternalEObject oldClusterService = (InternalEObject)clusterService;
+			clusterService = (CdapClusterServiceInstance)eResolveProxy(oldClusterService);
+			if (clusterService != oldClusterService) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, CdapPackage.CDAP_SERVICE_INSTANCE__CLUSTER_SERVICE, oldClusterService, clusterService));
+			}
+		}
+		return clusterService;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapClusterServiceInstance basicGetClusterService() {
+		return clusterService;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setClusterService(CdapClusterServiceInstance newClusterService) {
+		CdapClusterServiceInstance oldClusterService = clusterService;
+		clusterService = newClusterService;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_SERVICE_INSTANCE__CLUSTER_SERVICE, oldClusterService, clusterService));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapService getService() {
+		if (eContainerFeatureID() != CdapPackage.CDAP_SERVICE_INSTANCE__SERVICE) return null;
+		return (CdapService)eContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapService basicGetService() {
+		if (eContainerFeatureID() != CdapPackage.CDAP_SERVICE_INSTANCE__SERVICE) return null;
+		return (CdapService)eInternalContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetService(CdapService newService, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newService, CdapPackage.CDAP_SERVICE_INSTANCE__SERVICE, msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setService(CdapService newService) {
+		if (newService != eInternalContainer() || (eContainerFeatureID() != CdapPackage.CDAP_SERVICE_INSTANCE__SERVICE && newService != null)) {
+			if (EcoreUtil.isAncestor(this, newService))
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			if (newService != null)
+				msgs = ((InternalEObject)newService).eInverseAdd(this, CdapPackage.CDAP_SERVICE__INSTANCES, CdapService.class, msgs);
+			msgs = basicSetService(newService, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_SERVICE_INSTANCE__SERVICE, newService, newService));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case CdapPackage.CDAP_SERVICE_INSTANCE__SERVICE:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetService((CdapService)otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case CdapPackage.CDAP_SERVICE_INSTANCE__ARTIFACTS:
+				return ((InternalEList<?>)getArtifacts()).basicRemove(otherEnd, msgs);
+			case CdapPackage.CDAP_SERVICE_INSTANCE__APPS:
+				return ((InternalEList<?>)getApps()).basicRemove(otherEnd, msgs);
+			case CdapPackage.CDAP_SERVICE_INSTANCE__CONFIGURATION:
+				return basicSetConfiguration(null, msgs);
+			case CdapPackage.CDAP_SERVICE_INSTANCE__CDAP_CONFIGURATION:
+				return basicSetCdapConfiguration(null, msgs);
+			case CdapPackage.CDAP_SERVICE_INSTANCE__SERVICE:
+				return basicSetService(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID()) {
+			case CdapPackage.CDAP_SERVICE_INSTANCE__SERVICE:
+				return eInternalContainer().eInverseRemove(this, CdapPackage.CDAP_SERVICE__INSTANCES, CdapService.class, msgs);
+		}
+		return super.eBasicRemoveFromContainerFeature(msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_SERVICE_INSTANCE__CDAP_NAME:
+				return getCdapName();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__NAMESPACE:
+				return getNamespace();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__APP_JAR:
+				return getAppJar();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__APP_CONFIG_FILE:
+				return getAppConfigFile();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__ARTIFACTS:
+				return getArtifacts();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__APPS:
+				return getApps();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__APP_NAMES:
+				return getAppNames();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__WORKER_NAMES:
+				return getWorkerNames();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__FLOW_NAMES:
+				return getFlowNames();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__SERVICE_NAMES:
+				return getServiceNames();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__CONFIGURATION:
+				return getConfiguration();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__CDAP_CONFIGURATION:
+				return getCdapConfiguration();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__CLUSTER_SERVICE:
+				if (resolve) return getClusterService();
+				return basicGetClusterService();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__CDAP_NAMESPACE:
+				if (resolve) return getCdapNamespace();
+				return basicGetCdapNamespace();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__SERVICE:
+				if (resolve) return getService();
+				return basicGetService();
+		}
+		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 CdapPackage.CDAP_SERVICE_INSTANCE__CDAP_NAME:
+				setCdapName((String)newValue);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__NAMESPACE:
+				setNamespace((String)newValue);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__APP_JAR:
+				setAppJar((String)newValue);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__APP_CONFIG_FILE:
+				setAppConfigFile((String)newValue);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__ARTIFACTS:
+				getArtifacts().clear();
+				getArtifacts().addAll((Collection<? extends CdapArtifact>)newValue);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__APPS:
+				getApps().clear();
+				getApps().addAll((Collection<? extends CdapApplication>)newValue);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__APP_NAMES:
+				getAppNames().clear();
+				getAppNames().addAll((Collection<? extends String>)newValue);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__WORKER_NAMES:
+				getWorkerNames().clear();
+				getWorkerNames().addAll((Collection<? extends String>)newValue);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__FLOW_NAMES:
+				getFlowNames().clear();
+				getFlowNames().addAll((Collection<? extends String>)newValue);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__SERVICE_NAMES:
+				getServiceNames().clear();
+				getServiceNames().addAll((Collection<? extends String>)newValue);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__CONFIGURATION:
+				setConfiguration((CdapServiceInstanceConfiguration)newValue);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__CDAP_CONFIGURATION:
+				setCdapConfiguration((CdapInternalApplicationConfiguration)newValue);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__CLUSTER_SERVICE:
+				setClusterService((CdapClusterServiceInstance)newValue);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__CDAP_NAMESPACE:
+				setCdapNamespace((CdapNamespace)newValue);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__SERVICE:
+				setService((CdapService)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_SERVICE_INSTANCE__CDAP_NAME:
+				setCdapName(CDAP_NAME_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__NAMESPACE:
+				setNamespace(NAMESPACE_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__APP_JAR:
+				setAppJar(APP_JAR_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__APP_CONFIG_FILE:
+				setAppConfigFile(APP_CONFIG_FILE_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__ARTIFACTS:
+				getArtifacts().clear();
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__APPS:
+				getApps().clear();
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__APP_NAMES:
+				getAppNames().clear();
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__WORKER_NAMES:
+				getWorkerNames().clear();
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__FLOW_NAMES:
+				getFlowNames().clear();
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__SERVICE_NAMES:
+				getServiceNames().clear();
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__CONFIGURATION:
+				setConfiguration((CdapServiceInstanceConfiguration)null);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__CDAP_CONFIGURATION:
+				setCdapConfiguration((CdapInternalApplicationConfiguration)null);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__CLUSTER_SERVICE:
+				setClusterService((CdapClusterServiceInstance)null);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__CDAP_NAMESPACE:
+				setCdapNamespace((CdapNamespace)null);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__SERVICE:
+				setService((CdapService)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_SERVICE_INSTANCE__CDAP_NAME:
+				return CDAP_NAME_EDEFAULT == null ? cdapName != null : !CDAP_NAME_EDEFAULT.equals(cdapName);
+			case CdapPackage.CDAP_SERVICE_INSTANCE__NAMESPACE:
+				return NAMESPACE_EDEFAULT == null ? namespace != null : !NAMESPACE_EDEFAULT.equals(namespace);
+			case CdapPackage.CDAP_SERVICE_INSTANCE__APP_JAR:
+				return APP_JAR_EDEFAULT == null ? appJar != null : !APP_JAR_EDEFAULT.equals(appJar);
+			case CdapPackage.CDAP_SERVICE_INSTANCE__APP_CONFIG_FILE:
+				return APP_CONFIG_FILE_EDEFAULT == null ? appConfigFile != null : !APP_CONFIG_FILE_EDEFAULT.equals(appConfigFile);
+			case CdapPackage.CDAP_SERVICE_INSTANCE__ARTIFACTS:
+				return artifacts != null && !artifacts.isEmpty();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__APPS:
+				return apps != null && !apps.isEmpty();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__APP_NAMES:
+				return appNames != null && !appNames.isEmpty();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__WORKER_NAMES:
+				return workerNames != null && !workerNames.isEmpty();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__FLOW_NAMES:
+				return flowNames != null && !flowNames.isEmpty();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__SERVICE_NAMES:
+				return serviceNames != null && !serviceNames.isEmpty();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__CONFIGURATION:
+				return configuration != null;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__CDAP_CONFIGURATION:
+				return cdapConfiguration != null;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__CLUSTER_SERVICE:
+				return clusterService != null;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__CDAP_NAMESPACE:
+				return cdapNamespace != null;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__SERVICE:
+				return basicGetService() != null;
+		}
+		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(" (cdapName: ");
+		result.append(cdapName);
+		result.append(", namespace: ");
+		result.append(namespace);
+		result.append(", appJar: ");
+		result.append(appJar);
+		result.append(", appConfigFile: ");
+		result.append(appConfigFile);
+		result.append(", appNames: ");
+		result.append(appNames);
+		result.append(", workerNames: ");
+		result.append(workerNames);
+		result.append(", flowNames: ");
+		result.append(flowNames);
+		result.append(", serviceNames: ");
+		result.append(serviceNames);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapServiceInstanceImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/util/CdapAdapterFactory.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/util/CdapAdapterFactory.java
new file mode 100644
index 0000000..6df62fb
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/util/CdapAdapterFactory.java
@@ -0,0 +1,325 @@
+
+/*-
+ * ============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.cdap.util;
+
+import org.openecomp.dcae.controller.core.service.DcaeService;
+import org.openecomp.dcae.controller.core.service.DcaeServiceDescriptor;
+import org.openecomp.dcae.controller.core.service.DcaeServiceInstance;
+import org.openecomp.dcae.controller.service.cdap.*;
+
+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.cdap.CdapPackage
+ * @generated
+ */
+public class CdapAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static CdapPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = CdapPackage.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 CdapSwitch<Adapter> modelSwitch =
+		new CdapSwitch<Adapter>() {
+			@Override
+			public Adapter caseCdapService(CdapService object) {
+				return createCdapServiceAdapter();
+			}
+			@Override
+			public Adapter caseCdapServiceInstance(CdapServiceInstance object) {
+				return createCdapServiceInstanceAdapter();
+			}
+			@Override
+			public Adapter caseCdapApplication(CdapApplication object) {
+				return createCdapApplicationAdapter();
+			}
+			@Override
+			public Adapter caseCdapArtifact(CdapArtifact object) {
+				return createCdapArtifactAdapter();
+			}
+			@Override
+			public Adapter caseCdapServiceInstanceConfiguration(CdapServiceInstanceConfiguration object) {
+				return createCdapServiceInstanceConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseCdapInternalApplicationConfiguration(CdapInternalApplicationConfiguration object) {
+				return createCdapInternalApplicationConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseCdapServiceDescriptor(CdapServiceDescriptor object) {
+				return createCdapServiceDescriptorAdapter();
+			}
+			@Override
+			public Adapter caseNamedEntity(NamedEntity object) {
+				return createNamedEntityAdapter();
+			}
+			@Override
+			public Adapter caseDcaeService(DcaeService object) {
+				return createDcaeServiceAdapter();
+			}
+			@Override
+			public Adapter caseDcaeServiceInstance(DcaeServiceInstance object) {
+				return createDcaeServiceInstanceAdapter();
+			}
+			@Override
+			public Adapter caseDcaeServiceDescriptor(DcaeServiceDescriptor object) {
+				return createDcaeServiceDescriptorAdapter();
+			}
+			@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.cdap.CdapService <em>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.cdap.CdapService
+	 * @generated
+	 */
+	public Adapter createCdapServiceAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance <em>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.cdap.CdapServiceInstance
+	 * @generated
+	 */
+	public Adapter createCdapServiceInstanceAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapApplication <em>Application</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.cdap.CdapApplication
+	 * @generated
+	 */
+	public Adapter createCdapApplicationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapArtifact <em>Artifact</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.cdap.CdapArtifact
+	 * @generated
+	 */
+	public Adapter createCdapArtifactAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstanceConfiguration <em>Service Instance 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.cdap.CdapServiceInstanceConfiguration
+	 * @generated
+	 */
+	public Adapter createCdapServiceInstanceConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration <em>Internal Application 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.cdap.CdapInternalApplicationConfiguration
+	 * @generated
+	 */
+	public Adapter createCdapInternalApplicationConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor <em>Service Descriptor</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.cdap.CdapServiceDescriptor
+	 * @generated
+	 */
+	public Adapter createCdapServiceDescriptorAdapter() {
+		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.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.core.service.DcaeServiceDescriptor <em>Dcae Service Descriptor</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.DcaeServiceDescriptor
+	 * @generated
+	 */
+	public Adapter createDcaeServiceDescriptorAdapter() {
+		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;
+	}
+
+} //CdapAdapterFactory
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/util/CdapSwitch.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/util/CdapSwitch.java
new file mode 100644
index 0000000..ae39c7b
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/util/CdapSwitch.java
@@ -0,0 +1,329 @@
+
+/*-
+ * ============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.cdap.util;
+
+import org.openecomp.dcae.controller.core.service.DcaeService;
+import org.openecomp.dcae.controller.core.service.DcaeServiceDescriptor;
+import org.openecomp.dcae.controller.core.service.DcaeServiceInstance;
+import org.openecomp.dcae.controller.service.cdap.*;
+
+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.cdap.CdapPackage
+ * @generated
+ */
+public class CdapSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static CdapPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapSwitch() {
+		if (modelPackage == null) {
+			modelPackage = CdapPackage.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 CdapPackage.CDAP_SERVICE: {
+				CdapService cdapService = (CdapService)theEObject;
+				T result = caseCdapService(cdapService);
+				if (result == null) result = caseDcaeService(cdapService);
+				if (result == null) result = caseNamedEntity(cdapService);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_SERVICE_INSTANCE: {
+				CdapServiceInstance cdapServiceInstance = (CdapServiceInstance)theEObject;
+				T result = caseCdapServiceInstance(cdapServiceInstance);
+				if (result == null) result = caseDcaeServiceInstance(cdapServiceInstance);
+				if (result == null) result = caseNamedEntity(cdapServiceInstance);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_APPLICATION: {
+				CdapApplication cdapApplication = (CdapApplication)theEObject;
+				T result = caseCdapApplication(cdapApplication);
+				if (result == null) result = caseNamedEntity(cdapApplication);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_ARTIFACT: {
+				CdapArtifact cdapArtifact = (CdapArtifact)theEObject;
+				T result = caseCdapArtifact(cdapArtifact);
+				if (result == null) result = caseNamedEntity(cdapArtifact);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_SERVICE_INSTANCE_CONFIGURATION: {
+				CdapServiceInstanceConfiguration cdapServiceInstanceConfiguration = (CdapServiceInstanceConfiguration)theEObject;
+				T result = caseCdapServiceInstanceConfiguration(cdapServiceInstanceConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION: {
+				CdapInternalApplicationConfiguration cdapInternalApplicationConfiguration = (CdapInternalApplicationConfiguration)theEObject;
+				T result = caseCdapInternalApplicationConfiguration(cdapInternalApplicationConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_SERVICE_DESCRIPTOR: {
+				CdapServiceDescriptor cdapServiceDescriptor = (CdapServiceDescriptor)theEObject;
+				T result = caseCdapServiceDescriptor(cdapServiceDescriptor);
+				if (result == null) result = caseDcaeServiceDescriptor(cdapServiceDescriptor);
+				if (result == null) result = caseNamedEntity(cdapServiceDescriptor);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>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>Service</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapService(CdapService object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>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>Service Instance</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapServiceInstance(CdapServiceInstance object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Application</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>Application</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapApplication(CdapApplication object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Artifact</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>Artifact</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapArtifact(CdapArtifact object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Service Instance 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>Service Instance Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapServiceInstanceConfiguration(CdapServiceInstanceConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Internal Application 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>Internal Application Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapInternalApplicationConfiguration(CdapInternalApplicationConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Service Descriptor</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>Service Descriptor</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapServiceDescriptor(CdapServiceDescriptor 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>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>Dcae Service Descriptor</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 Descriptor</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDcaeServiceDescriptor(DcaeServiceDescriptor 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;
+	}
+
+} //CdapSwitch
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/CdapManager.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/CdapManager.java
new file mode 100644
index 0000000..f20e1fa
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/CdapManager.java
@@ -0,0 +1,73 @@
+
+/*-
+ * ============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.cdapmanager;
+
+import org.openecomp.dcae.controller.core.manager.DcaeManager;
+
+import org.openecomp.ncomp.cdap.CdapConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Cdap Manager</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdapmanager.CdapManager#getConfiguration <em>Configuration</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.service.cdapmanager.CdapmanagerPackage#getCdapManager()
+ * @model
+ * @generated
+ */
+public interface CdapManager extends DcaeManager {
+	/**
+	 * Returns the value of the '<em><b>Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Configuration</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Configuration</em>' containment reference.
+	 * @see #setConfiguration(CdapConfiguration)
+	 * @see org.openecomp.dcae.controller.service.cdapmanager.CdapmanagerPackage#getCdapManager_Configuration()
+	 * @model containment="true"
+	 * @generated
+	 */
+	CdapConfiguration getConfiguration();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdapmanager.CdapManager#getConfiguration <em>Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Configuration</em>' containment reference.
+	 * @see #getConfiguration()
+	 * @generated
+	 */
+	void setConfiguration(CdapConfiguration value);
+
+} // CdapManager
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/CdapmanagerFactory.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/CdapmanagerFactory.java
new file mode 100644
index 0000000..ed6da7a
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/CdapmanagerFactory.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.cdapmanager;
+
+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.cdapmanager.CdapmanagerPackage
+ * @generated
+ */
+public interface CdapmanagerFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	CdapmanagerFactory eINSTANCE = org.openecomp.dcae.controller.service.cdapmanager.impl.CdapmanagerFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Cdap Manager</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Cdap Manager</em>'.
+	 * @generated
+	 */
+	CdapManager createCdapManager();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	CdapmanagerPackage getCdapmanagerPackage();
+
+} //CdapmanagerFactory
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/CdapmanagerPackage.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/CdapmanagerPackage.java
new file mode 100644
index 0000000..edc40a8
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/CdapmanagerPackage.java
@@ -0,0 +1,256 @@
+
+/*-
+ * ============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.cdapmanager;
+
+import org.openecomp.dcae.controller.core.manager.ManagerPackage;
+
+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.cdapmanager.CdapmanagerFactory
+ * @model kind="package"
+ *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/dcae-controller-service-cdap-model/src/main/xcore-gen' basePackage='org.openecomp.dcae.controller.service'"
+ * @generated
+ */
+public interface CdapmanagerPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "cdapmanager";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "org.openecomp.dcae.controller.service.cdapmanager";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "cdapmanager";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	CdapmanagerPackage eINSTANCE = org.openecomp.dcae.controller.service.cdapmanager.impl.CdapmanagerPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdapmanager.impl.CdapManagerImpl <em>Cdap Manager</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdapmanager.impl.CdapManagerImpl
+	 * @see org.openecomp.dcae.controller.service.cdapmanager.impl.CdapmanagerPackageImpl#getCdapManager()
+	 * @generated
+	 */
+	int CDAP_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 CDAP_MANAGER__INPUT_STREAMS = ManagerPackage.DCAE_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 CDAP_MANAGER__OUTPUT_STREAMS = ManagerPackage.DCAE_MANAGER__OUTPUT_STREAMS;
+
+	/**
+	 * The feature id for the '<em><b>Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_MANAGER__CONFIGURATION = ManagerPackage.DCAE_MANAGER_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Cdap Manager</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_MANAGER_FEATURE_COUNT = ManagerPackage.DCAE_MANAGER_FEATURE_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Test</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_MANAGER___TEST = ManagerPackage.DCAE_MANAGER___TEST;
+
+	/**
+	 * The operation id for the '<em>Suspend</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_MANAGER___SUSPEND = ManagerPackage.DCAE_MANAGER___SUSPEND;
+
+	/**
+	 * The operation id for the '<em>Resume</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_MANAGER___RESUME = ManagerPackage.DCAE_MANAGER___RESUME;
+
+	/**
+	 * The operation id for the '<em>Public Key</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_MANAGER___PUBLIC_KEY = ManagerPackage.DCAE_MANAGER___PUBLIC_KEY;
+
+	/**
+	 * The operation id for the '<em>Configuration Changed</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_MANAGER___CONFIGURATION_CHANGED = ManagerPackage.DCAE_MANAGER___CONFIGURATION_CHANGED;
+
+	/**
+	 * The operation id for the '<em>Update Streams</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_MANAGER___UPDATE_STREAMS__ELIST_ELIST = ManagerPackage.DCAE_MANAGER___UPDATE_STREAMS__ELIST_ELIST;
+
+	/**
+	 * The number of operations of the '<em>Cdap Manager</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_MANAGER_OPERATION_COUNT = ManagerPackage.DCAE_MANAGER_OPERATION_COUNT + 0;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdapmanager.CdapManager <em>Cdap Manager</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Cdap Manager</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdapmanager.CdapManager
+	 * @generated
+	 */
+	EClass getCdapManager();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.openecomp.dcae.controller.service.cdapmanager.CdapManager#getConfiguration <em>Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Configuration</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdapmanager.CdapManager#getConfiguration()
+	 * @see #getCdapManager()
+	 * @generated
+	 */
+	EReference getCdapManager_Configuration();
+
+	/**
+	 * 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
+	 */
+	CdapmanagerFactory getCdapmanagerFactory();
+
+	/**
+	 * <!-- 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.cdapmanager.impl.CdapManagerImpl <em>Cdap Manager</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdapmanager.impl.CdapManagerImpl
+		 * @see org.openecomp.dcae.controller.service.cdapmanager.impl.CdapmanagerPackageImpl#getCdapManager()
+		 * @generated
+		 */
+		EClass CDAP_MANAGER = eINSTANCE.getCdapManager();
+
+		/**
+		 * The meta object literal for the '<em><b>Configuration</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CDAP_MANAGER__CONFIGURATION = eINSTANCE.getCdapManager_Configuration();
+
+	}
+
+} //CdapmanagerPackage
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/DockerManager.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/DockerManager.java
new file mode 100644
index 0000000..43ba34d
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/DockerManager.java
@@ -0,0 +1,73 @@
+
+/*-
+ * ============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.cdapmanager;
+
+import org.openecomp.dcae.controller.core.manager.DcaeManager;
+
+import org.openecomp.ncomp.cdap.CdapConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Docker Manager</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdapmanager.DockerManager#getConfiguration <em>Configuration</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.service.cdapmanager.CdapmanagerPackage#getDockerManager()
+ * @model
+ * @generated
+ */
+public interface DockerManager extends DcaeManager {
+	/**
+	 * Returns the value of the '<em><b>Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Configuration</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Configuration</em>' containment reference.
+	 * @see #setConfiguration(CdapConfiguration)
+	 * @see org.openecomp.dcae.controller.service.cdapmanager.CdapmanagerPackage#getDockerManager_Configuration()
+	 * @model containment="true"
+	 * @generated
+	 */
+	CdapConfiguration getConfiguration();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdapmanager.DockerManager#getConfiguration <em>Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Configuration</em>' containment reference.
+	 * @see #getConfiguration()
+	 * @generated
+	 */
+	void setConfiguration(CdapConfiguration value);
+
+} // DockerManager
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/impl/CdapManagerImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/impl/CdapManagerImpl.java
new file mode 100644
index 0000000..2a0e857
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/impl/CdapManagerImpl.java
@@ -0,0 +1,199 @@
+
+/*-
+ * ============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.cdapmanager.impl;
+
+import org.openecomp.dcae.controller.core.manager.impl.DcaeManagerImpl;
+
+import org.openecomp.dcae.controller.service.cdapmanager.CdapManager;
+import org.openecomp.dcae.controller.service.cdapmanager.CdapmanagerPackage;
+
+import org.openecomp.ncomp.cdap.CdapConfiguration;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+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>Cdap Manager</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdapmanager.impl.CdapManagerImpl#getConfiguration <em>Configuration</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class CdapManagerImpl extends DcaeManagerImpl implements CdapManager {
+	/**
+	 * The cached value of the '{@link #getConfiguration() <em>Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getConfiguration()
+	 * @generated
+	 * @ordered
+	 */
+	protected CdapConfiguration configuration;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapManagerImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapmanagerPackage.Literals.CDAP_MANAGER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapConfiguration getConfiguration() {
+		return configuration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetConfiguration(CdapConfiguration newConfiguration, NotificationChain msgs) {
+		CdapConfiguration oldConfiguration = configuration;
+		configuration = newConfiguration;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CdapmanagerPackage.CDAP_MANAGER__CONFIGURATION, oldConfiguration, newConfiguration);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setConfiguration(CdapConfiguration newConfiguration) {
+		if (newConfiguration != configuration) {
+			NotificationChain msgs = null;
+			if (configuration != null)
+				msgs = ((InternalEObject)configuration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CdapmanagerPackage.CDAP_MANAGER__CONFIGURATION, null, msgs);
+			if (newConfiguration != null)
+				msgs = ((InternalEObject)newConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CdapmanagerPackage.CDAP_MANAGER__CONFIGURATION, null, msgs);
+			msgs = basicSetConfiguration(newConfiguration, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapmanagerPackage.CDAP_MANAGER__CONFIGURATION, newConfiguration, newConfiguration));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case CdapmanagerPackage.CDAP_MANAGER__CONFIGURATION:
+				return basicSetConfiguration(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapmanagerPackage.CDAP_MANAGER__CONFIGURATION:
+				return getConfiguration();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case CdapmanagerPackage.CDAP_MANAGER__CONFIGURATION:
+				setConfiguration((CdapConfiguration)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CdapmanagerPackage.CDAP_MANAGER__CONFIGURATION:
+				setConfiguration((CdapConfiguration)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapmanagerPackage.CDAP_MANAGER__CONFIGURATION:
+				return configuration != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //CdapManagerImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/impl/CdapmanagerFactoryImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/impl/CdapmanagerFactoryImpl.java
new file mode 100644
index 0000000..b477796
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/impl/CdapmanagerFactoryImpl.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.cdapmanager.impl;
+
+import org.openecomp.dcae.controller.service.cdapmanager.*;
+
+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 CdapmanagerFactoryImpl extends EFactoryImpl implements CdapmanagerFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static CdapmanagerFactory init() {
+		try {
+			CdapmanagerFactory theCdapmanagerFactory = (CdapmanagerFactory)EPackage.Registry.INSTANCE.getEFactory(CdapmanagerPackage.eNS_URI);
+			if (theCdapmanagerFactory != null) {
+				return theCdapmanagerFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new CdapmanagerFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapmanagerFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case CdapmanagerPackage.CDAP_MANAGER: return createCdapManager();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapManager createCdapManager() {
+		CdapManagerImpl cdapManager = new CdapManagerImpl();
+		return cdapManager;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapmanagerPackage getCdapmanagerPackage() {
+		return (CdapmanagerPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static CdapmanagerPackage getPackage() {
+		return CdapmanagerPackage.eINSTANCE;
+	}
+
+} //CdapmanagerFactoryImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/impl/CdapmanagerPackageImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/impl/CdapmanagerPackageImpl.java
new file mode 100644
index 0000000..85c21a4
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/impl/CdapmanagerPackageImpl.java
@@ -0,0 +1,206 @@
+
+/*-
+ * ============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.cdapmanager.impl;
+
+import org.openecomp.dcae.controller.core.manager.ManagerPackage;
+import org.openecomp.dcae.controller.service.cdapmanager.CdapManager;
+import org.openecomp.dcae.controller.service.cdapmanager.CdapmanagerFactory;
+import org.openecomp.dcae.controller.service.cdapmanager.CdapmanagerPackage;
+import org.openecomp.ncomp.cdap.CdapPackage;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class CdapmanagerPackageImpl extends EPackageImpl implements CdapmanagerPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapManagerEClass = 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.cdapmanager.CdapmanagerPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private CdapmanagerPackageImpl() {
+		super(eNS_URI, CdapmanagerFactory.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 CdapmanagerPackage#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 CdapmanagerPackage init() {
+		if (isInited) return (CdapmanagerPackage)EPackage.Registry.INSTANCE.getEPackage(CdapmanagerPackage.eNS_URI);
+
+		// Obtain or create and register package
+		CdapmanagerPackageImpl theCdapmanagerPackage = (CdapmanagerPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CdapmanagerPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new CdapmanagerPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		ManagerPackage.eINSTANCE.eClass();
+		CdapPackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theCdapmanagerPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theCdapmanagerPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theCdapmanagerPackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(CdapmanagerPackage.eNS_URI, theCdapmanagerPackage);
+		return theCdapmanagerPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapManager() {
+		return cdapManagerEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCdapManager_Configuration() {
+		return (EReference)cdapManagerEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapmanagerFactory getCdapmanagerFactory() {
+		return (CdapmanagerFactory)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
+		cdapManagerEClass = createEClass(CDAP_MANAGER);
+		createEReference(cdapManagerEClass, CDAP_MANAGER__CONFIGURATION);
+	}
+
+	/**
+	 * <!-- 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
+		ManagerPackage theManagerPackage = (ManagerPackage)EPackage.Registry.INSTANCE.getEPackage(ManagerPackage.eNS_URI);
+		CdapPackage theCdapPackage = (CdapPackage)EPackage.Registry.INSTANCE.getEPackage(CdapPackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		cdapManagerEClass.getESuperTypes().add(theManagerPackage.getDcaeManager());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(cdapManagerEClass, CdapManager.class, "CdapManager", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getCdapManager_Configuration(), theCdapPackage.getCdapConfiguration(), null, "configuration", null, 0, 1, CdapManager.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
+
+} //CdapmanagerPackageImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/util/CdapmanagerAdapterFactory.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/util/CdapmanagerAdapterFactory.java
new file mode 100644
index 0000000..31d68c9
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/util/CdapmanagerAdapterFactory.java
@@ -0,0 +1,161 @@
+
+/*-
+ * ============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.cdapmanager.util;
+
+import org.openecomp.dcae.controller.core.manager.DcaeManager;
+
+import org.openecomp.dcae.controller.service.cdapmanager.*;
+
+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.cdapmanager.CdapmanagerPackage
+ * @generated
+ */
+public class CdapmanagerAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static CdapmanagerPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapmanagerAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = CdapmanagerPackage.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 CdapmanagerSwitch<Adapter> modelSwitch =
+		new CdapmanagerSwitch<Adapter>() {
+			@Override
+			public Adapter caseCdapManager(CdapManager object) {
+				return createCdapManagerAdapter();
+			}
+			@Override
+			public Adapter caseDcaeManager(DcaeManager object) {
+				return createDcaeManagerAdapter();
+			}
+			@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.cdapmanager.CdapManager <em>Cdap 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.cdapmanager.CdapManager
+	 * @generated
+	 */
+	public Adapter createCdapManagerAdapter() {
+		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 the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} //CdapmanagerAdapterFactory
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/util/CdapmanagerSwitch.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/util/CdapmanagerSwitch.java
new file mode 100644
index 0000000..a423091
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/util/CdapmanagerSwitch.java
@@ -0,0 +1,149 @@
+
+/*-
+ * ============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.cdapmanager.util;
+
+import org.openecomp.dcae.controller.core.manager.DcaeManager;
+
+import org.openecomp.dcae.controller.service.cdapmanager.*;
+
+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.cdapmanager.CdapmanagerPackage
+ * @generated
+ */
+public class CdapmanagerSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static CdapmanagerPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapmanagerSwitch() {
+		if (modelPackage == null) {
+			modelPackage = CdapmanagerPackage.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 CdapmanagerPackage.CDAP_MANAGER: {
+				CdapManager cdapManager = (CdapManager)theEObject;
+				T result = caseCdapManager(cdapManager);
+				if (result == null) result = caseDcaeManager(cdapManager);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Cdap 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>Cdap Manager</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapManager(CdapManager 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>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;
+	}
+
+} //CdapmanagerSwitch