[DCAE-15] Changes related to version 1.1

See Jira for details

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

62 files changed, 10000 insertions, 40 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
index 8ba630c..43669c1 100644
--- 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
@@ -32,13 +32,13 @@ import org.openecomp.ncomp.core.NamedEntity;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <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
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
index f7a72e4..154fed0 100644
--- 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
@@ -32,11 +32,11 @@ import org.openecomp.ncomp.core.NamedEntity;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <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
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapCreateApp.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapCreateApp.java
new file mode 100644
index 0000000..f93986e
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapCreateApp.java
@@ -0,0 +1,103 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Create App</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapCreateApp#getArtifactName <em>Artifact Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapCreateApp#getJarfile <em>Jarfile</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapCreateApp#getVersion <em>Version</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapCreateApp()
+ * @model
+ * @generated
+ */
+public interface CdapCreateApp extends CdapStep {
+	/**
+	 * 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#getCdapCreateApp_ArtifactName()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getArtifactName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateApp#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>Jarfile</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Jarfile</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Jarfile</em>' attribute.
+	 * @see #setJarfile(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapCreateApp_Jarfile()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getJarfile();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateApp#getJarfile <em>Jarfile</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Jarfile</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#getCdapCreateApp_Version()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getVersion();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateApp#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);
+
+} // CdapCreateApp
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapCreateAppStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapCreateAppStep.java
new file mode 100644
index 0000000..a9f6434
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapCreateAppStep.java
@@ -0,0 +1,130 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Create App Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#getArtifactName <em>Artifact Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#getVersion <em>Version</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#getScope <em>Scope</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapCreateAppStep()
+ * @model
+ * @generated
+ */
+public interface CdapCreateAppStep extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Id</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 Id</em>' attribute.
+	 * @see #setAppId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapCreateAppStep_AppId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#getAppId <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Id</em>' attribute.
+	 * @see #getAppId()
+	 * @generated
+	 */
+	void setAppId(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#getCdapCreateAppStep_ArtifactName()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getArtifactName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#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#getCdapCreateAppStep_Version()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getVersion();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#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>Scope</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Scope</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Scope</em>' attribute.
+	 * @see #setScope(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapCreateAppStep_Scope()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getScope();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#getScope <em>Scope</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Scope</em>' attribute.
+	 * @see #getScope()
+	 * @generated
+	 */
+	void setScope(String value);
+
+} // CdapCreateAppStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapCreateAppWithConfig.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapCreateAppWithConfig.java
new file mode 100644
index 0000000..fec80d2
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapCreateAppWithConfig.java
@@ -0,0 +1,103 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Create App With Config</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfig#getArtifactName <em>Artifact Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfig#getJarfile <em>Jarfile</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfig#getVersion <em>Version</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapCreateAppWithConfig()
+ * @model
+ * @generated
+ */
+public interface CdapCreateAppWithConfig extends CdapStep {
+	/**
+	 * 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#getCdapCreateAppWithConfig_ArtifactName()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getArtifactName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfig#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>Jarfile</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Jarfile</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Jarfile</em>' attribute.
+	 * @see #setJarfile(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapCreateAppWithConfig_Jarfile()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getJarfile();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfig#getJarfile <em>Jarfile</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Jarfile</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#getCdapCreateAppWithConfig_Version()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getVersion();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfig#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);
+
+} // CdapCreateAppWithConfig
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapCreateAppWithConfigStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapCreateAppWithConfigStep.java
new file mode 100644
index 0000000..ef93a2f
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapCreateAppWithConfigStep.java
@@ -0,0 +1,49 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Create App With Config Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfigStep#getAppConfig <em>App Config</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapCreateAppWithConfigStep()
+ * @model
+ * @generated
+ */
+public interface CdapCreateAppWithConfigStep extends CdapCreateAppStep {
+	/**
+	 * Returns the value of the '<em><b>App Config</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Config</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</em>' attribute.
+	 * @see #setAppConfig(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapCreateAppWithConfigStep_AppConfig()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppConfig();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfigStep#getAppConfig <em>App Config</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Config</em>' attribute.
+	 * @see #getAppConfig()
+	 * @generated
+	 */
+	void setAppConfig(String value);
+
+} // CdapCreateAppWithConfigStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapDeleteAppStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapDeleteAppStep.java
new file mode 100644
index 0000000..2cfb973
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapDeleteAppStep.java
@@ -0,0 +1,49 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Delete App Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapDeleteAppStep#getAppId <em>App Id</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapDeleteAppStep()
+ * @model
+ * @generated
+ */
+public interface CdapDeleteAppStep extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Id</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 Id</em>' attribute.
+	 * @see #setAppId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapDeleteAppStep_AppId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapDeleteAppStep#getAppId <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Id</em>' attribute.
+	 * @see #getAppId()
+	 * @generated
+	 */
+	void setAppId(String value);
+
+} // CdapDeleteAppStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapDeleteArtifact.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapDeleteArtifact.java
new file mode 100644
index 0000000..01c2ea7
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapDeleteArtifact.java
@@ -0,0 +1,76 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Delete Artifact</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapDeleteArtifact#getArtifactName <em>Artifact Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapDeleteArtifact#getVersion <em>Version</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapDeleteArtifact()
+ * @model
+ * @generated
+ */
+public interface CdapDeleteArtifact extends CdapStep {
+	/**
+	 * 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#getCdapDeleteArtifact_ArtifactName()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getArtifactName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapDeleteArtifact#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#getCdapDeleteArtifact_Version()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getVersion();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapDeleteArtifact#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);
+
+} // CdapDeleteArtifact
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapDeployAppStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapDeployAppStep.java
new file mode 100644
index 0000000..e4a884e
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapDeployAppStep.java
@@ -0,0 +1,49 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Deploy App Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep#getJarfile <em>Jarfile</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapDeployAppStep()
+ * @model
+ * @generated
+ */
+public interface CdapDeployAppStep extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>Jarfile</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Jarfile</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Jarfile</em>' attribute.
+	 * @see #setJarfile(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapDeployAppStep_Jarfile()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getJarfile();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep#getJarfile <em>Jarfile</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Jarfile</em>' attribute.
+	 * @see #getJarfile()
+	 * @generated
+	 */
+	void setJarfile(String value);
+
+} // CdapDeployAppStep
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
index b15b7d5..a7c6f18 100644
--- 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
@@ -106,6 +106,159 @@ public interface CdapFactory extends EFactory {
 	CdapServiceDescriptor createCdapServiceDescriptor();
 
 	/**
+	 * Returns a new object of class '<em>Load Artifact Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Load Artifact Step</em>'.
+	 * @generated
+	 */
+	CdapLoadArtifactStep createCdapLoadArtifactStep();
+
+	/**
+	 * Returns a new object of class '<em>Load Artifact With Config Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Load Artifact With Config Step</em>'.
+	 * @generated
+	 */
+	CdapLoadArtifactWithConfigStep createCdapLoadArtifactWithConfigStep();
+
+	/**
+	 * Returns a new object of class '<em>Create App Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Create App Step</em>'.
+	 * @generated
+	 */
+	CdapCreateAppStep createCdapCreateAppStep();
+
+	/**
+	 * Returns a new object of class '<em>Create App With Config Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Create App With Config Step</em>'.
+	 * @generated
+	 */
+	CdapCreateAppWithConfigStep createCdapCreateAppWithConfigStep();
+
+	/**
+	 * Returns a new object of class '<em>Deploy App Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Deploy App Step</em>'.
+	 * @generated
+	 */
+	CdapDeployAppStep createCdapDeployAppStep();
+
+	/**
+	 * Returns a new object of class '<em>Stop Flow Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Stop Flow Step</em>'.
+	 * @generated
+	 */
+	CdapStopFlowStep createCdapStopFlowStep();
+
+	/**
+	 * Returns a new object of class '<em>Stop Worker Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Stop Worker Step</em>'.
+	 * @generated
+	 */
+	CdapStopWorkerStep createCdapStopWorkerStep();
+
+	/**
+	 * Returns a new object of class '<em>Stop Service Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Stop Service Step</em>'.
+	 * @generated
+	 */
+	CdapStopServiceStep createCdapStopServiceStep();
+
+	/**
+	 * Returns a new object of class '<em>Stop App Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Stop App Step</em>'.
+	 * @generated
+	 */
+	CdapStopAppStep createCdapStopAppStep();
+
+	/**
+	 * Returns a new object of class '<em>Start Flow Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Start Flow Step</em>'.
+	 * @generated
+	 */
+	CdapStartFlowStep createCdapStartFlowStep();
+
+	/**
+	 * Returns a new object of class '<em>Start Worker Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Start Worker Step</em>'.
+	 * @generated
+	 */
+	CdapStartWorkerStep createCdapStartWorkerStep();
+
+	/**
+	 * Returns a new object of class '<em>Start Service Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Start Service Step</em>'.
+	 * @generated
+	 */
+	CdapStartServiceStep createCdapStartServiceStep();
+
+	/**
+	 * Returns a new object of class '<em>Start App Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Start App Step</em>'.
+	 * @generated
+	 */
+	CdapStartAppStep createCdapStartAppStep();
+
+	/**
+	 * Returns a new object of class '<em>Delete App Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Delete App Step</em>'.
+	 * @generated
+	 */
+	CdapDeleteAppStep createCdapDeleteAppStep();
+
+	/**
+	 * Returns a new object of class '<em>Delete Artifact</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Delete Artifact</em>'.
+	 * @generated
+	 */
+	CdapDeleteArtifact createCdapDeleteArtifact();
+
+	/**
+	 * Returns a new object of class '<em>Suspend Schedule Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Suspend Schedule Step</em>'.
+	 * @generated
+	 */
+	CdapSuspendScheduleStep createCdapSuspendScheduleStep();
+
+	/**
+	 * Returns a new object of class '<em>Resume Schedule Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Resume Schedule Step</em>'.
+	 * @generated
+	 */
+	CdapResumeScheduleStep createCdapResumeScheduleStep();
+
+	/**
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
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
index 51b9b5c..b03e58a 100644
--- 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
@@ -37,6 +37,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <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>
@@ -45,7 +46,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <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
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapLoadArtifact.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapLoadArtifact.java
new file mode 100644
index 0000000..e6cd4f3
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapLoadArtifact.java
@@ -0,0 +1,17 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Load Artifact</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapLoadArtifact()
+ * @model
+ * @generated
+ */
+public interface CdapLoadArtifact extends CdapStep {
+} // CdapLoadArtifact
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapLoadArtifactStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapLoadArtifactStep.java
new file mode 100644
index 0000000..9826779
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapLoadArtifactStep.java
@@ -0,0 +1,103 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Load Artifact Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#getArtifactName <em>Artifact Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#getJarfile <em>Jarfile</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#getVersion <em>Version</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapLoadArtifactStep()
+ * @model
+ * @generated
+ */
+public interface CdapLoadArtifactStep extends CdapStep {
+
+	/**
+	 * 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#getCdapLoadArtifactStep_ArtifactName()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getArtifactName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#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>Jarfile</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Jarfile</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Jarfile</em>' attribute.
+	 * @see #setJarfile(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapLoadArtifactStep_Jarfile()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getJarfile();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#getJarfile <em>Jarfile</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Jarfile</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#getCdapLoadArtifactStep_Version()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getVersion();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#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);
+} // CdapLoadArtifactStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapLoadArtifactWithConfigStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapLoadArtifactWithConfigStep.java
new file mode 100644
index 0000000..7f1212f
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapLoadArtifactWithConfigStep.java
@@ -0,0 +1,49 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Load Artifact With Config Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactWithConfigStep#getConfig <em>Config</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapLoadArtifactWithConfigStep()
+ * @model
+ * @generated
+ */
+public interface CdapLoadArtifactWithConfigStep extends CdapLoadArtifactStep {
+	/**
+	 * Returns the value of the '<em><b>Config</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Config</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Config</em>' attribute.
+	 * @see #setConfig(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapLoadArtifactWithConfigStep_Config()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getConfig();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactWithConfigStep#getConfig <em>Config</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Config</em>' attribute.
+	 * @see #getConfig()
+	 * @generated
+	 */
+	void setConfig(String value);
+
+} // CdapLoadArtifactWithConfigStep
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
index afcb67b..d0f18c1 100644
--- 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
@@ -43,6 +43,24 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *  *        http://www.apache.org/licenses/LICENSE-2.0
+ *  * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * <!-- end-model-doc -->
  * @see org.openecomp.dcae.controller.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'"
@@ -427,13 +445,49 @@ public interface CdapPackage extends EPackage {
 	int CDAP_SERVICE_INSTANCE__APPS = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 5;
 
 	/**
+	 * The feature id for the '<em><b>Deploy Steps</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__DEPLOY_STEPS = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 6;
+
+	/**
+	 * The feature id for the '<em><b>Undeploy Steps</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__UNDEPLOY_STEPS = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 7;
+
+	/**
+	 * The feature id for the '<em><b>Pre Configuration Steps</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__PRE_CONFIGURATION_STEPS = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 8;
+
+	/**
+	 * The feature id for the '<em><b>Post Configuration Steps</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__POST_CONFIGURATION_STEPS = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 9;
+
+	/**
 	 * 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;
+	int CDAP_SERVICE_INSTANCE__APP_NAMES = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 10;
 
 	/**
 	 * The feature id for the '<em><b>Worker Names</b></em>' attribute list.
@@ -442,7 +496,7 @@ public interface CdapPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_SERVICE_INSTANCE__WORKER_NAMES = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 7;
+	int CDAP_SERVICE_INSTANCE__WORKER_NAMES = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 11;
 
 	/**
 	 * The feature id for the '<em><b>Flow Names</b></em>' attribute list.
@@ -451,7 +505,7 @@ public interface CdapPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_SERVICE_INSTANCE__FLOW_NAMES = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 8;
+	int CDAP_SERVICE_INSTANCE__FLOW_NAMES = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 12;
 
 	/**
 	 * The feature id for the '<em><b>Service Names</b></em>' attribute list.
@@ -460,7 +514,7 @@ public interface CdapPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_SERVICE_INSTANCE__SERVICE_NAMES = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 9;
+	int CDAP_SERVICE_INSTANCE__SERVICE_NAMES = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 13;
 
 	/**
 	 * The feature id for the '<em><b>Configuration</b></em>' containment reference.
@@ -469,7 +523,7 @@ public interface CdapPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_SERVICE_INSTANCE__CONFIGURATION = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 10;
+	int CDAP_SERVICE_INSTANCE__CONFIGURATION = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 14;
 
 	/**
 	 * The feature id for the '<em><b>Cdap Configuration</b></em>' containment reference.
@@ -478,7 +532,7 @@ public interface CdapPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_SERVICE_INSTANCE__CDAP_CONFIGURATION = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 11;
+	int CDAP_SERVICE_INSTANCE__CDAP_CONFIGURATION = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 15;
 
 	/**
 	 * The feature id for the '<em><b>Cluster Service</b></em>' reference.
@@ -487,7 +541,7 @@ public interface CdapPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_SERVICE_INSTANCE__CLUSTER_SERVICE = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 12;
+	int CDAP_SERVICE_INSTANCE__CLUSTER_SERVICE = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 16;
 
 	/**
 	 * The feature id for the '<em><b>Cdap Namespace</b></em>' reference.
@@ -496,7 +550,7 @@ public interface CdapPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_SERVICE_INSTANCE__CDAP_NAMESPACE = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 13;
+	int CDAP_SERVICE_INSTANCE__CDAP_NAMESPACE = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 17;
 
 	/**
 	 * The feature id for the '<em><b>Service</b></em>' container reference.
@@ -505,7 +559,7 @@ public interface CdapPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_SERVICE_INSTANCE__SERVICE = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 14;
+	int CDAP_SERVICE_INSTANCE__SERVICE = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 18;
 
 	/**
 	 * The number of structural features of the '<em>Service Instance</em>' class.
@@ -514,7 +568,7 @@ public interface CdapPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_SERVICE_INSTANCE_FEATURE_COUNT = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 15;
+	int CDAP_SERVICE_INSTANCE_FEATURE_COUNT = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 19;
 
 	/**
 	 * The number of operations of the '<em>Service Instance</em>' class.
@@ -948,6 +1002,1528 @@ public interface CdapPackage extends EPackage {
 
 
 	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStepImpl <em>Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStep()
+	 * @generated
+	 */
+	int CDAP_STEP = 7;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STEP__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_STEP__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_STEP__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_STEP__CREATED = CorePackage.NAMED_ENTITY__CREATED;
+
+	/**
+	 * The number of structural features of the '<em>Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STEP_FEATURE_COUNT = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STEP_OPERATION_COUNT = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 0;
+
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapLoadArtifactStepImpl <em>Load Artifact Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapLoadArtifactStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapLoadArtifactStep()
+	 * @generated
+	 */
+	int CDAP_LOAD_ARTIFACT_STEP = 8;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Artifact Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_STEP__ARTIFACT_NAME = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Jarfile</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_STEP__JARFILE = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_STEP__VERSION = CDAP_STEP_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Load Artifact Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of operations of the '<em>Load Artifact Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_STEP_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapLoadArtifactWithConfigStepImpl <em>Load Artifact With Config Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapLoadArtifactWithConfigStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapLoadArtifactWithConfigStep()
+	 * @generated
+	 */
+	int CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP = 9;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__NAME = CDAP_LOAD_ARTIFACT_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__LAST_POLLED = CDAP_LOAD_ARTIFACT_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__LAST_CHANGED = CDAP_LOAD_ARTIFACT_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__CREATED = CDAP_LOAD_ARTIFACT_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Artifact Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__ARTIFACT_NAME = CDAP_LOAD_ARTIFACT_STEP__ARTIFACT_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Jarfile</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__JARFILE = CDAP_LOAD_ARTIFACT_STEP__JARFILE;
+
+	/**
+	 * The feature id for the '<em><b>Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__VERSION = CDAP_LOAD_ARTIFACT_STEP__VERSION;
+
+	/**
+	 * The feature id for the '<em><b>Config</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__CONFIG = CDAP_LOAD_ARTIFACT_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Load Artifact With Config Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP_FEATURE_COUNT = CDAP_LOAD_ARTIFACT_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Load Artifact With Config Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP_OPERATION_COUNT = CDAP_LOAD_ARTIFACT_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapCreateAppStepImpl <em>Create App Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapCreateAppStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapCreateAppStep()
+	 * @generated
+	 */
+	int CDAP_CREATE_APP_STEP = 10;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_STEP__APP_ID = CDAP_STEP_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_CREATE_APP_STEP__ARTIFACT_NAME = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_STEP__VERSION = CDAP_STEP_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Scope</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_STEP__SCOPE = CDAP_STEP_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of structural features of the '<em>Create App Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 4;
+
+	/**
+	 * The number of operations of the '<em>Create App Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_STEP_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapCreateAppWithConfigStepImpl <em>Create App With Config Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapCreateAppWithConfigStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapCreateAppWithConfigStep()
+	 * @generated
+	 */
+	int CDAP_CREATE_APP_WITH_CONFIG_STEP = 11;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_WITH_CONFIG_STEP__NAME = CDAP_CREATE_APP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_WITH_CONFIG_STEP__LAST_POLLED = CDAP_CREATE_APP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_WITH_CONFIG_STEP__LAST_CHANGED = CDAP_CREATE_APP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_WITH_CONFIG_STEP__CREATED = CDAP_CREATE_APP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_WITH_CONFIG_STEP__APP_ID = CDAP_CREATE_APP_STEP__APP_ID;
+
+	/**
+	 * The feature id for the '<em><b>Artifact Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_WITH_CONFIG_STEP__ARTIFACT_NAME = CDAP_CREATE_APP_STEP__ARTIFACT_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_WITH_CONFIG_STEP__VERSION = CDAP_CREATE_APP_STEP__VERSION;
+
+	/**
+	 * The feature id for the '<em><b>Scope</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_WITH_CONFIG_STEP__SCOPE = CDAP_CREATE_APP_STEP__SCOPE;
+
+	/**
+	 * The feature id for the '<em><b>App Config</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_WITH_CONFIG_STEP__APP_CONFIG = CDAP_CREATE_APP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Create App With Config Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_WITH_CONFIG_STEP_FEATURE_COUNT = CDAP_CREATE_APP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Create App With Config Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_WITH_CONFIG_STEP_OPERATION_COUNT = CDAP_CREATE_APP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapDeployAppStepImpl <em>Deploy App Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapDeployAppStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapDeployAppStep()
+	 * @generated
+	 */
+	int CDAP_DEPLOY_APP_STEP = 12;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DEPLOY_APP_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DEPLOY_APP_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DEPLOY_APP_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DEPLOY_APP_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Jarfile</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DEPLOY_APP_STEP__JARFILE = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Deploy App Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DEPLOY_APP_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Deploy App Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DEPLOY_APP_STEP_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopFlowStepImpl <em>Stop Flow Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStopFlowStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStopFlowStep()
+	 * @generated
+	 */
+	int CDAP_STOP_FLOW_STEP = 13;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_FLOW_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_FLOW_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_FLOW_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_FLOW_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_FLOW_STEP__APP_ID = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Flow Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_FLOW_STEP__FLOW_ID = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Stop Flow Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_FLOW_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of operations of the '<em>Stop Flow Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_FLOW_STEP_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopWorkerStepImpl <em>Stop Worker Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStopWorkerStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStopWorkerStep()
+	 * @generated
+	 */
+	int CDAP_STOP_WORKER_STEP = 14;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_WORKER_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_WORKER_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_WORKER_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_WORKER_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_WORKER_STEP__APP_ID = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Worker Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_WORKER_STEP__WORKER_ID = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Stop Worker Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_WORKER_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of operations of the '<em>Stop Worker Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_WORKER_STEP_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopServiceStepImpl <em>Stop Service Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStopServiceStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStopServiceStep()
+	 * @generated
+	 */
+	int CDAP_STOP_SERVICE_STEP = 15;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_SERVICE_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_SERVICE_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_SERVICE_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_SERVICE_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_SERVICE_STEP__APP_ID = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Service Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_SERVICE_STEP__SERVICE_ID = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Stop Service Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_SERVICE_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of operations of the '<em>Stop Service Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_SERVICE_STEP_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopAppStepImpl <em>Stop App Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStopAppStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStopAppStep()
+	 * @generated
+	 */
+	int CDAP_STOP_APP_STEP = 16;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_APP_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_APP_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_APP_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_APP_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_APP_STEP__APP_ID = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Stop App Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_APP_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Stop App Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_APP_STEP_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartFlowStepImpl <em>Start Flow Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStartFlowStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStartFlowStep()
+	 * @generated
+	 */
+	int CDAP_START_FLOW_STEP = 17;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_FLOW_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_FLOW_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_FLOW_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_FLOW_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_FLOW_STEP__APP_ID = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Flow Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_FLOW_STEP__FLOW_ID = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Extra Args</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_FLOW_STEP__EXTRA_ARGS = CDAP_STEP_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Start Flow Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_FLOW_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of operations of the '<em>Start Flow Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_FLOW_STEP_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartWorkerStepImpl <em>Start Worker Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStartWorkerStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStartWorkerStep()
+	 * @generated
+	 */
+	int CDAP_START_WORKER_STEP = 18;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_WORKER_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_WORKER_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_WORKER_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_WORKER_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_WORKER_STEP__APP_ID = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Worker Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_WORKER_STEP__WORKER_ID = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Extra Args</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_WORKER_STEP__EXTRA_ARGS = CDAP_STEP_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Start Worker Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_WORKER_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of operations of the '<em>Start Worker Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_WORKER_STEP_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartServiceStepImpl <em>Start Service Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStartServiceStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStartServiceStep()
+	 * @generated
+	 */
+	int CDAP_START_SERVICE_STEP = 19;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_SERVICE_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_SERVICE_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_SERVICE_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_SERVICE_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_SERVICE_STEP__APP_ID = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Service Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_SERVICE_STEP__SERVICE_ID = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Extra Args</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_SERVICE_STEP__EXTRA_ARGS = CDAP_STEP_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Start Service Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_SERVICE_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of operations of the '<em>Start Service Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_SERVICE_STEP_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartAppStepImpl <em>Start App Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStartAppStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStartAppStep()
+	 * @generated
+	 */
+	int CDAP_START_APP_STEP = 20;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_APP_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_APP_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_APP_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_APP_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_APP_STEP__APP_ID = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Start App Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_APP_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Start App Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_APP_STEP_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapDeleteAppStepImpl <em>Delete App Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapDeleteAppStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapDeleteAppStep()
+	 * @generated
+	 */
+	int CDAP_DELETE_APP_STEP = 21;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_APP_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_APP_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_APP_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_APP_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_APP_STEP__APP_ID = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Delete App Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_APP_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Delete App Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_APP_STEP_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapDeleteArtifactImpl <em>Delete Artifact</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapDeleteArtifactImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapDeleteArtifact()
+	 * @generated
+	 */
+	int CDAP_DELETE_ARTIFACT = 22;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_ARTIFACT__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_ARTIFACT__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_ARTIFACT__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_ARTIFACT__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Artifact Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_ARTIFACT__ARTIFACT_NAME = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_ARTIFACT__VERSION = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Delete Artifact</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_ARTIFACT_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of operations of the '<em>Delete Artifact</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_ARTIFACT_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapSuspendScheduleStepImpl <em>Suspend Schedule Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapSuspendScheduleStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapSuspendScheduleStep()
+	 * @generated
+	 */
+	int CDAP_SUSPEND_SCHEDULE_STEP = 23;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SUSPEND_SCHEDULE_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SUSPEND_SCHEDULE_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SUSPEND_SCHEDULE_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SUSPEND_SCHEDULE_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SUSPEND_SCHEDULE_STEP__APP_ID = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Schedule Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SUSPEND_SCHEDULE_STEP__SCHEDULE_ID = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Suspend Schedule Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SUSPEND_SCHEDULE_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of operations of the '<em>Suspend Schedule Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SUSPEND_SCHEDULE_STEP_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapResumeScheduleStepImpl <em>Resume Schedule Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapResumeScheduleStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapResumeScheduleStep()
+	 * @generated
+	 */
+	int CDAP_RESUME_SCHEDULE_STEP = 24;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_RESUME_SCHEDULE_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_RESUME_SCHEDULE_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_RESUME_SCHEDULE_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_RESUME_SCHEDULE_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_RESUME_SCHEDULE_STEP__APP_ID = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Schedule Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_RESUME_SCHEDULE_STEP__SCHEDULE_ID = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Resume Schedule Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_RESUME_SCHEDULE_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of operations of the '<em>Resume Schedule Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_RESUME_SCHEDULE_STEP_OPERATION_COUNT = CDAP_STEP_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 -->
@@ -1066,6 +2642,50 @@ public interface CdapPackage extends EPackage {
 	EReference getCdapServiceInstance_Apps();
 
 	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getDeploySteps <em>Deploy Steps</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Deploy Steps</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getDeploySteps()
+	 * @see #getCdapServiceInstance()
+	 * @generated
+	 */
+	EReference getCdapServiceInstance_DeploySteps();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getUndeploySteps <em>Undeploy Steps</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Undeploy Steps</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getUndeploySteps()
+	 * @see #getCdapServiceInstance()
+	 * @generated
+	 */
+	EReference getCdapServiceInstance_UndeploySteps();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getPreConfigurationSteps <em>Pre Configuration Steps</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Pre Configuration Steps</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getPreConfigurationSteps()
+	 * @see #getCdapServiceInstance()
+	 * @generated
+	 */
+	EReference getCdapServiceInstance_PreConfigurationSteps();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getPostConfigurationSteps <em>Post Configuration Steps</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Post Configuration Steps</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getPostConfigurationSteps()
+	 * @see #getCdapServiceInstance()
+	 * @generated
+	 */
+	EReference getCdapServiceInstance_PostConfigurationSteps();
+
+	/**
 	 * 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 -->
@@ -1380,6 +3000,560 @@ public interface CdapPackage extends EPackage {
 	EAttribute getCdapServiceDescriptor_JarFile();
 
 	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapStep <em>Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStep
+	 * @generated
+	 */
+	EClass getCdapStep();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep <em>Load Artifact Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Load Artifact Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep
+	 * @generated
+	 */
+	EClass getCdapLoadArtifactStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#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.CdapLoadArtifactStep#getArtifactName()
+	 * @see #getCdapLoadArtifactStep()
+	 * @generated
+	 */
+	EAttribute getCdapLoadArtifactStep_ArtifactName();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#getJarfile <em>Jarfile</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Jarfile</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#getJarfile()
+	 * @see #getCdapLoadArtifactStep()
+	 * @generated
+	 */
+	EAttribute getCdapLoadArtifactStep_Jarfile();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#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.CdapLoadArtifactStep#getVersion()
+	 * @see #getCdapLoadArtifactStep()
+	 * @generated
+	 */
+	EAttribute getCdapLoadArtifactStep_Version();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactWithConfigStep <em>Load Artifact With Config Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Load Artifact With Config Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactWithConfigStep
+	 * @generated
+	 */
+	EClass getCdapLoadArtifactWithConfigStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactWithConfigStep#getConfig <em>Config</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Config</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactWithConfigStep#getConfig()
+	 * @see #getCdapLoadArtifactWithConfigStep()
+	 * @generated
+	 */
+	EAttribute getCdapLoadArtifactWithConfigStep_Config();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep <em>Create App Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Create App Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep
+	 * @generated
+	 */
+	EClass getCdapCreateAppStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#getAppId <em>App Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#getAppId()
+	 * @see #getCdapCreateAppStep()
+	 * @generated
+	 */
+	EAttribute getCdapCreateAppStep_AppId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#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.CdapCreateAppStep#getArtifactName()
+	 * @see #getCdapCreateAppStep()
+	 * @generated
+	 */
+	EAttribute getCdapCreateAppStep_ArtifactName();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#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.CdapCreateAppStep#getVersion()
+	 * @see #getCdapCreateAppStep()
+	 * @generated
+	 */
+	EAttribute getCdapCreateAppStep_Version();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#getScope <em>Scope</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Scope</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#getScope()
+	 * @see #getCdapCreateAppStep()
+	 * @generated
+	 */
+	EAttribute getCdapCreateAppStep_Scope();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfigStep <em>Create App With Config Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Create App With Config Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfigStep
+	 * @generated
+	 */
+	EClass getCdapCreateAppWithConfigStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfigStep#getAppConfig <em>App Config</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Config</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfigStep#getAppConfig()
+	 * @see #getCdapCreateAppWithConfigStep()
+	 * @generated
+	 */
+	EAttribute getCdapCreateAppWithConfigStep_AppConfig();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep <em>Deploy App Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Deploy App Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep
+	 * @generated
+	 */
+	EClass getCdapDeployAppStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep#getJarfile <em>Jarfile</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Jarfile</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep#getJarfile()
+	 * @see #getCdapDeployAppStep()
+	 * @generated
+	 */
+	EAttribute getCdapDeployAppStep_Jarfile();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep <em>Stop Flow Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Stop Flow Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep
+	 * @generated
+	 */
+	EClass getCdapStopFlowStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep#getAppId <em>App Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep#getAppId()
+	 * @see #getCdapStopFlowStep()
+	 * @generated
+	 */
+	EAttribute getCdapStopFlowStep_AppId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep#getFlowId <em>Flow Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Flow Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep#getFlowId()
+	 * @see #getCdapStopFlowStep()
+	 * @generated
+	 */
+	EAttribute getCdapStopFlowStep_FlowId();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep <em>Stop Worker Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Stop Worker Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep
+	 * @generated
+	 */
+	EClass getCdapStopWorkerStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep#getAppId <em>App Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep#getAppId()
+	 * @see #getCdapStopWorkerStep()
+	 * @generated
+	 */
+	EAttribute getCdapStopWorkerStep_AppId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep#getWorkerId <em>Worker Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Worker Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep#getWorkerId()
+	 * @see #getCdapStopWorkerStep()
+	 * @generated
+	 */
+	EAttribute getCdapStopWorkerStep_WorkerId();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep <em>Stop Service Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Stop Service Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep
+	 * @generated
+	 */
+	EClass getCdapStopServiceStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep#getAppId <em>App Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep#getAppId()
+	 * @see #getCdapStopServiceStep()
+	 * @generated
+	 */
+	EAttribute getCdapStopServiceStep_AppId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep#getServiceId <em>Service Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Service Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep#getServiceId()
+	 * @see #getCdapStopServiceStep()
+	 * @generated
+	 */
+	EAttribute getCdapStopServiceStep_ServiceId();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapStopAppStep <em>Stop App Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Stop App Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStopAppStep
+	 * @generated
+	 */
+	EClass getCdapStopAppStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStopAppStep#getAppId <em>App Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStopAppStep#getAppId()
+	 * @see #getCdapStopAppStep()
+	 * @generated
+	 */
+	EAttribute getCdapStopAppStep_AppId();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep <em>Start Flow Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Start Flow Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep
+	 * @generated
+	 */
+	EClass getCdapStartFlowStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep#getAppId <em>App Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep#getAppId()
+	 * @see #getCdapStartFlowStep()
+	 * @generated
+	 */
+	EAttribute getCdapStartFlowStep_AppId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep#getFlowId <em>Flow Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Flow Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep#getFlowId()
+	 * @see #getCdapStartFlowStep()
+	 * @generated
+	 */
+	EAttribute getCdapStartFlowStep_FlowId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep#getExtraArgs <em>Extra Args</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Extra Args</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep#getExtraArgs()
+	 * @see #getCdapStartFlowStep()
+	 * @generated
+	 */
+	EAttribute getCdapStartFlowStep_ExtraArgs();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep <em>Start Worker Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Start Worker Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep
+	 * @generated
+	 */
+	EClass getCdapStartWorkerStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep#getAppId <em>App Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep#getAppId()
+	 * @see #getCdapStartWorkerStep()
+	 * @generated
+	 */
+	EAttribute getCdapStartWorkerStep_AppId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep#getWorkerId <em>Worker Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Worker Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep#getWorkerId()
+	 * @see #getCdapStartWorkerStep()
+	 * @generated
+	 */
+	EAttribute getCdapStartWorkerStep_WorkerId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep#getExtraArgs <em>Extra Args</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Extra Args</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep#getExtraArgs()
+	 * @see #getCdapStartWorkerStep()
+	 * @generated
+	 */
+	EAttribute getCdapStartWorkerStep_ExtraArgs();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep <em>Start Service Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Start Service Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep
+	 * @generated
+	 */
+	EClass getCdapStartServiceStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep#getAppId <em>App Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep#getAppId()
+	 * @see #getCdapStartServiceStep()
+	 * @generated
+	 */
+	EAttribute getCdapStartServiceStep_AppId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep#getServiceId <em>Service Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Service Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep#getServiceId()
+	 * @see #getCdapStartServiceStep()
+	 * @generated
+	 */
+	EAttribute getCdapStartServiceStep_ServiceId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep#getExtraArgs <em>Extra Args</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Extra Args</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep#getExtraArgs()
+	 * @see #getCdapStartServiceStep()
+	 * @generated
+	 */
+	EAttribute getCdapStartServiceStep_ExtraArgs();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapStartAppStep <em>Start App Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Start App Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartAppStep
+	 * @generated
+	 */
+	EClass getCdapStartAppStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStartAppStep#getAppId <em>App Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartAppStep#getAppId()
+	 * @see #getCdapStartAppStep()
+	 * @generated
+	 */
+	EAttribute getCdapStartAppStep_AppId();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapDeleteAppStep <em>Delete App Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Delete App Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapDeleteAppStep
+	 * @generated
+	 */
+	EClass getCdapDeleteAppStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapDeleteAppStep#getAppId <em>App Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapDeleteAppStep#getAppId()
+	 * @see #getCdapDeleteAppStep()
+	 * @generated
+	 */
+	EAttribute getCdapDeleteAppStep_AppId();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapDeleteArtifact <em>Delete Artifact</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Delete Artifact</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapDeleteArtifact
+	 * @generated
+	 */
+	EClass getCdapDeleteArtifact();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapDeleteArtifact#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.CdapDeleteArtifact#getArtifactName()
+	 * @see #getCdapDeleteArtifact()
+	 * @generated
+	 */
+	EAttribute getCdapDeleteArtifact_ArtifactName();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapDeleteArtifact#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.CdapDeleteArtifact#getVersion()
+	 * @see #getCdapDeleteArtifact()
+	 * @generated
+	 */
+	EAttribute getCdapDeleteArtifact_Version();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep <em>Suspend Schedule Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Suspend Schedule Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep
+	 * @generated
+	 */
+	EClass getCdapSuspendScheduleStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep#getAppId <em>App Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep#getAppId()
+	 * @see #getCdapSuspendScheduleStep()
+	 * @generated
+	 */
+	EAttribute getCdapSuspendScheduleStep_AppId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep#getScheduleId <em>Schedule Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Schedule Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep#getScheduleId()
+	 * @see #getCdapSuspendScheduleStep()
+	 * @generated
+	 */
+	EAttribute getCdapSuspendScheduleStep_ScheduleId();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep <em>Resume Schedule Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Resume Schedule Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep
+	 * @generated
+	 */
+	EClass getCdapResumeScheduleStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep#getAppId <em>App Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep#getAppId()
+	 * @see #getCdapResumeScheduleStep()
+	 * @generated
+	 */
+	EAttribute getCdapResumeScheduleStep_AppId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep#getScheduleId <em>Schedule Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Schedule Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep#getScheduleId()
+	 * @see #getCdapResumeScheduleStep()
+	 * @generated
+	 */
+	EAttribute getCdapResumeScheduleStep_ScheduleId();
+
+	/**
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1484,6 +3658,34 @@ public interface CdapPackage extends EPackage {
 		 */
 		EReference CDAP_SERVICE_INSTANCE__APPS = eINSTANCE.getCdapServiceInstance_Apps();
 		/**
+		 * The meta object literal for the '<em><b>Deploy Steps</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CDAP_SERVICE_INSTANCE__DEPLOY_STEPS = eINSTANCE.getCdapServiceInstance_DeploySteps();
+		/**
+		 * The meta object literal for the '<em><b>Undeploy Steps</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CDAP_SERVICE_INSTANCE__UNDEPLOY_STEPS = eINSTANCE.getCdapServiceInstance_UndeploySteps();
+		/**
+		 * The meta object literal for the '<em><b>Pre Configuration Steps</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CDAP_SERVICE_INSTANCE__PRE_CONFIGURATION_STEPS = eINSTANCE.getCdapServiceInstance_PreConfigurationSteps();
+		/**
+		 * The meta object literal for the '<em><b>Post Configuration Steps</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CDAP_SERVICE_INSTANCE__POST_CONFIGURATION_STEPS = eINSTANCE.getCdapServiceInstance_PostConfigurationSteps();
+		/**
 		 * The meta object literal for the '<em><b>App Names</b></em>' attribute list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -1696,6 +3898,406 @@ public interface CdapPackage extends EPackage {
 		 * @generated
 		 */
 		EAttribute CDAP_SERVICE_DESCRIPTOR__JAR_FILE = eINSTANCE.getCdapServiceDescriptor_JarFile();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStepImpl <em>Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStep()
+		 * @generated
+		 */
+		EClass CDAP_STEP = eINSTANCE.getCdapStep();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapLoadArtifactStepImpl <em>Load Artifact Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapLoadArtifactStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapLoadArtifactStep()
+		 * @generated
+		 */
+		EClass CDAP_LOAD_ARTIFACT_STEP = eINSTANCE.getCdapLoadArtifactStep();
+		/**
+		 * The meta object literal for the '<em><b>Artifact Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_LOAD_ARTIFACT_STEP__ARTIFACT_NAME = eINSTANCE.getCdapLoadArtifactStep_ArtifactName();
+		/**
+		 * The meta object literal for the '<em><b>Jarfile</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_LOAD_ARTIFACT_STEP__JARFILE = eINSTANCE.getCdapLoadArtifactStep_Jarfile();
+		/**
+		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_LOAD_ARTIFACT_STEP__VERSION = eINSTANCE.getCdapLoadArtifactStep_Version();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapLoadArtifactWithConfigStepImpl <em>Load Artifact With Config Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapLoadArtifactWithConfigStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapLoadArtifactWithConfigStep()
+		 * @generated
+		 */
+		EClass CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP = eINSTANCE.getCdapLoadArtifactWithConfigStep();
+		/**
+		 * The meta object literal for the '<em><b>Config</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__CONFIG = eINSTANCE.getCdapLoadArtifactWithConfigStep_Config();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapCreateAppStepImpl <em>Create App Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapCreateAppStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapCreateAppStep()
+		 * @generated
+		 */
+		EClass CDAP_CREATE_APP_STEP = eINSTANCE.getCdapCreateAppStep();
+		/**
+		 * The meta object literal for the '<em><b>App Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_CREATE_APP_STEP__APP_ID = eINSTANCE.getCdapCreateAppStep_AppId();
+		/**
+		 * The meta object literal for the '<em><b>Artifact Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_CREATE_APP_STEP__ARTIFACT_NAME = eINSTANCE.getCdapCreateAppStep_ArtifactName();
+		/**
+		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_CREATE_APP_STEP__VERSION = eINSTANCE.getCdapCreateAppStep_Version();
+		/**
+		 * The meta object literal for the '<em><b>Scope</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_CREATE_APP_STEP__SCOPE = eINSTANCE.getCdapCreateAppStep_Scope();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapCreateAppWithConfigStepImpl <em>Create App With Config Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapCreateAppWithConfigStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapCreateAppWithConfigStep()
+		 * @generated
+		 */
+		EClass CDAP_CREATE_APP_WITH_CONFIG_STEP = eINSTANCE.getCdapCreateAppWithConfigStep();
+		/**
+		 * The meta object literal for the '<em><b>App Config</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_CREATE_APP_WITH_CONFIG_STEP__APP_CONFIG = eINSTANCE.getCdapCreateAppWithConfigStep_AppConfig();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapDeployAppStepImpl <em>Deploy App Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapDeployAppStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapDeployAppStep()
+		 * @generated
+		 */
+		EClass CDAP_DEPLOY_APP_STEP = eINSTANCE.getCdapDeployAppStep();
+		/**
+		 * The meta object literal for the '<em><b>Jarfile</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_DEPLOY_APP_STEP__JARFILE = eINSTANCE.getCdapDeployAppStep_Jarfile();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopFlowStepImpl <em>Stop Flow Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStopFlowStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStopFlowStep()
+		 * @generated
+		 */
+		EClass CDAP_STOP_FLOW_STEP = eINSTANCE.getCdapStopFlowStep();
+		/**
+		 * The meta object literal for the '<em><b>App Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_STOP_FLOW_STEP__APP_ID = eINSTANCE.getCdapStopFlowStep_AppId();
+		/**
+		 * The meta object literal for the '<em><b>Flow Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_STOP_FLOW_STEP__FLOW_ID = eINSTANCE.getCdapStopFlowStep_FlowId();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopWorkerStepImpl <em>Stop Worker Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStopWorkerStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStopWorkerStep()
+		 * @generated
+		 */
+		EClass CDAP_STOP_WORKER_STEP = eINSTANCE.getCdapStopWorkerStep();
+		/**
+		 * The meta object literal for the '<em><b>App Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_STOP_WORKER_STEP__APP_ID = eINSTANCE.getCdapStopWorkerStep_AppId();
+		/**
+		 * The meta object literal for the '<em><b>Worker Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_STOP_WORKER_STEP__WORKER_ID = eINSTANCE.getCdapStopWorkerStep_WorkerId();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopServiceStepImpl <em>Stop Service Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStopServiceStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStopServiceStep()
+		 * @generated
+		 */
+		EClass CDAP_STOP_SERVICE_STEP = eINSTANCE.getCdapStopServiceStep();
+		/**
+		 * The meta object literal for the '<em><b>App Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_STOP_SERVICE_STEP__APP_ID = eINSTANCE.getCdapStopServiceStep_AppId();
+		/**
+		 * The meta object literal for the '<em><b>Service Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_STOP_SERVICE_STEP__SERVICE_ID = eINSTANCE.getCdapStopServiceStep_ServiceId();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopAppStepImpl <em>Stop App Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStopAppStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStopAppStep()
+		 * @generated
+		 */
+		EClass CDAP_STOP_APP_STEP = eINSTANCE.getCdapStopAppStep();
+		/**
+		 * The meta object literal for the '<em><b>App Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_STOP_APP_STEP__APP_ID = eINSTANCE.getCdapStopAppStep_AppId();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartFlowStepImpl <em>Start Flow Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStartFlowStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStartFlowStep()
+		 * @generated
+		 */
+		EClass CDAP_START_FLOW_STEP = eINSTANCE.getCdapStartFlowStep();
+		/**
+		 * The meta object literal for the '<em><b>App Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_START_FLOW_STEP__APP_ID = eINSTANCE.getCdapStartFlowStep_AppId();
+		/**
+		 * The meta object literal for the '<em><b>Flow Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_START_FLOW_STEP__FLOW_ID = eINSTANCE.getCdapStartFlowStep_FlowId();
+		/**
+		 * The meta object literal for the '<em><b>Extra Args</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_START_FLOW_STEP__EXTRA_ARGS = eINSTANCE.getCdapStartFlowStep_ExtraArgs();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartWorkerStepImpl <em>Start Worker Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStartWorkerStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStartWorkerStep()
+		 * @generated
+		 */
+		EClass CDAP_START_WORKER_STEP = eINSTANCE.getCdapStartWorkerStep();
+		/**
+		 * The meta object literal for the '<em><b>App Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_START_WORKER_STEP__APP_ID = eINSTANCE.getCdapStartWorkerStep_AppId();
+		/**
+		 * The meta object literal for the '<em><b>Worker Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_START_WORKER_STEP__WORKER_ID = eINSTANCE.getCdapStartWorkerStep_WorkerId();
+		/**
+		 * The meta object literal for the '<em><b>Extra Args</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_START_WORKER_STEP__EXTRA_ARGS = eINSTANCE.getCdapStartWorkerStep_ExtraArgs();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartServiceStepImpl <em>Start Service Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStartServiceStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStartServiceStep()
+		 * @generated
+		 */
+		EClass CDAP_START_SERVICE_STEP = eINSTANCE.getCdapStartServiceStep();
+		/**
+		 * The meta object literal for the '<em><b>App Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_START_SERVICE_STEP__APP_ID = eINSTANCE.getCdapStartServiceStep_AppId();
+		/**
+		 * The meta object literal for the '<em><b>Service Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_START_SERVICE_STEP__SERVICE_ID = eINSTANCE.getCdapStartServiceStep_ServiceId();
+		/**
+		 * The meta object literal for the '<em><b>Extra Args</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_START_SERVICE_STEP__EXTRA_ARGS = eINSTANCE.getCdapStartServiceStep_ExtraArgs();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartAppStepImpl <em>Start App Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStartAppStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStartAppStep()
+		 * @generated
+		 */
+		EClass CDAP_START_APP_STEP = eINSTANCE.getCdapStartAppStep();
+		/**
+		 * The meta object literal for the '<em><b>App Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_START_APP_STEP__APP_ID = eINSTANCE.getCdapStartAppStep_AppId();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapDeleteAppStepImpl <em>Delete App Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapDeleteAppStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapDeleteAppStep()
+		 * @generated
+		 */
+		EClass CDAP_DELETE_APP_STEP = eINSTANCE.getCdapDeleteAppStep();
+		/**
+		 * The meta object literal for the '<em><b>App Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_DELETE_APP_STEP__APP_ID = eINSTANCE.getCdapDeleteAppStep_AppId();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapDeleteArtifactImpl <em>Delete Artifact</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapDeleteArtifactImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapDeleteArtifact()
+		 * @generated
+		 */
+		EClass CDAP_DELETE_ARTIFACT = eINSTANCE.getCdapDeleteArtifact();
+		/**
+		 * The meta object literal for the '<em><b>Artifact Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_DELETE_ARTIFACT__ARTIFACT_NAME = eINSTANCE.getCdapDeleteArtifact_ArtifactName();
+		/**
+		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_DELETE_ARTIFACT__VERSION = eINSTANCE.getCdapDeleteArtifact_Version();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapSuspendScheduleStepImpl <em>Suspend Schedule Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapSuspendScheduleStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapSuspendScheduleStep()
+		 * @generated
+		 */
+		EClass CDAP_SUSPEND_SCHEDULE_STEP = eINSTANCE.getCdapSuspendScheduleStep();
+		/**
+		 * The meta object literal for the '<em><b>App Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_SUSPEND_SCHEDULE_STEP__APP_ID = eINSTANCE.getCdapSuspendScheduleStep_AppId();
+		/**
+		 * The meta object literal for the '<em><b>Schedule Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_SUSPEND_SCHEDULE_STEP__SCHEDULE_ID = eINSTANCE.getCdapSuspendScheduleStep_ScheduleId();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapResumeScheduleStepImpl <em>Resume Schedule Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapResumeScheduleStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapResumeScheduleStep()
+		 * @generated
+		 */
+		EClass CDAP_RESUME_SCHEDULE_STEP = eINSTANCE.getCdapResumeScheduleStep();
+		/**
+		 * The meta object literal for the '<em><b>App Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_RESUME_SCHEDULE_STEP__APP_ID = eINSTANCE.getCdapResumeScheduleStep_AppId();
+		/**
+		 * The meta object literal for the '<em><b>Schedule Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_RESUME_SCHEDULE_STEP__SCHEDULE_ID = eINSTANCE.getCdapResumeScheduleStep_ScheduleId();
 
 	}
 
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapResumeScheduleStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapResumeScheduleStep.java
new file mode 100644
index 0000000..0407e0d
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapResumeScheduleStep.java
@@ -0,0 +1,76 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Resume Schedule Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep#getScheduleId <em>Schedule Id</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapResumeScheduleStep()
+ * @model
+ * @generated
+ */
+public interface CdapResumeScheduleStep extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Id</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 Id</em>' attribute.
+	 * @see #setAppId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapResumeScheduleStep_AppId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep#getAppId <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Id</em>' attribute.
+	 * @see #getAppId()
+	 * @generated
+	 */
+	void setAppId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Schedule Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Schedule Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Schedule Id</em>' attribute.
+	 * @see #setScheduleId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapResumeScheduleStep_ScheduleId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getScheduleId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep#getScheduleId <em>Schedule Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Schedule Id</em>' attribute.
+	 * @see #getScheduleId()
+	 * @generated
+	 */
+	void setScheduleId(String value);
+
+} // CdapResumeScheduleStep
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
index ff9c57f..2ed6de3 100644
--- 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
@@ -33,10 +33,10 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <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
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
index 62a853e..36af311 100644
--- 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
@@ -32,13 +32,13 @@ import org.openecomp.dcae.controller.core.service.DcaeServiceDescriptor;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <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
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
index 7d695d8..df9fdc0 100644
--- 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
@@ -36,6 +36,7 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <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>
@@ -43,6 +44,10 @@ import org.eclipse.emf.common.util.EList;
  *   <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#getDeploySteps <em>Deploy Steps</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getUndeploySteps <em>Undeploy Steps</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getPreConfigurationSteps <em>Pre Configuration Steps</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getPostConfigurationSteps <em>Post Configuration Steps</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>
@@ -53,7 +58,6 @@ import org.eclipse.emf.common.util.EList;
  *   <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
@@ -223,6 +227,70 @@ public interface CdapServiceInstance extends DcaeServiceInstance {
 	EList<CdapApplication> getApps();
 
 	/**
+	 * Returns the value of the '<em><b>Deploy Steps</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.dcae.controller.service.cdap.CdapStep}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Deploy Steps</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>Deploy Steps</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceInstance_DeploySteps()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<CdapStep> getDeploySteps();
+
+	/**
+	 * Returns the value of the '<em><b>Undeploy Steps</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.dcae.controller.service.cdap.CdapStep}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Undeploy Steps</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>Undeploy Steps</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceInstance_UndeploySteps()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<CdapStep> getUndeploySteps();
+
+	/**
+	 * Returns the value of the '<em><b>Pre Configuration Steps</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.dcae.controller.service.cdap.CdapStep}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Pre Configuration Steps</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>Pre Configuration Steps</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceInstance_PreConfigurationSteps()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<CdapStep> getPreConfigurationSteps();
+
+	/**
+	 * Returns the value of the '<em><b>Post Configuration Steps</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.dcae.controller.service.cdap.CdapStep}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Post Configuration Steps</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>Post Configuration Steps</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceInstance_PostConfigurationSteps()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<CdapStep> getPostConfigurationSteps();
+
+	/**
 	 * 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 -->
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStartAppStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStartAppStep.java
new file mode 100644
index 0000000..d92b415
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStartAppStep.java
@@ -0,0 +1,49 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Start App Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStartAppStep#getAppId <em>App Id</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartAppStep()
+ * @model
+ * @generated
+ */
+public interface CdapStartAppStep extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Id</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 Id</em>' attribute.
+	 * @see #setAppId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartAppStep_AppId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStartAppStep#getAppId <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Id</em>' attribute.
+	 * @see #getAppId()
+	 * @generated
+	 */
+	void setAppId(String value);
+
+} // CdapStartAppStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStartFlowStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStartFlowStep.java
new file mode 100644
index 0000000..b4ede0a
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStartFlowStep.java
@@ -0,0 +1,103 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Start Flow Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep#getFlowId <em>Flow Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep#getExtraArgs <em>Extra Args</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartFlowStep()
+ * @model
+ * @generated
+ */
+public interface CdapStartFlowStep extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Id</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 Id</em>' attribute.
+	 * @see #setAppId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartFlowStep_AppId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep#getAppId <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Id</em>' attribute.
+	 * @see #getAppId()
+	 * @generated
+	 */
+	void setAppId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Flow Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Flow Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Flow Id</em>' attribute.
+	 * @see #setFlowId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartFlowStep_FlowId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getFlowId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep#getFlowId <em>Flow Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Flow Id</em>' attribute.
+	 * @see #getFlowId()
+	 * @generated
+	 */
+	void setFlowId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Extra Args</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Extra Args</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Extra Args</em>' attribute.
+	 * @see #setExtraArgs(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartFlowStep_ExtraArgs()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getExtraArgs();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep#getExtraArgs <em>Extra Args</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Extra Args</em>' attribute.
+	 * @see #getExtraArgs()
+	 * @generated
+	 */
+	void setExtraArgs(String value);
+
+} // CdapStartFlowStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStartServiceStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStartServiceStep.java
new file mode 100644
index 0000000..0ac15cd
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStartServiceStep.java
@@ -0,0 +1,103 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Start Service Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep#getServiceId <em>Service Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep#getExtraArgs <em>Extra Args</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartServiceStep()
+ * @model
+ * @generated
+ */
+public interface CdapStartServiceStep extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Id</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 Id</em>' attribute.
+	 * @see #setAppId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartServiceStep_AppId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep#getAppId <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Id</em>' attribute.
+	 * @see #getAppId()
+	 * @generated
+	 */
+	void setAppId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Service Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Service Id</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 Id</em>' attribute.
+	 * @see #setServiceId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartServiceStep_ServiceId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getServiceId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep#getServiceId <em>Service Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Service Id</em>' attribute.
+	 * @see #getServiceId()
+	 * @generated
+	 */
+	void setServiceId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Extra Args</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Extra Args</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Extra Args</em>' attribute.
+	 * @see #setExtraArgs(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartServiceStep_ExtraArgs()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getExtraArgs();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep#getExtraArgs <em>Extra Args</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Extra Args</em>' attribute.
+	 * @see #getExtraArgs()
+	 * @generated
+	 */
+	void setExtraArgs(String value);
+
+} // CdapStartServiceStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStartWorkerStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStartWorkerStep.java
new file mode 100644
index 0000000..b87dbf3
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStartWorkerStep.java
@@ -0,0 +1,103 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Start Worker Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep#getWorkerId <em>Worker Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep#getExtraArgs <em>Extra Args</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartWorkerStep()
+ * @model
+ * @generated
+ */
+public interface CdapStartWorkerStep extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Id</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 Id</em>' attribute.
+	 * @see #setAppId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartWorkerStep_AppId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep#getAppId <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Id</em>' attribute.
+	 * @see #getAppId()
+	 * @generated
+	 */
+	void setAppId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Worker Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Worker Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Worker Id</em>' attribute.
+	 * @see #setWorkerId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartWorkerStep_WorkerId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getWorkerId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep#getWorkerId <em>Worker Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Worker Id</em>' attribute.
+	 * @see #getWorkerId()
+	 * @generated
+	 */
+	void setWorkerId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Extra Args</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Extra Args</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Extra Args</em>' attribute.
+	 * @see #setExtraArgs(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartWorkerStep_ExtraArgs()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getExtraArgs();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep#getExtraArgs <em>Extra Args</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Extra Args</em>' attribute.
+	 * @see #getExtraArgs()
+	 * @generated
+	 */
+	void setExtraArgs(String value);
+
+} // CdapStartWorkerStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStep.java
new file mode 100644
index 0000000..85daed1
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStep.java
@@ -0,0 +1,18 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStep()
+ * @model abstract="true"
+ * @generated
+ */
+public interface CdapStep extends NamedEntity {
+} // CdapStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopAppStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopAppStep.java
new file mode 100644
index 0000000..e882774
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopAppStep.java
@@ -0,0 +1,49 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Stop App Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStopAppStep#getAppId <em>App Id</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStopAppStep()
+ * @model
+ * @generated
+ */
+public interface CdapStopAppStep extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Id</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 Id</em>' attribute.
+	 * @see #setAppId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStopAppStep_AppId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStopAppStep#getAppId <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Id</em>' attribute.
+	 * @see #getAppId()
+	 * @generated
+	 */
+	void setAppId(String value);
+
+} // CdapStopAppStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopFlowStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopFlowStep.java
new file mode 100644
index 0000000..f09b196
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopFlowStep.java
@@ -0,0 +1,76 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Stop Flow Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep#getFlowId <em>Flow Id</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStopFlowStep()
+ * @model
+ * @generated
+ */
+public interface CdapStopFlowStep extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Id</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 Id</em>' attribute.
+	 * @see #setAppId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStopFlowStep_AppId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep#getAppId <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Id</em>' attribute.
+	 * @see #getAppId()
+	 * @generated
+	 */
+	void setAppId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Flow Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Flow Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Flow Id</em>' attribute.
+	 * @see #setFlowId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStopFlowStep_FlowId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getFlowId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep#getFlowId <em>Flow Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Flow Id</em>' attribute.
+	 * @see #getFlowId()
+	 * @generated
+	 */
+	void setFlowId(String value);
+
+} // CdapStopFlowStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopServiceStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopServiceStep.java
new file mode 100644
index 0000000..3e28b8e
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopServiceStep.java
@@ -0,0 +1,76 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Stop Service Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep#getServiceId <em>Service Id</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStopServiceStep()
+ * @model
+ * @generated
+ */
+public interface CdapStopServiceStep extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Id</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 Id</em>' attribute.
+	 * @see #setAppId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStopServiceStep_AppId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep#getAppId <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Id</em>' attribute.
+	 * @see #getAppId()
+	 * @generated
+	 */
+	void setAppId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Service Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Service Id</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 Id</em>' attribute.
+	 * @see #setServiceId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStopServiceStep_ServiceId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getServiceId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep#getServiceId <em>Service Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Service Id</em>' attribute.
+	 * @see #getServiceId()
+	 * @generated
+	 */
+	void setServiceId(String value);
+
+} // CdapStopServiceStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopWorkerStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopWorkerStep.java
new file mode 100644
index 0000000..866381b
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopWorkerStep.java
@@ -0,0 +1,76 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Stop Worker Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep#getWorkerId <em>Worker Id</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStopWorkerStep()
+ * @model
+ * @generated
+ */
+public interface CdapStopWorkerStep extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Id</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 Id</em>' attribute.
+	 * @see #setAppId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStopWorkerStep_AppId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep#getAppId <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Id</em>' attribute.
+	 * @see #getAppId()
+	 * @generated
+	 */
+	void setAppId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Worker Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Worker Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Worker Id</em>' attribute.
+	 * @see #setWorkerId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStopWorkerStep_WorkerId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getWorkerId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep#getWorkerId <em>Worker Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Worker Id</em>' attribute.
+	 * @see #getWorkerId()
+	 * @generated
+	 */
+	void setWorkerId(String value);
+
+} // CdapStopWorkerStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapSuspendScheduleStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapSuspendScheduleStep.java
new file mode 100644
index 0000000..fe4097f
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapSuspendScheduleStep.java
@@ -0,0 +1,76 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Suspend Schedule Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep#getScheduleId <em>Schedule Id</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapSuspendScheduleStep()
+ * @model
+ * @generated
+ */
+public interface CdapSuspendScheduleStep extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Id</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 Id</em>' attribute.
+	 * @see #setAppId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapSuspendScheduleStep_AppId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep#getAppId <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Id</em>' attribute.
+	 * @see #getAppId()
+	 * @generated
+	 */
+	void setAppId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Schedule Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Schedule Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Schedule Id</em>' attribute.
+	 * @see #setScheduleId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapSuspendScheduleStep_ScheduleId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getScheduleId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep#getScheduleId <em>Schedule Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Schedule Id</em>' attribute.
+	 * @see #getScheduleId()
+	 * @generated
+	 */
+	void setScheduleId(String value);
+
+} // CdapSuspendScheduleStep
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
index 416472f..2d41e94 100644
--- 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
@@ -38,13 +38,13 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <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
  */
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
index 318204e..1f8f9df 100644
--- 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
@@ -40,11 +40,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <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
  */
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapCreateAppStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapCreateAppStepImpl.java
new file mode 100644
index 0000000..8f2e971
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapCreateAppStepImpl.java
@@ -0,0 +1,324 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep;
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Create App Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapCreateAppStepImpl#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapCreateAppStepImpl#getArtifactName <em>Artifact Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapCreateAppStepImpl#getVersion <em>Version</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapCreateAppStepImpl#getScope <em>Scope</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapCreateAppStepImpl extends CdapStepImpl implements CdapCreateAppStep {
+	/**
+	 * The default value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appId = APP_ID_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 #getScope() <em>Scope</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getScope()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SCOPE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getScope() <em>Scope</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getScope()
+	 * @generated
+	 * @ordered
+	 */
+	protected String scope = SCOPE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapCreateAppStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_CREATE_APP_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppId() {
+		return appId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppId(String newAppId) {
+		String oldAppId = appId;
+		appId = newAppId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_CREATE_APP_STEP__APP_ID, oldAppId, appId));
+	}
+
+	/**
+	 * <!-- 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_CREATE_APP_STEP__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_CREATE_APP_STEP__VERSION, oldVersion, version));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getScope() {
+		return scope;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setScope(String newScope) {
+		String oldScope = scope;
+		scope = newScope;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_CREATE_APP_STEP__SCOPE, oldScope, scope));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_CREATE_APP_STEP__APP_ID:
+				return getAppId();
+			case CdapPackage.CDAP_CREATE_APP_STEP__ARTIFACT_NAME:
+				return getArtifactName();
+			case CdapPackage.CDAP_CREATE_APP_STEP__VERSION:
+				return getVersion();
+			case CdapPackage.CDAP_CREATE_APP_STEP__SCOPE:
+				return getScope();
+		}
+		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_CREATE_APP_STEP__APP_ID:
+				setAppId((String)newValue);
+				return;
+			case CdapPackage.CDAP_CREATE_APP_STEP__ARTIFACT_NAME:
+				setArtifactName((String)newValue);
+				return;
+			case CdapPackage.CDAP_CREATE_APP_STEP__VERSION:
+				setVersion((String)newValue);
+				return;
+			case CdapPackage.CDAP_CREATE_APP_STEP__SCOPE:
+				setScope((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_CREATE_APP_STEP__APP_ID:
+				setAppId(APP_ID_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_CREATE_APP_STEP__ARTIFACT_NAME:
+				setArtifactName(ARTIFACT_NAME_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_CREATE_APP_STEP__VERSION:
+				setVersion(VERSION_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_CREATE_APP_STEP__SCOPE:
+				setScope(SCOPE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_CREATE_APP_STEP__APP_ID:
+				return APP_ID_EDEFAULT == null ? appId != null : !APP_ID_EDEFAULT.equals(appId);
+			case CdapPackage.CDAP_CREATE_APP_STEP__ARTIFACT_NAME:
+				return ARTIFACT_NAME_EDEFAULT == null ? artifactName != null : !ARTIFACT_NAME_EDEFAULT.equals(artifactName);
+			case CdapPackage.CDAP_CREATE_APP_STEP__VERSION:
+				return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
+			case CdapPackage.CDAP_CREATE_APP_STEP__SCOPE:
+				return SCOPE_EDEFAULT == null ? scope != null : !SCOPE_EDEFAULT.equals(scope);
+		}
+		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(" (appId: ");
+		result.append(appId);
+		result.append(", artifactName: ");
+		result.append(artifactName);
+		result.append(", version: ");
+		result.append(version);
+		result.append(", scope: ");
+		result.append(scope);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapCreateAppStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapCreateAppWithConfigStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapCreateAppWithConfigStepImpl.java
new file mode 100644
index 0000000..a203951
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapCreateAppWithConfigStepImpl.java
@@ -0,0 +1,162 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfigStep;
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Create App With Config Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapCreateAppWithConfigStepImpl#getAppConfig <em>App Config</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapCreateAppWithConfigStepImpl extends CdapCreateAppStepImpl implements CdapCreateAppWithConfigStep {
+	/**
+	 * The default value of the '{@link #getAppConfig() <em>App Config</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppConfig()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_CONFIG_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppConfig() <em>App Config</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppConfig()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appConfig = APP_CONFIG_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapCreateAppWithConfigStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_CREATE_APP_WITH_CONFIG_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppConfig() {
+		return appConfig;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppConfig(String newAppConfig) {
+		String oldAppConfig = appConfig;
+		appConfig = newAppConfig;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_CREATE_APP_WITH_CONFIG_STEP__APP_CONFIG, oldAppConfig, appConfig));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_CREATE_APP_WITH_CONFIG_STEP__APP_CONFIG:
+				return getAppConfig();
+		}
+		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_CREATE_APP_WITH_CONFIG_STEP__APP_CONFIG:
+				setAppConfig((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_CREATE_APP_WITH_CONFIG_STEP__APP_CONFIG:
+				setAppConfig(APP_CONFIG_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_CREATE_APP_WITH_CONFIG_STEP__APP_CONFIG:
+				return APP_CONFIG_EDEFAULT == null ? appConfig != null : !APP_CONFIG_EDEFAULT.equals(appConfig);
+		}
+		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(" (appConfig: ");
+		result.append(appConfig);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapCreateAppWithConfigStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapDeleteAppStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapDeleteAppStepImpl.java
new file mode 100644
index 0000000..93600b8
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapDeleteAppStepImpl.java
@@ -0,0 +1,162 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapDeleteAppStep;
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Delete App Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapDeleteAppStepImpl#getAppId <em>App Id</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapDeleteAppStepImpl extends CdapStepImpl implements CdapDeleteAppStep {
+	/**
+	 * The default value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appId = APP_ID_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapDeleteAppStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_DELETE_APP_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppId() {
+		return appId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppId(String newAppId) {
+		String oldAppId = appId;
+		appId = newAppId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_DELETE_APP_STEP__APP_ID, oldAppId, appId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_DELETE_APP_STEP__APP_ID:
+				return getAppId();
+		}
+		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_DELETE_APP_STEP__APP_ID:
+				setAppId((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_DELETE_APP_STEP__APP_ID:
+				setAppId(APP_ID_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_DELETE_APP_STEP__APP_ID:
+				return APP_ID_EDEFAULT == null ? appId != null : !APP_ID_EDEFAULT.equals(appId);
+		}
+		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(" (appId: ");
+		result.append(appId);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapDeleteAppStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapDeleteArtifactImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapDeleteArtifactImpl.java
new file mode 100644
index 0000000..cc9510f
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapDeleteArtifactImpl.java
@@ -0,0 +1,216 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapDeleteArtifact;
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Delete Artifact</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapDeleteArtifactImpl#getArtifactName <em>Artifact Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapDeleteArtifactImpl#getVersion <em>Version</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapDeleteArtifactImpl extends CdapStepImpl implements CdapDeleteArtifact {
+	/**
+	 * 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;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapDeleteArtifactImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_DELETE_ARTIFACT;
+	}
+
+	/**
+	 * <!-- 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_DELETE_ARTIFACT__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_DELETE_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_DELETE_ARTIFACT__ARTIFACT_NAME:
+				return getArtifactName();
+			case CdapPackage.CDAP_DELETE_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_DELETE_ARTIFACT__ARTIFACT_NAME:
+				setArtifactName((String)newValue);
+				return;
+			case CdapPackage.CDAP_DELETE_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_DELETE_ARTIFACT__ARTIFACT_NAME:
+				setArtifactName(ARTIFACT_NAME_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_DELETE_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_DELETE_ARTIFACT__ARTIFACT_NAME:
+				return ARTIFACT_NAME_EDEFAULT == null ? artifactName != null : !ARTIFACT_NAME_EDEFAULT.equals(artifactName);
+			case CdapPackage.CDAP_DELETE_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(" (artifactName: ");
+		result.append(artifactName);
+		result.append(", version: ");
+		result.append(version);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapDeleteArtifactImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapDeployAppStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapDeployAppStepImpl.java
new file mode 100644
index 0000000..507a60e
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapDeployAppStepImpl.java
@@ -0,0 +1,162 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep;
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Deploy App Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapDeployAppStepImpl#getJarfile <em>Jarfile</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapDeployAppStepImpl extends CdapStepImpl implements CdapDeployAppStep {
+	/**
+	 * The default value of the '{@link #getJarfile() <em>Jarfile</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getJarfile()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String JARFILE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getJarfile() <em>Jarfile</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getJarfile()
+	 * @generated
+	 * @ordered
+	 */
+	protected String jarfile = JARFILE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapDeployAppStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_DEPLOY_APP_STEP;
+	}
+
+	/**
+	 * <!-- 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_DEPLOY_APP_STEP__JARFILE, oldJarfile, jarfile));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_DEPLOY_APP_STEP__JARFILE:
+				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_DEPLOY_APP_STEP__JARFILE:
+				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_DEPLOY_APP_STEP__JARFILE:
+				setJarfile(JARFILE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_DEPLOY_APP_STEP__JARFILE:
+				return JARFILE_EDEFAULT == null ? jarfile != null : !JARFILE_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(" (jarfile: ");
+		result.append(jarfile);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapDeployAppStepImpl
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
index d0d0018..99f4b2d 100644
--- 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
@@ -84,6 +84,23 @@ public class CdapFactoryImpl extends EFactoryImpl implements CdapFactory {
 			case CdapPackage.CDAP_SERVICE_INSTANCE_CONFIGURATION: return createCdapServiceInstanceConfiguration();
 			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION: return createCdapInternalApplicationConfiguration();
 			case CdapPackage.CDAP_SERVICE_DESCRIPTOR: return createCdapServiceDescriptor();
+			case CdapPackage.CDAP_LOAD_ARTIFACT_STEP: return createCdapLoadArtifactStep();
+			case CdapPackage.CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP: return createCdapLoadArtifactWithConfigStep();
+			case CdapPackage.CDAP_CREATE_APP_STEP: return createCdapCreateAppStep();
+			case CdapPackage.CDAP_CREATE_APP_WITH_CONFIG_STEP: return createCdapCreateAppWithConfigStep();
+			case CdapPackage.CDAP_DEPLOY_APP_STEP: return createCdapDeployAppStep();
+			case CdapPackage.CDAP_STOP_FLOW_STEP: return createCdapStopFlowStep();
+			case CdapPackage.CDAP_STOP_WORKER_STEP: return createCdapStopWorkerStep();
+			case CdapPackage.CDAP_STOP_SERVICE_STEP: return createCdapStopServiceStep();
+			case CdapPackage.CDAP_STOP_APP_STEP: return createCdapStopAppStep();
+			case CdapPackage.CDAP_START_FLOW_STEP: return createCdapStartFlowStep();
+			case CdapPackage.CDAP_START_WORKER_STEP: return createCdapStartWorkerStep();
+			case CdapPackage.CDAP_START_SERVICE_STEP: return createCdapStartServiceStep();
+			case CdapPackage.CDAP_START_APP_STEP: return createCdapStartAppStep();
+			case CdapPackage.CDAP_DELETE_APP_STEP: return createCdapDeleteAppStep();
+			case CdapPackage.CDAP_DELETE_ARTIFACT: return createCdapDeleteArtifact();
+			case CdapPackage.CDAP_SUSPEND_SCHEDULE_STEP: return createCdapSuspendScheduleStep();
+			case CdapPackage.CDAP_RESUME_SCHEDULE_STEP: return createCdapResumeScheduleStep();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -164,6 +181,176 @@ public class CdapFactoryImpl extends EFactoryImpl implements CdapFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public CdapLoadArtifactStep createCdapLoadArtifactStep() {
+		CdapLoadArtifactStepImpl cdapLoadArtifactStep = new CdapLoadArtifactStepImpl();
+		return cdapLoadArtifactStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapLoadArtifactWithConfigStep createCdapLoadArtifactWithConfigStep() {
+		CdapLoadArtifactWithConfigStepImpl cdapLoadArtifactWithConfigStep = new CdapLoadArtifactWithConfigStepImpl();
+		return cdapLoadArtifactWithConfigStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapCreateAppStep createCdapCreateAppStep() {
+		CdapCreateAppStepImpl cdapCreateAppStep = new CdapCreateAppStepImpl();
+		return cdapCreateAppStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapCreateAppWithConfigStep createCdapCreateAppWithConfigStep() {
+		CdapCreateAppWithConfigStepImpl cdapCreateAppWithConfigStep = new CdapCreateAppWithConfigStepImpl();
+		return cdapCreateAppWithConfigStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapDeployAppStep createCdapDeployAppStep() {
+		CdapDeployAppStepImpl cdapDeployAppStep = new CdapDeployAppStepImpl();
+		return cdapDeployAppStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapStopFlowStep createCdapStopFlowStep() {
+		CdapStopFlowStepImpl cdapStopFlowStep = new CdapStopFlowStepImpl();
+		return cdapStopFlowStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapStopWorkerStep createCdapStopWorkerStep() {
+		CdapStopWorkerStepImpl cdapStopWorkerStep = new CdapStopWorkerStepImpl();
+		return cdapStopWorkerStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapStopServiceStep createCdapStopServiceStep() {
+		CdapStopServiceStepImpl cdapStopServiceStep = new CdapStopServiceStepImpl();
+		return cdapStopServiceStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapStopAppStep createCdapStopAppStep() {
+		CdapStopAppStepImpl cdapStopAppStep = new CdapStopAppStepImpl();
+		return cdapStopAppStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapStartFlowStep createCdapStartFlowStep() {
+		CdapStartFlowStepImpl cdapStartFlowStep = new CdapStartFlowStepImpl();
+		return cdapStartFlowStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapStartWorkerStep createCdapStartWorkerStep() {
+		CdapStartWorkerStepImpl cdapStartWorkerStep = new CdapStartWorkerStepImpl();
+		return cdapStartWorkerStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapStartServiceStep createCdapStartServiceStep() {
+		CdapStartServiceStepImpl cdapStartServiceStep = new CdapStartServiceStepImpl();
+		return cdapStartServiceStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapStartAppStep createCdapStartAppStep() {
+		CdapStartAppStepImpl cdapStartAppStep = new CdapStartAppStepImpl();
+		return cdapStartAppStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapDeleteAppStep createCdapDeleteAppStep() {
+		CdapDeleteAppStepImpl cdapDeleteAppStep = new CdapDeleteAppStepImpl();
+		return cdapDeleteAppStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapDeleteArtifact createCdapDeleteArtifact() {
+		CdapDeleteArtifactImpl cdapDeleteArtifact = new CdapDeleteArtifactImpl();
+		return cdapDeleteArtifact;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapSuspendScheduleStep createCdapSuspendScheduleStep() {
+		CdapSuspendScheduleStepImpl cdapSuspendScheduleStep = new CdapSuspendScheduleStepImpl();
+		return cdapSuspendScheduleStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapResumeScheduleStep createCdapResumeScheduleStep() {
+		CdapResumeScheduleStepImpl cdapResumeScheduleStep = new CdapResumeScheduleStepImpl();
+		return cdapResumeScheduleStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public CdapPackage getCdapPackage() {
 		return (CdapPackage)getEPackage();
 	}
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
index 03941cd..f39a849 100644
--- 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
@@ -49,6 +49,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapInternalApplicationConfigurationImpl#getConfig <em>Config</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapInternalApplicationConfigurationImpl#getPreferences <em>Preferences</em>}</li>
@@ -57,7 +58,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <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
  */
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapLoadArtifactStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapLoadArtifactStepImpl.java
new file mode 100644
index 0000000..c9c3ccc
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapLoadArtifactStepImpl.java
@@ -0,0 +1,263 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep;
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Load Artifact Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapLoadArtifactStepImpl#getArtifactName <em>Artifact Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapLoadArtifactStepImpl#getJarfile <em>Jarfile</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapLoadArtifactStepImpl#getVersion <em>Version</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapLoadArtifactStepImpl extends CdapStepImpl implements CdapLoadArtifactStep {
+	/**
+	 * 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 #getJarfile() <em>Jarfile</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getJarfile()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String JARFILE_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getJarfile() <em>Jarfile</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getJarfile()
+	 * @generated
+	 * @ordered
+	 */
+	protected String jarfile = JARFILE_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 CdapLoadArtifactStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_LOAD_ARTIFACT_STEP;
+	}
+
+	/**
+	 * <!-- 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_LOAD_ARTIFACT_STEP__ARTIFACT_NAME, oldArtifactName, artifactName));
+	}
+
+	/**
+	 * <!-- 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_LOAD_ARTIFACT_STEP__JARFILE, 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_LOAD_ARTIFACT_STEP__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_LOAD_ARTIFACT_STEP__ARTIFACT_NAME:
+				return getArtifactName();
+			case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__JARFILE:
+				return getJarfile();
+			case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__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_LOAD_ARTIFACT_STEP__ARTIFACT_NAME:
+				setArtifactName((String)newValue);
+				return;
+			case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__JARFILE:
+				setJarfile((String)newValue);
+				return;
+			case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__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_LOAD_ARTIFACT_STEP__ARTIFACT_NAME:
+				setArtifactName(ARTIFACT_NAME_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__JARFILE:
+				setJarfile(JARFILE_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__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_LOAD_ARTIFACT_STEP__ARTIFACT_NAME:
+				return ARTIFACT_NAME_EDEFAULT == null ? artifactName != null : !ARTIFACT_NAME_EDEFAULT.equals(artifactName);
+			case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__JARFILE:
+				return JARFILE_EDEFAULT == null ? jarfile != null : !JARFILE_EDEFAULT.equals(jarfile);
+			case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__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(" (artifactName: ");
+		result.append(artifactName);
+		result.append(", jarfile: ");
+		result.append(jarfile);
+		result.append(", version: ");
+		result.append(version);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapLoadArtifactStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapLoadArtifactWithConfigStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapLoadArtifactWithConfigStepImpl.java
new file mode 100644
index 0000000..7bf5cda
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapLoadArtifactWithConfigStepImpl.java
@@ -0,0 +1,162 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactWithConfigStep;
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Load Artifact With Config Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapLoadArtifactWithConfigStepImpl#getConfig <em>Config</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapLoadArtifactWithConfigStepImpl extends CdapLoadArtifactStepImpl implements CdapLoadArtifactWithConfigStep {
+	/**
+	 * The default value of the '{@link #getConfig() <em>Config</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getConfig()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String CONFIG_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getConfig() <em>Config</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getConfig()
+	 * @generated
+	 * @ordered
+	 */
+	protected String config = CONFIG_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapLoadArtifactWithConfigStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getConfig() {
+		return config;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setConfig(String newConfig) {
+		String oldConfig = config;
+		config = newConfig;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__CONFIG, oldConfig, config));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__CONFIG:
+				return getConfig();
+		}
+		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_LOAD_ARTIFACT_WITH_CONFIG_STEP__CONFIG:
+				setConfig((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_LOAD_ARTIFACT_WITH_CONFIG_STEP__CONFIG:
+				setConfig(CONFIG_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__CONFIG:
+				return CONFIG_EDEFAULT == null ? config != null : !CONFIG_EDEFAULT.equals(config);
+		}
+		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(" (config: ");
+		result.append(config);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapLoadArtifactWithConfigStepImpl
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
index e6e6f7c..1f60df4 100644
--- 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
@@ -26,13 +26,31 @@ 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.CdapCreateAppStep;
+import org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfigStep;
+import org.openecomp.dcae.controller.service.cdap.CdapDeleteAppStep;
+import org.openecomp.dcae.controller.service.cdap.CdapDeleteArtifact;
+import org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep;
 import org.openecomp.dcae.controller.service.cdap.CdapFactory;
 import org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration;
+import org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep;
+import org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactWithConfigStep;
 import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep;
 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.dcae.controller.service.cdap.CdapStartAppStep;
+import org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep;
+import org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep;
+import org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep;
+import org.openecomp.dcae.controller.service.cdap.CdapStep;
+import org.openecomp.dcae.controller.service.cdap.CdapStopAppStep;
+import org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep;
+import org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep;
+import org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep;
+import org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep;
 import org.openecomp.ncomp.core.CorePackage;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -99,6 +117,132 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 	private EClass cdapServiceDescriptorEClass = null;
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapLoadArtifactStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapLoadArtifactWithConfigStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapCreateAppStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapCreateAppWithConfigStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapDeployAppStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapStopFlowStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapStopWorkerStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapStopServiceStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapStopAppStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapStartFlowStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapStartWorkerStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapStartServiceStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapStartAppStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapDeleteAppStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapDeleteArtifactEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapSuspendScheduleStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapResumeScheduleStepEClass = 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.
@@ -213,7 +357,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 	 * @generated
 	 */
 	public EReference getCdapServiceInstance_CdapNamespace() {
-		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(13);
+		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(17);
 	}
 
 	/**
@@ -266,8 +410,44 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EReference getCdapServiceInstance_DeploySteps() {
+		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCdapServiceInstance_UndeploySteps() {
+		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCdapServiceInstance_PreConfigurationSteps() {
+		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(8);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCdapServiceInstance_PostConfigurationSteps() {
+		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(9);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EAttribute getCdapServiceInstance_AppNames() {
-		return (EAttribute)cdapServiceInstanceEClass.getEStructuralFeatures().get(6);
+		return (EAttribute)cdapServiceInstanceEClass.getEStructuralFeatures().get(10);
 	}
 
 	/**
@@ -276,7 +456,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 	 * @generated
 	 */
 	public EAttribute getCdapServiceInstance_WorkerNames() {
-		return (EAttribute)cdapServiceInstanceEClass.getEStructuralFeatures().get(7);
+		return (EAttribute)cdapServiceInstanceEClass.getEStructuralFeatures().get(11);
 	}
 
 	/**
@@ -285,7 +465,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 	 * @generated
 	 */
 	public EAttribute getCdapServiceInstance_FlowNames() {
-		return (EAttribute)cdapServiceInstanceEClass.getEStructuralFeatures().get(8);
+		return (EAttribute)cdapServiceInstanceEClass.getEStructuralFeatures().get(12);
 	}
 
 	/**
@@ -294,7 +474,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 	 * @generated
 	 */
 	public EAttribute getCdapServiceInstance_ServiceNames() {
-		return (EAttribute)cdapServiceInstanceEClass.getEStructuralFeatures().get(9);
+		return (EAttribute)cdapServiceInstanceEClass.getEStructuralFeatures().get(13);
 	}
 
 	/**
@@ -303,7 +483,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 	 * @generated
 	 */
 	public EReference getCdapServiceInstance_Configuration() {
-		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(10);
+		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(14);
 	}
 
 	/**
@@ -312,7 +492,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 	 * @generated
 	 */
 	public EReference getCdapServiceInstance_CdapConfiguration() {
-		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(11);
+		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(15);
 	}
 
 	/**
@@ -321,7 +501,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 	 * @generated
 	 */
 	public EReference getCdapServiceInstance_ClusterService() {
-		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(12);
+		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(16);
 	}
 
 	/**
@@ -330,7 +510,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 	 * @generated
 	 */
 	public EReference getCdapServiceInstance_Service() {
-		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(14);
+		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(18);
 	}
 
 	/**
@@ -527,6 +707,474 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EClass getCdapStep() {
+		return cdapStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapLoadArtifactStep() {
+		return cdapLoadArtifactStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapLoadArtifactStep_ArtifactName() {
+		return (EAttribute)cdapLoadArtifactStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapLoadArtifactStep_Jarfile() {
+		return (EAttribute)cdapLoadArtifactStepEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapLoadArtifactStep_Version() {
+		return (EAttribute)cdapLoadArtifactStepEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapLoadArtifactWithConfigStep() {
+		return cdapLoadArtifactWithConfigStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapLoadArtifactWithConfigStep_Config() {
+		return (EAttribute)cdapLoadArtifactWithConfigStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapCreateAppStep() {
+		return cdapCreateAppStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapCreateAppStep_AppId() {
+		return (EAttribute)cdapCreateAppStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapCreateAppStep_ArtifactName() {
+		return (EAttribute)cdapCreateAppStepEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapCreateAppStep_Version() {
+		return (EAttribute)cdapCreateAppStepEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapCreateAppStep_Scope() {
+		return (EAttribute)cdapCreateAppStepEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapCreateAppWithConfigStep() {
+		return cdapCreateAppWithConfigStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapCreateAppWithConfigStep_AppConfig() {
+		return (EAttribute)cdapCreateAppWithConfigStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapDeployAppStep() {
+		return cdapDeployAppStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapDeployAppStep_Jarfile() {
+		return (EAttribute)cdapDeployAppStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapStopFlowStep() {
+		return cdapStopFlowStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStopFlowStep_AppId() {
+		return (EAttribute)cdapStopFlowStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStopFlowStep_FlowId() {
+		return (EAttribute)cdapStopFlowStepEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapStopWorkerStep() {
+		return cdapStopWorkerStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStopWorkerStep_AppId() {
+		return (EAttribute)cdapStopWorkerStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStopWorkerStep_WorkerId() {
+		return (EAttribute)cdapStopWorkerStepEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapStopServiceStep() {
+		return cdapStopServiceStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStopServiceStep_AppId() {
+		return (EAttribute)cdapStopServiceStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStopServiceStep_ServiceId() {
+		return (EAttribute)cdapStopServiceStepEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapStopAppStep() {
+		return cdapStopAppStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStopAppStep_AppId() {
+		return (EAttribute)cdapStopAppStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapStartFlowStep() {
+		return cdapStartFlowStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStartFlowStep_AppId() {
+		return (EAttribute)cdapStartFlowStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStartFlowStep_FlowId() {
+		return (EAttribute)cdapStartFlowStepEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStartFlowStep_ExtraArgs() {
+		return (EAttribute)cdapStartFlowStepEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapStartWorkerStep() {
+		return cdapStartWorkerStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStartWorkerStep_AppId() {
+		return (EAttribute)cdapStartWorkerStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStartWorkerStep_WorkerId() {
+		return (EAttribute)cdapStartWorkerStepEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStartWorkerStep_ExtraArgs() {
+		return (EAttribute)cdapStartWorkerStepEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapStartServiceStep() {
+		return cdapStartServiceStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStartServiceStep_AppId() {
+		return (EAttribute)cdapStartServiceStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStartServiceStep_ServiceId() {
+		return (EAttribute)cdapStartServiceStepEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStartServiceStep_ExtraArgs() {
+		return (EAttribute)cdapStartServiceStepEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapStartAppStep() {
+		return cdapStartAppStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStartAppStep_AppId() {
+		return (EAttribute)cdapStartAppStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapDeleteAppStep() {
+		return cdapDeleteAppStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapDeleteAppStep_AppId() {
+		return (EAttribute)cdapDeleteAppStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapDeleteArtifact() {
+		return cdapDeleteArtifactEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapDeleteArtifact_ArtifactName() {
+		return (EAttribute)cdapDeleteArtifactEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapDeleteArtifact_Version() {
+		return (EAttribute)cdapDeleteArtifactEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapSuspendScheduleStep() {
+		return cdapSuspendScheduleStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapSuspendScheduleStep_AppId() {
+		return (EAttribute)cdapSuspendScheduleStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapSuspendScheduleStep_ScheduleId() {
+		return (EAttribute)cdapSuspendScheduleStepEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapResumeScheduleStep() {
+		return cdapResumeScheduleStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapResumeScheduleStep_AppId() {
+		return (EAttribute)cdapResumeScheduleStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapResumeScheduleStep_ScheduleId() {
+		return (EAttribute)cdapResumeScheduleStepEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public CdapFactory getCdapFactory() {
 		return (CdapFactory)getEFactoryInstance();
 	}
@@ -561,6 +1209,10 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 		createEAttribute(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__APP_CONFIG_FILE);
 		createEReference(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__ARTIFACTS);
 		createEReference(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__APPS);
+		createEReference(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__DEPLOY_STEPS);
+		createEReference(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__UNDEPLOY_STEPS);
+		createEReference(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__PRE_CONFIGURATION_STEPS);
+		createEReference(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__POST_CONFIGURATION_STEPS);
 		createEAttribute(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__APP_NAMES);
 		createEAttribute(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__WORKER_NAMES);
 		createEAttribute(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__FLOW_NAMES);
@@ -596,6 +1248,76 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 		createEAttribute(cdapServiceDescriptorEClass, CDAP_SERVICE_DESCRIPTOR__SERVICE_CLASS);
 		createEAttribute(cdapServiceDescriptorEClass, CDAP_SERVICE_DESCRIPTOR__SERVICE_INSTANCE_CLASS);
 		createEAttribute(cdapServiceDescriptorEClass, CDAP_SERVICE_DESCRIPTOR__JAR_FILE);
+
+		cdapStepEClass = createEClass(CDAP_STEP);
+
+		cdapLoadArtifactStepEClass = createEClass(CDAP_LOAD_ARTIFACT_STEP);
+		createEAttribute(cdapLoadArtifactStepEClass, CDAP_LOAD_ARTIFACT_STEP__ARTIFACT_NAME);
+		createEAttribute(cdapLoadArtifactStepEClass, CDAP_LOAD_ARTIFACT_STEP__JARFILE);
+		createEAttribute(cdapLoadArtifactStepEClass, CDAP_LOAD_ARTIFACT_STEP__VERSION);
+
+		cdapLoadArtifactWithConfigStepEClass = createEClass(CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP);
+		createEAttribute(cdapLoadArtifactWithConfigStepEClass, CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__CONFIG);
+
+		cdapCreateAppStepEClass = createEClass(CDAP_CREATE_APP_STEP);
+		createEAttribute(cdapCreateAppStepEClass, CDAP_CREATE_APP_STEP__APP_ID);
+		createEAttribute(cdapCreateAppStepEClass, CDAP_CREATE_APP_STEP__ARTIFACT_NAME);
+		createEAttribute(cdapCreateAppStepEClass, CDAP_CREATE_APP_STEP__VERSION);
+		createEAttribute(cdapCreateAppStepEClass, CDAP_CREATE_APP_STEP__SCOPE);
+
+		cdapCreateAppWithConfigStepEClass = createEClass(CDAP_CREATE_APP_WITH_CONFIG_STEP);
+		createEAttribute(cdapCreateAppWithConfigStepEClass, CDAP_CREATE_APP_WITH_CONFIG_STEP__APP_CONFIG);
+
+		cdapDeployAppStepEClass = createEClass(CDAP_DEPLOY_APP_STEP);
+		createEAttribute(cdapDeployAppStepEClass, CDAP_DEPLOY_APP_STEP__JARFILE);
+
+		cdapStopFlowStepEClass = createEClass(CDAP_STOP_FLOW_STEP);
+		createEAttribute(cdapStopFlowStepEClass, CDAP_STOP_FLOW_STEP__APP_ID);
+		createEAttribute(cdapStopFlowStepEClass, CDAP_STOP_FLOW_STEP__FLOW_ID);
+
+		cdapStopWorkerStepEClass = createEClass(CDAP_STOP_WORKER_STEP);
+		createEAttribute(cdapStopWorkerStepEClass, CDAP_STOP_WORKER_STEP__APP_ID);
+		createEAttribute(cdapStopWorkerStepEClass, CDAP_STOP_WORKER_STEP__WORKER_ID);
+
+		cdapStopServiceStepEClass = createEClass(CDAP_STOP_SERVICE_STEP);
+		createEAttribute(cdapStopServiceStepEClass, CDAP_STOP_SERVICE_STEP__APP_ID);
+		createEAttribute(cdapStopServiceStepEClass, CDAP_STOP_SERVICE_STEP__SERVICE_ID);
+
+		cdapStopAppStepEClass = createEClass(CDAP_STOP_APP_STEP);
+		createEAttribute(cdapStopAppStepEClass, CDAP_STOP_APP_STEP__APP_ID);
+
+		cdapStartFlowStepEClass = createEClass(CDAP_START_FLOW_STEP);
+		createEAttribute(cdapStartFlowStepEClass, CDAP_START_FLOW_STEP__APP_ID);
+		createEAttribute(cdapStartFlowStepEClass, CDAP_START_FLOW_STEP__FLOW_ID);
+		createEAttribute(cdapStartFlowStepEClass, CDAP_START_FLOW_STEP__EXTRA_ARGS);
+
+		cdapStartWorkerStepEClass = createEClass(CDAP_START_WORKER_STEP);
+		createEAttribute(cdapStartWorkerStepEClass, CDAP_START_WORKER_STEP__APP_ID);
+		createEAttribute(cdapStartWorkerStepEClass, CDAP_START_WORKER_STEP__WORKER_ID);
+		createEAttribute(cdapStartWorkerStepEClass, CDAP_START_WORKER_STEP__EXTRA_ARGS);
+
+		cdapStartServiceStepEClass = createEClass(CDAP_START_SERVICE_STEP);
+		createEAttribute(cdapStartServiceStepEClass, CDAP_START_SERVICE_STEP__APP_ID);
+		createEAttribute(cdapStartServiceStepEClass, CDAP_START_SERVICE_STEP__SERVICE_ID);
+		createEAttribute(cdapStartServiceStepEClass, CDAP_START_SERVICE_STEP__EXTRA_ARGS);
+
+		cdapStartAppStepEClass = createEClass(CDAP_START_APP_STEP);
+		createEAttribute(cdapStartAppStepEClass, CDAP_START_APP_STEP__APP_ID);
+
+		cdapDeleteAppStepEClass = createEClass(CDAP_DELETE_APP_STEP);
+		createEAttribute(cdapDeleteAppStepEClass, CDAP_DELETE_APP_STEP__APP_ID);
+
+		cdapDeleteArtifactEClass = createEClass(CDAP_DELETE_ARTIFACT);
+		createEAttribute(cdapDeleteArtifactEClass, CDAP_DELETE_ARTIFACT__ARTIFACT_NAME);
+		createEAttribute(cdapDeleteArtifactEClass, CDAP_DELETE_ARTIFACT__VERSION);
+
+		cdapSuspendScheduleStepEClass = createEClass(CDAP_SUSPEND_SCHEDULE_STEP);
+		createEAttribute(cdapSuspendScheduleStepEClass, CDAP_SUSPEND_SCHEDULE_STEP__APP_ID);
+		createEAttribute(cdapSuspendScheduleStepEClass, CDAP_SUSPEND_SCHEDULE_STEP__SCHEDULE_ID);
+
+		cdapResumeScheduleStepEClass = createEClass(CDAP_RESUME_SCHEDULE_STEP);
+		createEAttribute(cdapResumeScheduleStepEClass, CDAP_RESUME_SCHEDULE_STEP__APP_ID);
+		createEAttribute(cdapResumeScheduleStepEClass, CDAP_RESUME_SCHEDULE_STEP__SCHEDULE_ID);
 	}
 
 	/**
@@ -638,6 +1360,24 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 		cdapApplicationEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
 		cdapArtifactEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
 		cdapServiceDescriptorEClass.getESuperTypes().add(theServicePackage_1.getDcaeServiceDescriptor());
+		cdapStepEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
+		cdapLoadArtifactStepEClass.getESuperTypes().add(this.getCdapStep());
+		cdapLoadArtifactWithConfigStepEClass.getESuperTypes().add(this.getCdapLoadArtifactStep());
+		cdapCreateAppStepEClass.getESuperTypes().add(this.getCdapStep());
+		cdapCreateAppWithConfigStepEClass.getESuperTypes().add(this.getCdapCreateAppStep());
+		cdapDeployAppStepEClass.getESuperTypes().add(this.getCdapStep());
+		cdapStopFlowStepEClass.getESuperTypes().add(this.getCdapStep());
+		cdapStopWorkerStepEClass.getESuperTypes().add(this.getCdapStep());
+		cdapStopServiceStepEClass.getESuperTypes().add(this.getCdapStep());
+		cdapStopAppStepEClass.getESuperTypes().add(this.getCdapStep());
+		cdapStartFlowStepEClass.getESuperTypes().add(this.getCdapStep());
+		cdapStartWorkerStepEClass.getESuperTypes().add(this.getCdapStep());
+		cdapStartServiceStepEClass.getESuperTypes().add(this.getCdapStep());
+		cdapStartAppStepEClass.getESuperTypes().add(this.getCdapStep());
+		cdapDeleteAppStepEClass.getESuperTypes().add(this.getCdapStep());
+		cdapDeleteArtifactEClass.getESuperTypes().add(this.getCdapStep());
+		cdapSuspendScheduleStepEClass.getESuperTypes().add(this.getCdapStep());
+		cdapResumeScheduleStepEClass.getESuperTypes().add(this.getCdapStep());
 
 		// Initialize classes, features, and operations; add parameters
 		initEClass(cdapServiceEClass, CdapService.class, "CdapService", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -653,6 +1393,10 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 		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);
+		initEReference(getCdapServiceInstance_DeploySteps(), this.getCdapStep(), null, "deploySteps", 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_UndeploySteps(), this.getCdapStep(), null, "undeploySteps", 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_PreConfigurationSteps(), this.getCdapStep(), null, "preConfigurationSteps", 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_PostConfigurationSteps(), this.getCdapStep(), null, "postConfigurationSteps", 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);
@@ -689,6 +1433,76 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 		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);
 
+		initEClass(cdapStepEClass, CdapStep.class, "CdapStep", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(cdapLoadArtifactStepEClass, CdapLoadArtifactStep.class, "CdapLoadArtifactStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapLoadArtifactStep_ArtifactName(), theEcorePackage.getEString(), "artifactName", null, 0, 1, CdapLoadArtifactStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapLoadArtifactStep_Jarfile(), theEcorePackage.getEString(), "jarfile", null, 0, 1, CdapLoadArtifactStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapLoadArtifactStep_Version(), theEcorePackage.getEString(), "version", null, 0, 1, CdapLoadArtifactStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapLoadArtifactWithConfigStepEClass, CdapLoadArtifactWithConfigStep.class, "CdapLoadArtifactWithConfigStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapLoadArtifactWithConfigStep_Config(), theEcorePackage.getEString(), "config", null, 0, 1, CdapLoadArtifactWithConfigStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapCreateAppStepEClass, CdapCreateAppStep.class, "CdapCreateAppStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapCreateAppStep_AppId(), theEcorePackage.getEString(), "appId", null, 0, 1, CdapCreateAppStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapCreateAppStep_ArtifactName(), theEcorePackage.getEString(), "artifactName", null, 0, 1, CdapCreateAppStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapCreateAppStep_Version(), theEcorePackage.getEString(), "version", null, 0, 1, CdapCreateAppStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapCreateAppStep_Scope(), theEcorePackage.getEString(), "scope", null, 0, 1, CdapCreateAppStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapCreateAppWithConfigStepEClass, CdapCreateAppWithConfigStep.class, "CdapCreateAppWithConfigStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapCreateAppWithConfigStep_AppConfig(), theEcorePackage.getEString(), "appConfig", null, 0, 1, CdapCreateAppWithConfigStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapDeployAppStepEClass, CdapDeployAppStep.class, "CdapDeployAppStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapDeployAppStep_Jarfile(), theEcorePackage.getEString(), "jarfile", null, 0, 1, CdapDeployAppStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapStopFlowStepEClass, CdapStopFlowStep.class, "CdapStopFlowStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapStopFlowStep_AppId(), theEcorePackage.getEString(), "appId", null, 0, 1, CdapStopFlowStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapStopFlowStep_FlowId(), theEcorePackage.getEString(), "flowId", null, 0, 1, CdapStopFlowStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapStopWorkerStepEClass, CdapStopWorkerStep.class, "CdapStopWorkerStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapStopWorkerStep_AppId(), theEcorePackage.getEString(), "appId", null, 0, 1, CdapStopWorkerStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapStopWorkerStep_WorkerId(), theEcorePackage.getEString(), "workerId", null, 0, 1, CdapStopWorkerStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapStopServiceStepEClass, CdapStopServiceStep.class, "CdapStopServiceStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapStopServiceStep_AppId(), theEcorePackage.getEString(), "appId", null, 0, 1, CdapStopServiceStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapStopServiceStep_ServiceId(), theEcorePackage.getEString(), "serviceId", null, 0, 1, CdapStopServiceStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapStopAppStepEClass, CdapStopAppStep.class, "CdapStopAppStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapStopAppStep_AppId(), theEcorePackage.getEString(), "appId", null, 0, 1, CdapStopAppStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapStartFlowStepEClass, CdapStartFlowStep.class, "CdapStartFlowStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapStartFlowStep_AppId(), theEcorePackage.getEString(), "appId", null, 0, 1, CdapStartFlowStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapStartFlowStep_FlowId(), theEcorePackage.getEString(), "flowId", null, 0, 1, CdapStartFlowStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapStartFlowStep_ExtraArgs(), theEcorePackage.getEString(), "extraArgs", null, 0, 1, CdapStartFlowStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapStartWorkerStepEClass, CdapStartWorkerStep.class, "CdapStartWorkerStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapStartWorkerStep_AppId(), theEcorePackage.getEString(), "appId", null, 0, 1, CdapStartWorkerStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapStartWorkerStep_WorkerId(), theEcorePackage.getEString(), "workerId", null, 0, 1, CdapStartWorkerStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapStartWorkerStep_ExtraArgs(), theEcorePackage.getEString(), "extraArgs", null, 0, 1, CdapStartWorkerStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapStartServiceStepEClass, CdapStartServiceStep.class, "CdapStartServiceStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapStartServiceStep_AppId(), theEcorePackage.getEString(), "appId", null, 0, 1, CdapStartServiceStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapStartServiceStep_ServiceId(), theEcorePackage.getEString(), "serviceId", null, 0, 1, CdapStartServiceStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapStartServiceStep_ExtraArgs(), theEcorePackage.getEString(), "extraArgs", null, 0, 1, CdapStartServiceStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapStartAppStepEClass, CdapStartAppStep.class, "CdapStartAppStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapStartAppStep_AppId(), theEcorePackage.getEString(), "appId", null, 0, 1, CdapStartAppStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapDeleteAppStepEClass, CdapDeleteAppStep.class, "CdapDeleteAppStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapDeleteAppStep_AppId(), theEcorePackage.getEString(), "appId", null, 0, 1, CdapDeleteAppStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapDeleteArtifactEClass, CdapDeleteArtifact.class, "CdapDeleteArtifact", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapDeleteArtifact_ArtifactName(), theEcorePackage.getEString(), "artifactName", null, 0, 1, CdapDeleteArtifact.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapDeleteArtifact_Version(), theEcorePackage.getEString(), "version", null, 0, 1, CdapDeleteArtifact.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapSuspendScheduleStepEClass, CdapSuspendScheduleStep.class, "CdapSuspendScheduleStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapSuspendScheduleStep_AppId(), theEcorePackage.getEString(), "appId", null, 0, 1, CdapSuspendScheduleStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapSuspendScheduleStep_ScheduleId(), theEcorePackage.getEString(), "scheduleId", null, 0, 1, CdapSuspendScheduleStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapResumeScheduleStepEClass, CdapResumeScheduleStep.class, "CdapResumeScheduleStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapResumeScheduleStep_AppId(), theEcorePackage.getEString(), "appId", null, 0, 1, CdapResumeScheduleStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapResumeScheduleStep_ScheduleId(), theEcorePackage.getEString(), "scheduleId", null, 0, 1, CdapResumeScheduleStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
 		// Create resource
 		createResource(eNS_URI);
 
@@ -696,7 +1510,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 		// http://www.eclipse.org/emf/2011/Xcore
 		createXcoreAnnotations();
 		// http://openecomp.org
-		createEcompAnnotations();
+		createOpenecompAnnotations();
 	}
 
 	/**
@@ -722,7 +1536,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected void createEcompAnnotations() {
+	protected void createOpenecompAnnotations() {
 		String source = "http://openecomp.org";	
 		addAnnotation
 		  (getCdapServiceInstance_Configuration(), 
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapResumeScheduleStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapResumeScheduleStepImpl.java
new file mode 100644
index 0000000..b04fd25
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapResumeScheduleStepImpl.java
@@ -0,0 +1,216 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Resume Schedule Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapResumeScheduleStepImpl#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapResumeScheduleStepImpl#getScheduleId <em>Schedule Id</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapResumeScheduleStepImpl extends CdapStepImpl implements CdapResumeScheduleStep {
+	/**
+	 * The default value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appId = APP_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getScheduleId() <em>Schedule Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getScheduleId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SCHEDULE_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getScheduleId() <em>Schedule Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getScheduleId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String scheduleId = SCHEDULE_ID_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapResumeScheduleStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_RESUME_SCHEDULE_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppId() {
+		return appId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppId(String newAppId) {
+		String oldAppId = appId;
+		appId = newAppId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_RESUME_SCHEDULE_STEP__APP_ID, oldAppId, appId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getScheduleId() {
+		return scheduleId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setScheduleId(String newScheduleId) {
+		String oldScheduleId = scheduleId;
+		scheduleId = newScheduleId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_RESUME_SCHEDULE_STEP__SCHEDULE_ID, oldScheduleId, scheduleId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_RESUME_SCHEDULE_STEP__APP_ID:
+				return getAppId();
+			case CdapPackage.CDAP_RESUME_SCHEDULE_STEP__SCHEDULE_ID:
+				return getScheduleId();
+		}
+		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_RESUME_SCHEDULE_STEP__APP_ID:
+				setAppId((String)newValue);
+				return;
+			case CdapPackage.CDAP_RESUME_SCHEDULE_STEP__SCHEDULE_ID:
+				setScheduleId((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_RESUME_SCHEDULE_STEP__APP_ID:
+				setAppId(APP_ID_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_RESUME_SCHEDULE_STEP__SCHEDULE_ID:
+				setScheduleId(SCHEDULE_ID_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_RESUME_SCHEDULE_STEP__APP_ID:
+				return APP_ID_EDEFAULT == null ? appId != null : !APP_ID_EDEFAULT.equals(appId);
+			case CdapPackage.CDAP_RESUME_SCHEDULE_STEP__SCHEDULE_ID:
+				return SCHEDULE_ID_EDEFAULT == null ? scheduleId != null : !SCHEDULE_ID_EDEFAULT.equals(scheduleId);
+		}
+		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(" (appId: ");
+		result.append(appId);
+		result.append(", scheduleId: ");
+		result.append(scheduleId);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapResumeScheduleStepImpl
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
index 7855124..a2a7691 100644
--- 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
@@ -40,13 +40,13 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <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
  */
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
index a219229..55955b5 100644
--- 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
@@ -42,10 +42,10 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceImpl#getInstances <em>Instances</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
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
index b4fbc69..601a80a 100644
--- 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
@@ -34,8 +34,6 @@ 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
  */
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
index 07ebb3e..5786fd1 100644
--- 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
@@ -33,6 +33,7 @@ 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.CdapStep;
 import org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterServiceInstance;
 import org.openecomp.ncomp.cdap.CdapNamespace;
 
@@ -56,6 +57,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.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>
@@ -63,6 +65,10 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <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#getDeploySteps <em>Deploy Steps</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getUndeploySteps <em>Undeploy Steps</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getPreConfigurationSteps <em>Pre Configuration Steps</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getPostConfigurationSteps <em>Post Configuration Steps</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>
@@ -73,7 +79,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <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
  */
@@ -179,6 +184,46 @@ public class CdapServiceInstanceImpl extends DcaeServiceInstanceImpl implements
 	protected EList<CdapApplication> apps;
 
 	/**
+	 * The cached value of the '{@link #getDeploySteps() <em>Deploy Steps</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeploySteps()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<CdapStep> deploySteps;
+
+	/**
+	 * The cached value of the '{@link #getUndeploySteps() <em>Undeploy Steps</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUndeploySteps()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<CdapStep> undeploySteps;
+
+	/**
+	 * The cached value of the '{@link #getPreConfigurationSteps() <em>Pre Configuration Steps</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPreConfigurationSteps()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<CdapStep> preConfigurationSteps;
+
+	/**
+	 * The cached value of the '{@link #getPostConfigurationSteps() <em>Post Configuration Steps</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPostConfigurationSteps()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<CdapStep> postConfigurationSteps;
+
+	/**
 	 * The cached value of the '{@link #getAppNames() <em>App Names</em>}' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -428,6 +473,54 @@ public class CdapServiceInstanceImpl extends DcaeServiceInstanceImpl implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EList<CdapStep> getDeploySteps() {
+		if (deploySteps == null) {
+			deploySteps = new EObjectContainmentEList<CdapStep>(CdapStep.class, this, CdapPackage.CDAP_SERVICE_INSTANCE__DEPLOY_STEPS);
+		}
+		return deploySteps;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<CdapStep> getUndeploySteps() {
+		if (undeploySteps == null) {
+			undeploySteps = new EObjectContainmentEList<CdapStep>(CdapStep.class, this, CdapPackage.CDAP_SERVICE_INSTANCE__UNDEPLOY_STEPS);
+		}
+		return undeploySteps;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<CdapStep> getPreConfigurationSteps() {
+		if (preConfigurationSteps == null) {
+			preConfigurationSteps = new EObjectContainmentEList<CdapStep>(CdapStep.class, this, CdapPackage.CDAP_SERVICE_INSTANCE__PRE_CONFIGURATION_STEPS);
+		}
+		return preConfigurationSteps;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<CdapStep> getPostConfigurationSteps() {
+		if (postConfigurationSteps == null) {
+			postConfigurationSteps = new EObjectContainmentEList<CdapStep>(CdapStep.class, this, CdapPackage.CDAP_SERVICE_INSTANCE__POST_CONFIGURATION_STEPS);
+		}
+		return postConfigurationSteps;
+	}
+
+	/**
+	 * <!-- 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);
@@ -674,6 +767,14 @@ public class CdapServiceInstanceImpl extends DcaeServiceInstanceImpl implements
 				return ((InternalEList<?>)getArtifacts()).basicRemove(otherEnd, msgs);
 			case CdapPackage.CDAP_SERVICE_INSTANCE__APPS:
 				return ((InternalEList<?>)getApps()).basicRemove(otherEnd, msgs);
+			case CdapPackage.CDAP_SERVICE_INSTANCE__DEPLOY_STEPS:
+				return ((InternalEList<?>)getDeploySteps()).basicRemove(otherEnd, msgs);
+			case CdapPackage.CDAP_SERVICE_INSTANCE__UNDEPLOY_STEPS:
+				return ((InternalEList<?>)getUndeploySteps()).basicRemove(otherEnd, msgs);
+			case CdapPackage.CDAP_SERVICE_INSTANCE__PRE_CONFIGURATION_STEPS:
+				return ((InternalEList<?>)getPreConfigurationSteps()).basicRemove(otherEnd, msgs);
+			case CdapPackage.CDAP_SERVICE_INSTANCE__POST_CONFIGURATION_STEPS:
+				return ((InternalEList<?>)getPostConfigurationSteps()).basicRemove(otherEnd, msgs);
 			case CdapPackage.CDAP_SERVICE_INSTANCE__CONFIGURATION:
 				return basicSetConfiguration(null, msgs);
 			case CdapPackage.CDAP_SERVICE_INSTANCE__CDAP_CONFIGURATION:
@@ -718,6 +819,14 @@ public class CdapServiceInstanceImpl extends DcaeServiceInstanceImpl implements
 				return getArtifacts();
 			case CdapPackage.CDAP_SERVICE_INSTANCE__APPS:
 				return getApps();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__DEPLOY_STEPS:
+				return getDeploySteps();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__UNDEPLOY_STEPS:
+				return getUndeploySteps();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__PRE_CONFIGURATION_STEPS:
+				return getPreConfigurationSteps();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__POST_CONFIGURATION_STEPS:
+				return getPostConfigurationSteps();
 			case CdapPackage.CDAP_SERVICE_INSTANCE__APP_NAMES:
 				return getAppNames();
 			case CdapPackage.CDAP_SERVICE_INSTANCE__WORKER_NAMES:
@@ -772,6 +881,22 @@ public class CdapServiceInstanceImpl extends DcaeServiceInstanceImpl implements
 				getApps().clear();
 				getApps().addAll((Collection<? extends CdapApplication>)newValue);
 				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__DEPLOY_STEPS:
+				getDeploySteps().clear();
+				getDeploySteps().addAll((Collection<? extends CdapStep>)newValue);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__UNDEPLOY_STEPS:
+				getUndeploySteps().clear();
+				getUndeploySteps().addAll((Collection<? extends CdapStep>)newValue);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__PRE_CONFIGURATION_STEPS:
+				getPreConfigurationSteps().clear();
+				getPreConfigurationSteps().addAll((Collection<? extends CdapStep>)newValue);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__POST_CONFIGURATION_STEPS:
+				getPostConfigurationSteps().clear();
+				getPostConfigurationSteps().addAll((Collection<? extends CdapStep>)newValue);
+				return;
 			case CdapPackage.CDAP_SERVICE_INSTANCE__APP_NAMES:
 				getAppNames().clear();
 				getAppNames().addAll((Collection<? extends String>)newValue);
@@ -833,6 +958,18 @@ public class CdapServiceInstanceImpl extends DcaeServiceInstanceImpl implements
 			case CdapPackage.CDAP_SERVICE_INSTANCE__APPS:
 				getApps().clear();
 				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__DEPLOY_STEPS:
+				getDeploySteps().clear();
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__UNDEPLOY_STEPS:
+				getUndeploySteps().clear();
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__PRE_CONFIGURATION_STEPS:
+				getPreConfigurationSteps().clear();
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__POST_CONFIGURATION_STEPS:
+				getPostConfigurationSteps().clear();
+				return;
 			case CdapPackage.CDAP_SERVICE_INSTANCE__APP_NAMES:
 				getAppNames().clear();
 				return;
@@ -884,6 +1021,14 @@ public class CdapServiceInstanceImpl extends DcaeServiceInstanceImpl implements
 				return artifacts != null && !artifacts.isEmpty();
 			case CdapPackage.CDAP_SERVICE_INSTANCE__APPS:
 				return apps != null && !apps.isEmpty();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__DEPLOY_STEPS:
+				return deploySteps != null && !deploySteps.isEmpty();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__UNDEPLOY_STEPS:
+				return undeploySteps != null && !undeploySteps.isEmpty();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__PRE_CONFIGURATION_STEPS:
+				return preConfigurationSteps != null && !preConfigurationSteps.isEmpty();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__POST_CONFIGURATION_STEPS:
+				return postConfigurationSteps != null && !postConfigurationSteps.isEmpty();
 			case CdapPackage.CDAP_SERVICE_INSTANCE__APP_NAMES:
 				return appNames != null && !appNames.isEmpty();
 			case CdapPackage.CDAP_SERVICE_INSTANCE__WORKER_NAMES:
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStartAppStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStartAppStepImpl.java
new file mode 100644
index 0000000..3d40664
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStartAppStepImpl.java
@@ -0,0 +1,162 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapStartAppStep;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Start App Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartAppStepImpl#getAppId <em>App Id</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapStartAppStepImpl extends CdapStepImpl implements CdapStartAppStep {
+	/**
+	 * The default value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appId = APP_ID_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapStartAppStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_START_APP_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppId() {
+		return appId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppId(String newAppId) {
+		String oldAppId = appId;
+		appId = newAppId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_START_APP_STEP__APP_ID, oldAppId, appId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_START_APP_STEP__APP_ID:
+				return getAppId();
+		}
+		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_START_APP_STEP__APP_ID:
+				setAppId((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_START_APP_STEP__APP_ID:
+				setAppId(APP_ID_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_START_APP_STEP__APP_ID:
+				return APP_ID_EDEFAULT == null ? appId != null : !APP_ID_EDEFAULT.equals(appId);
+		}
+		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(" (appId: ");
+		result.append(appId);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapStartAppStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStartFlowStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStartFlowStepImpl.java
new file mode 100644
index 0000000..f3c5ebe
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStartFlowStepImpl.java
@@ -0,0 +1,270 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Start Flow Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartFlowStepImpl#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartFlowStepImpl#getFlowId <em>Flow Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartFlowStepImpl#getExtraArgs <em>Extra Args</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapStartFlowStepImpl extends CdapStepImpl implements CdapStartFlowStep {
+	/**
+	 * The default value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appId = APP_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFlowId() <em>Flow Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFlowId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String FLOW_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getFlowId() <em>Flow Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFlowId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String flowId = FLOW_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getExtraArgs() <em>Extra Args</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getExtraArgs()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String EXTRA_ARGS_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getExtraArgs() <em>Extra Args</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getExtraArgs()
+	 * @generated
+	 * @ordered
+	 */
+	protected String extraArgs = EXTRA_ARGS_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapStartFlowStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_START_FLOW_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppId() {
+		return appId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppId(String newAppId) {
+		String oldAppId = appId;
+		appId = newAppId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_START_FLOW_STEP__APP_ID, oldAppId, appId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getFlowId() {
+		return flowId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setFlowId(String newFlowId) {
+		String oldFlowId = flowId;
+		flowId = newFlowId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_START_FLOW_STEP__FLOW_ID, oldFlowId, flowId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getExtraArgs() {
+		return extraArgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setExtraArgs(String newExtraArgs) {
+		String oldExtraArgs = extraArgs;
+		extraArgs = newExtraArgs;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_START_FLOW_STEP__EXTRA_ARGS, oldExtraArgs, extraArgs));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_START_FLOW_STEP__APP_ID:
+				return getAppId();
+			case CdapPackage.CDAP_START_FLOW_STEP__FLOW_ID:
+				return getFlowId();
+			case CdapPackage.CDAP_START_FLOW_STEP__EXTRA_ARGS:
+				return getExtraArgs();
+		}
+		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_START_FLOW_STEP__APP_ID:
+				setAppId((String)newValue);
+				return;
+			case CdapPackage.CDAP_START_FLOW_STEP__FLOW_ID:
+				setFlowId((String)newValue);
+				return;
+			case CdapPackage.CDAP_START_FLOW_STEP__EXTRA_ARGS:
+				setExtraArgs((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_START_FLOW_STEP__APP_ID:
+				setAppId(APP_ID_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_START_FLOW_STEP__FLOW_ID:
+				setFlowId(FLOW_ID_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_START_FLOW_STEP__EXTRA_ARGS:
+				setExtraArgs(EXTRA_ARGS_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_START_FLOW_STEP__APP_ID:
+				return APP_ID_EDEFAULT == null ? appId != null : !APP_ID_EDEFAULT.equals(appId);
+			case CdapPackage.CDAP_START_FLOW_STEP__FLOW_ID:
+				return FLOW_ID_EDEFAULT == null ? flowId != null : !FLOW_ID_EDEFAULT.equals(flowId);
+			case CdapPackage.CDAP_START_FLOW_STEP__EXTRA_ARGS:
+				return EXTRA_ARGS_EDEFAULT == null ? extraArgs != null : !EXTRA_ARGS_EDEFAULT.equals(extraArgs);
+		}
+		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(" (appId: ");
+		result.append(appId);
+		result.append(", flowId: ");
+		result.append(flowId);
+		result.append(", extraArgs: ");
+		result.append(extraArgs);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapStartFlowStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStartServiceStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStartServiceStepImpl.java
new file mode 100644
index 0000000..03833b6
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStartServiceStepImpl.java
@@ -0,0 +1,270 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Start Service Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartServiceStepImpl#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartServiceStepImpl#getServiceId <em>Service Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartServiceStepImpl#getExtraArgs <em>Extra Args</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapStartServiceStepImpl extends CdapStepImpl implements CdapStartServiceStep {
+	/**
+	 * The default value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appId = APP_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getServiceId() <em>Service Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServiceId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SERVICE_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getServiceId() <em>Service Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServiceId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String serviceId = SERVICE_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getExtraArgs() <em>Extra Args</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getExtraArgs()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String EXTRA_ARGS_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getExtraArgs() <em>Extra Args</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getExtraArgs()
+	 * @generated
+	 * @ordered
+	 */
+	protected String extraArgs = EXTRA_ARGS_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapStartServiceStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_START_SERVICE_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppId() {
+		return appId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppId(String newAppId) {
+		String oldAppId = appId;
+		appId = newAppId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_START_SERVICE_STEP__APP_ID, oldAppId, appId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getServiceId() {
+		return serviceId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setServiceId(String newServiceId) {
+		String oldServiceId = serviceId;
+		serviceId = newServiceId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_START_SERVICE_STEP__SERVICE_ID, oldServiceId, serviceId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getExtraArgs() {
+		return extraArgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setExtraArgs(String newExtraArgs) {
+		String oldExtraArgs = extraArgs;
+		extraArgs = newExtraArgs;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_START_SERVICE_STEP__EXTRA_ARGS, oldExtraArgs, extraArgs));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_START_SERVICE_STEP__APP_ID:
+				return getAppId();
+			case CdapPackage.CDAP_START_SERVICE_STEP__SERVICE_ID:
+				return getServiceId();
+			case CdapPackage.CDAP_START_SERVICE_STEP__EXTRA_ARGS:
+				return getExtraArgs();
+		}
+		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_START_SERVICE_STEP__APP_ID:
+				setAppId((String)newValue);
+				return;
+			case CdapPackage.CDAP_START_SERVICE_STEP__SERVICE_ID:
+				setServiceId((String)newValue);
+				return;
+			case CdapPackage.CDAP_START_SERVICE_STEP__EXTRA_ARGS:
+				setExtraArgs((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_START_SERVICE_STEP__APP_ID:
+				setAppId(APP_ID_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_START_SERVICE_STEP__SERVICE_ID:
+				setServiceId(SERVICE_ID_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_START_SERVICE_STEP__EXTRA_ARGS:
+				setExtraArgs(EXTRA_ARGS_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_START_SERVICE_STEP__APP_ID:
+				return APP_ID_EDEFAULT == null ? appId != null : !APP_ID_EDEFAULT.equals(appId);
+			case CdapPackage.CDAP_START_SERVICE_STEP__SERVICE_ID:
+				return SERVICE_ID_EDEFAULT == null ? serviceId != null : !SERVICE_ID_EDEFAULT.equals(serviceId);
+			case CdapPackage.CDAP_START_SERVICE_STEP__EXTRA_ARGS:
+				return EXTRA_ARGS_EDEFAULT == null ? extraArgs != null : !EXTRA_ARGS_EDEFAULT.equals(extraArgs);
+		}
+		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(" (appId: ");
+		result.append(appId);
+		result.append(", serviceId: ");
+		result.append(serviceId);
+		result.append(", extraArgs: ");
+		result.append(extraArgs);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapStartServiceStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStartWorkerStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStartWorkerStepImpl.java
new file mode 100644
index 0000000..a9caa76
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStartWorkerStepImpl.java
@@ -0,0 +1,270 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Start Worker Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartWorkerStepImpl#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartWorkerStepImpl#getWorkerId <em>Worker Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartWorkerStepImpl#getExtraArgs <em>Extra Args</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapStartWorkerStepImpl extends CdapStepImpl implements CdapStartWorkerStep {
+	/**
+	 * The default value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appId = APP_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getWorkerId() <em>Worker Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getWorkerId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String WORKER_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getWorkerId() <em>Worker Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getWorkerId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String workerId = WORKER_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getExtraArgs() <em>Extra Args</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getExtraArgs()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String EXTRA_ARGS_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getExtraArgs() <em>Extra Args</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getExtraArgs()
+	 * @generated
+	 * @ordered
+	 */
+	protected String extraArgs = EXTRA_ARGS_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapStartWorkerStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_START_WORKER_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppId() {
+		return appId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppId(String newAppId) {
+		String oldAppId = appId;
+		appId = newAppId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_START_WORKER_STEP__APP_ID, oldAppId, appId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getWorkerId() {
+		return workerId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setWorkerId(String newWorkerId) {
+		String oldWorkerId = workerId;
+		workerId = newWorkerId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_START_WORKER_STEP__WORKER_ID, oldWorkerId, workerId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getExtraArgs() {
+		return extraArgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setExtraArgs(String newExtraArgs) {
+		String oldExtraArgs = extraArgs;
+		extraArgs = newExtraArgs;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_START_WORKER_STEP__EXTRA_ARGS, oldExtraArgs, extraArgs));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_START_WORKER_STEP__APP_ID:
+				return getAppId();
+			case CdapPackage.CDAP_START_WORKER_STEP__WORKER_ID:
+				return getWorkerId();
+			case CdapPackage.CDAP_START_WORKER_STEP__EXTRA_ARGS:
+				return getExtraArgs();
+		}
+		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_START_WORKER_STEP__APP_ID:
+				setAppId((String)newValue);
+				return;
+			case CdapPackage.CDAP_START_WORKER_STEP__WORKER_ID:
+				setWorkerId((String)newValue);
+				return;
+			case CdapPackage.CDAP_START_WORKER_STEP__EXTRA_ARGS:
+				setExtraArgs((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_START_WORKER_STEP__APP_ID:
+				setAppId(APP_ID_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_START_WORKER_STEP__WORKER_ID:
+				setWorkerId(WORKER_ID_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_START_WORKER_STEP__EXTRA_ARGS:
+				setExtraArgs(EXTRA_ARGS_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_START_WORKER_STEP__APP_ID:
+				return APP_ID_EDEFAULT == null ? appId != null : !APP_ID_EDEFAULT.equals(appId);
+			case CdapPackage.CDAP_START_WORKER_STEP__WORKER_ID:
+				return WORKER_ID_EDEFAULT == null ? workerId != null : !WORKER_ID_EDEFAULT.equals(workerId);
+			case CdapPackage.CDAP_START_WORKER_STEP__EXTRA_ARGS:
+				return EXTRA_ARGS_EDEFAULT == null ? extraArgs != null : !EXTRA_ARGS_EDEFAULT.equals(extraArgs);
+		}
+		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(" (appId: ");
+		result.append(appId);
+		result.append(", workerId: ");
+		result.append(workerId);
+		result.append(", extraArgs: ");
+		result.append(extraArgs);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapStartWorkerStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStepImpl.java
new file mode 100644
index 0000000..f6c9f80
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStepImpl.java
@@ -0,0 +1,39 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapStep;
+
+import org.openecomp.ncomp.core.impl.NamedEntityImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class CdapStepImpl extends NamedEntityImpl implements CdapStep {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_STEP;
+	}
+
+} //CdapStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopAppStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopAppStepImpl.java
new file mode 100644
index 0000000..90eb037
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopAppStepImpl.java
@@ -0,0 +1,162 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapStopAppStep;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Stop App Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopAppStepImpl#getAppId <em>App Id</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapStopAppStepImpl extends CdapStepImpl implements CdapStopAppStep {
+	/**
+	 * The default value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appId = APP_ID_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapStopAppStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_STOP_APP_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppId() {
+		return appId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppId(String newAppId) {
+		String oldAppId = appId;
+		appId = newAppId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_STOP_APP_STEP__APP_ID, oldAppId, appId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_STOP_APP_STEP__APP_ID:
+				return getAppId();
+		}
+		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_STOP_APP_STEP__APP_ID:
+				setAppId((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_STOP_APP_STEP__APP_ID:
+				setAppId(APP_ID_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_STOP_APP_STEP__APP_ID:
+				return APP_ID_EDEFAULT == null ? appId != null : !APP_ID_EDEFAULT.equals(appId);
+		}
+		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(" (appId: ");
+		result.append(appId);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapStopAppStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopFlowStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopFlowStepImpl.java
new file mode 100644
index 0000000..35e93eb
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopFlowStepImpl.java
@@ -0,0 +1,216 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Stop Flow Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopFlowStepImpl#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopFlowStepImpl#getFlowId <em>Flow Id</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapStopFlowStepImpl extends CdapStepImpl implements CdapStopFlowStep {
+	/**
+	 * The default value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appId = APP_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFlowId() <em>Flow Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFlowId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String FLOW_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getFlowId() <em>Flow Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFlowId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String flowId = FLOW_ID_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapStopFlowStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_STOP_FLOW_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppId() {
+		return appId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppId(String newAppId) {
+		String oldAppId = appId;
+		appId = newAppId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_STOP_FLOW_STEP__APP_ID, oldAppId, appId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getFlowId() {
+		return flowId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setFlowId(String newFlowId) {
+		String oldFlowId = flowId;
+		flowId = newFlowId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_STOP_FLOW_STEP__FLOW_ID, oldFlowId, flowId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_STOP_FLOW_STEP__APP_ID:
+				return getAppId();
+			case CdapPackage.CDAP_STOP_FLOW_STEP__FLOW_ID:
+				return getFlowId();
+		}
+		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_STOP_FLOW_STEP__APP_ID:
+				setAppId((String)newValue);
+				return;
+			case CdapPackage.CDAP_STOP_FLOW_STEP__FLOW_ID:
+				setFlowId((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_STOP_FLOW_STEP__APP_ID:
+				setAppId(APP_ID_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_STOP_FLOW_STEP__FLOW_ID:
+				setFlowId(FLOW_ID_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_STOP_FLOW_STEP__APP_ID:
+				return APP_ID_EDEFAULT == null ? appId != null : !APP_ID_EDEFAULT.equals(appId);
+			case CdapPackage.CDAP_STOP_FLOW_STEP__FLOW_ID:
+				return FLOW_ID_EDEFAULT == null ? flowId != null : !FLOW_ID_EDEFAULT.equals(flowId);
+		}
+		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(" (appId: ");
+		result.append(appId);
+		result.append(", flowId: ");
+		result.append(flowId);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapStopFlowStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopServiceStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopServiceStepImpl.java
new file mode 100644
index 0000000..7b0971b
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopServiceStepImpl.java
@@ -0,0 +1,216 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Stop Service Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopServiceStepImpl#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopServiceStepImpl#getServiceId <em>Service Id</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapStopServiceStepImpl extends CdapStepImpl implements CdapStopServiceStep {
+	/**
+	 * The default value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appId = APP_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getServiceId() <em>Service Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServiceId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SERVICE_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getServiceId() <em>Service Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServiceId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String serviceId = SERVICE_ID_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapStopServiceStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_STOP_SERVICE_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppId() {
+		return appId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppId(String newAppId) {
+		String oldAppId = appId;
+		appId = newAppId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_STOP_SERVICE_STEP__APP_ID, oldAppId, appId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getServiceId() {
+		return serviceId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setServiceId(String newServiceId) {
+		String oldServiceId = serviceId;
+		serviceId = newServiceId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_STOP_SERVICE_STEP__SERVICE_ID, oldServiceId, serviceId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_STOP_SERVICE_STEP__APP_ID:
+				return getAppId();
+			case CdapPackage.CDAP_STOP_SERVICE_STEP__SERVICE_ID:
+				return getServiceId();
+		}
+		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_STOP_SERVICE_STEP__APP_ID:
+				setAppId((String)newValue);
+				return;
+			case CdapPackage.CDAP_STOP_SERVICE_STEP__SERVICE_ID:
+				setServiceId((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_STOP_SERVICE_STEP__APP_ID:
+				setAppId(APP_ID_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_STOP_SERVICE_STEP__SERVICE_ID:
+				setServiceId(SERVICE_ID_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_STOP_SERVICE_STEP__APP_ID:
+				return APP_ID_EDEFAULT == null ? appId != null : !APP_ID_EDEFAULT.equals(appId);
+			case CdapPackage.CDAP_STOP_SERVICE_STEP__SERVICE_ID:
+				return SERVICE_ID_EDEFAULT == null ? serviceId != null : !SERVICE_ID_EDEFAULT.equals(serviceId);
+		}
+		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(" (appId: ");
+		result.append(appId);
+		result.append(", serviceId: ");
+		result.append(serviceId);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapStopServiceStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopWorkerStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopWorkerStepImpl.java
new file mode 100644
index 0000000..b5134d2
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopWorkerStepImpl.java
@@ -0,0 +1,216 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Stop Worker Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopWorkerStepImpl#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopWorkerStepImpl#getWorkerId <em>Worker Id</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapStopWorkerStepImpl extends CdapStepImpl implements CdapStopWorkerStep {
+	/**
+	 * The default value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appId = APP_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getWorkerId() <em>Worker Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getWorkerId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String WORKER_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getWorkerId() <em>Worker Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getWorkerId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String workerId = WORKER_ID_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapStopWorkerStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_STOP_WORKER_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppId() {
+		return appId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppId(String newAppId) {
+		String oldAppId = appId;
+		appId = newAppId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_STOP_WORKER_STEP__APP_ID, oldAppId, appId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getWorkerId() {
+		return workerId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setWorkerId(String newWorkerId) {
+		String oldWorkerId = workerId;
+		workerId = newWorkerId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_STOP_WORKER_STEP__WORKER_ID, oldWorkerId, workerId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_STOP_WORKER_STEP__APP_ID:
+				return getAppId();
+			case CdapPackage.CDAP_STOP_WORKER_STEP__WORKER_ID:
+				return getWorkerId();
+		}
+		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_STOP_WORKER_STEP__APP_ID:
+				setAppId((String)newValue);
+				return;
+			case CdapPackage.CDAP_STOP_WORKER_STEP__WORKER_ID:
+				setWorkerId((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_STOP_WORKER_STEP__APP_ID:
+				setAppId(APP_ID_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_STOP_WORKER_STEP__WORKER_ID:
+				setWorkerId(WORKER_ID_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_STOP_WORKER_STEP__APP_ID:
+				return APP_ID_EDEFAULT == null ? appId != null : !APP_ID_EDEFAULT.equals(appId);
+			case CdapPackage.CDAP_STOP_WORKER_STEP__WORKER_ID:
+				return WORKER_ID_EDEFAULT == null ? workerId != null : !WORKER_ID_EDEFAULT.equals(workerId);
+		}
+		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(" (appId: ");
+		result.append(appId);
+		result.append(", workerId: ");
+		result.append(workerId);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapStopWorkerStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapSuspendScheduleStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapSuspendScheduleStepImpl.java
new file mode 100644
index 0000000..02d817d
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapSuspendScheduleStepImpl.java
@@ -0,0 +1,216 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Suspend Schedule Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapSuspendScheduleStepImpl#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapSuspendScheduleStepImpl#getScheduleId <em>Schedule Id</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapSuspendScheduleStepImpl extends CdapStepImpl implements CdapSuspendScheduleStep {
+	/**
+	 * The default value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appId = APP_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getScheduleId() <em>Schedule Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getScheduleId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SCHEDULE_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getScheduleId() <em>Schedule Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getScheduleId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String scheduleId = SCHEDULE_ID_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapSuspendScheduleStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_SUSPEND_SCHEDULE_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppId() {
+		return appId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppId(String newAppId) {
+		String oldAppId = appId;
+		appId = newAppId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_SUSPEND_SCHEDULE_STEP__APP_ID, oldAppId, appId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getScheduleId() {
+		return scheduleId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setScheduleId(String newScheduleId) {
+		String oldScheduleId = scheduleId;
+		scheduleId = newScheduleId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_SUSPEND_SCHEDULE_STEP__SCHEDULE_ID, oldScheduleId, scheduleId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_SUSPEND_SCHEDULE_STEP__APP_ID:
+				return getAppId();
+			case CdapPackage.CDAP_SUSPEND_SCHEDULE_STEP__SCHEDULE_ID:
+				return getScheduleId();
+		}
+		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_SUSPEND_SCHEDULE_STEP__APP_ID:
+				setAppId((String)newValue);
+				return;
+			case CdapPackage.CDAP_SUSPEND_SCHEDULE_STEP__SCHEDULE_ID:
+				setScheduleId((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_SUSPEND_SCHEDULE_STEP__APP_ID:
+				setAppId(APP_ID_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_SUSPEND_SCHEDULE_STEP__SCHEDULE_ID:
+				setScheduleId(SCHEDULE_ID_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_SUSPEND_SCHEDULE_STEP__APP_ID:
+				return APP_ID_EDEFAULT == null ? appId != null : !APP_ID_EDEFAULT.equals(appId);
+			case CdapPackage.CDAP_SUSPEND_SCHEDULE_STEP__SCHEDULE_ID:
+				return SCHEDULE_ID_EDEFAULT == null ? scheduleId != null : !SCHEDULE_ID_EDEFAULT.equals(scheduleId);
+		}
+		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(" (appId: ");
+		result.append(appId);
+		result.append(", scheduleId: ");
+		result.append(scheduleId);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapSuspendScheduleStepImpl
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
index 6df62fb..175f828 100644
--- 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
@@ -121,6 +121,78 @@ public class CdapAdapterFactory extends AdapterFactoryImpl {
 				return createCdapServiceDescriptorAdapter();
 			}
 			@Override
+			public Adapter caseCdapStep(CdapStep object) {
+				return createCdapStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapLoadArtifactStep(CdapLoadArtifactStep object) {
+				return createCdapLoadArtifactStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapLoadArtifactWithConfigStep(CdapLoadArtifactWithConfigStep object) {
+				return createCdapLoadArtifactWithConfigStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapCreateAppStep(CdapCreateAppStep object) {
+				return createCdapCreateAppStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapCreateAppWithConfigStep(CdapCreateAppWithConfigStep object) {
+				return createCdapCreateAppWithConfigStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapDeployAppStep(CdapDeployAppStep object) {
+				return createCdapDeployAppStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapStopFlowStep(CdapStopFlowStep object) {
+				return createCdapStopFlowStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapStopWorkerStep(CdapStopWorkerStep object) {
+				return createCdapStopWorkerStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapStopServiceStep(CdapStopServiceStep object) {
+				return createCdapStopServiceStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapStopAppStep(CdapStopAppStep object) {
+				return createCdapStopAppStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapStartFlowStep(CdapStartFlowStep object) {
+				return createCdapStartFlowStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapStartWorkerStep(CdapStartWorkerStep object) {
+				return createCdapStartWorkerStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapStartServiceStep(CdapStartServiceStep object) {
+				return createCdapStartServiceStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapStartAppStep(CdapStartAppStep object) {
+				return createCdapStartAppStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapDeleteAppStep(CdapDeleteAppStep object) {
+				return createCdapDeleteAppStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapDeleteArtifact(CdapDeleteArtifact object) {
+				return createCdapDeleteArtifactAdapter();
+			}
+			@Override
+			public Adapter caseCdapSuspendScheduleStep(CdapSuspendScheduleStep object) {
+				return createCdapSuspendScheduleStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapResumeScheduleStep(CdapResumeScheduleStep object) {
+				return createCdapResumeScheduleStepAdapter();
+			}
+			@Override
 			public Adapter caseNamedEntity(NamedEntity object) {
 				return createNamedEntityAdapter();
 			}
@@ -255,6 +327,258 @@ public class CdapAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapStep <em>Step</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.CdapStep
+	 * @generated
+	 */
+	public Adapter createCdapStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep <em>Load Artifact Step</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.CdapLoadArtifactStep
+	 * @generated
+	 */
+	public Adapter createCdapLoadArtifactStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactWithConfigStep <em>Load Artifact With Config Step</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.CdapLoadArtifactWithConfigStep
+	 * @generated
+	 */
+	public Adapter createCdapLoadArtifactWithConfigStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep <em>Create App Step</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.CdapCreateAppStep
+	 * @generated
+	 */
+	public Adapter createCdapCreateAppStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfigStep <em>Create App With Config Step</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.CdapCreateAppWithConfigStep
+	 * @generated
+	 */
+	public Adapter createCdapCreateAppWithConfigStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep <em>Deploy App Step</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.CdapDeployAppStep
+	 * @generated
+	 */
+	public Adapter createCdapDeployAppStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep <em>Stop Flow Step</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.CdapStopFlowStep
+	 * @generated
+	 */
+	public Adapter createCdapStopFlowStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep <em>Stop Worker Step</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.CdapStopWorkerStep
+	 * @generated
+	 */
+	public Adapter createCdapStopWorkerStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep <em>Stop Service Step</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.CdapStopServiceStep
+	 * @generated
+	 */
+	public Adapter createCdapStopServiceStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapStopAppStep <em>Stop App Step</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.CdapStopAppStep
+	 * @generated
+	 */
+	public Adapter createCdapStopAppStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep <em>Start Flow Step</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.CdapStartFlowStep
+	 * @generated
+	 */
+	public Adapter createCdapStartFlowStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep <em>Start Worker Step</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.CdapStartWorkerStep
+	 * @generated
+	 */
+	public Adapter createCdapStartWorkerStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep <em>Start Service Step</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.CdapStartServiceStep
+	 * @generated
+	 */
+	public Adapter createCdapStartServiceStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapStartAppStep <em>Start App Step</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.CdapStartAppStep
+	 * @generated
+	 */
+	public Adapter createCdapStartAppStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapDeleteAppStep <em>Delete App Step</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.CdapDeleteAppStep
+	 * @generated
+	 */
+	public Adapter createCdapDeleteAppStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapDeleteArtifact <em>Delete 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.CdapDeleteArtifact
+	 * @generated
+	 */
+	public Adapter createCdapDeleteArtifactAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep <em>Suspend Schedule Step</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.CdapSuspendScheduleStep
+	 * @generated
+	 */
+	public Adapter createCdapSuspendScheduleStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep <em>Resume Schedule Step</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.CdapResumeScheduleStep
+	 * @generated
+	 */
+	public Adapter createCdapResumeScheduleStepAdapter() {
+		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;
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
index ae39c7b..f61edd0 100644
--- 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
@@ -72,7 +72,7 @@ public class CdapSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
@@ -141,6 +141,151 @@ public class CdapSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case CdapPackage.CDAP_STEP: {
+				CdapStep cdapStep = (CdapStep)theEObject;
+				T result = caseCdapStep(cdapStep);
+				if (result == null) result = caseNamedEntity(cdapStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_LOAD_ARTIFACT_STEP: {
+				CdapLoadArtifactStep cdapLoadArtifactStep = (CdapLoadArtifactStep)theEObject;
+				T result = caseCdapLoadArtifactStep(cdapLoadArtifactStep);
+				if (result == null) result = caseCdapStep(cdapLoadArtifactStep);
+				if (result == null) result = caseNamedEntity(cdapLoadArtifactStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP: {
+				CdapLoadArtifactWithConfigStep cdapLoadArtifactWithConfigStep = (CdapLoadArtifactWithConfigStep)theEObject;
+				T result = caseCdapLoadArtifactWithConfigStep(cdapLoadArtifactWithConfigStep);
+				if (result == null) result = caseCdapLoadArtifactStep(cdapLoadArtifactWithConfigStep);
+				if (result == null) result = caseCdapStep(cdapLoadArtifactWithConfigStep);
+				if (result == null) result = caseNamedEntity(cdapLoadArtifactWithConfigStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_CREATE_APP_STEP: {
+				CdapCreateAppStep cdapCreateAppStep = (CdapCreateAppStep)theEObject;
+				T result = caseCdapCreateAppStep(cdapCreateAppStep);
+				if (result == null) result = caseCdapStep(cdapCreateAppStep);
+				if (result == null) result = caseNamedEntity(cdapCreateAppStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_CREATE_APP_WITH_CONFIG_STEP: {
+				CdapCreateAppWithConfigStep cdapCreateAppWithConfigStep = (CdapCreateAppWithConfigStep)theEObject;
+				T result = caseCdapCreateAppWithConfigStep(cdapCreateAppWithConfigStep);
+				if (result == null) result = caseCdapCreateAppStep(cdapCreateAppWithConfigStep);
+				if (result == null) result = caseCdapStep(cdapCreateAppWithConfigStep);
+				if (result == null) result = caseNamedEntity(cdapCreateAppWithConfigStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_DEPLOY_APP_STEP: {
+				CdapDeployAppStep cdapDeployAppStep = (CdapDeployAppStep)theEObject;
+				T result = caseCdapDeployAppStep(cdapDeployAppStep);
+				if (result == null) result = caseCdapStep(cdapDeployAppStep);
+				if (result == null) result = caseNamedEntity(cdapDeployAppStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_STOP_FLOW_STEP: {
+				CdapStopFlowStep cdapStopFlowStep = (CdapStopFlowStep)theEObject;
+				T result = caseCdapStopFlowStep(cdapStopFlowStep);
+				if (result == null) result = caseCdapStep(cdapStopFlowStep);
+				if (result == null) result = caseNamedEntity(cdapStopFlowStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_STOP_WORKER_STEP: {
+				CdapStopWorkerStep cdapStopWorkerStep = (CdapStopWorkerStep)theEObject;
+				T result = caseCdapStopWorkerStep(cdapStopWorkerStep);
+				if (result == null) result = caseCdapStep(cdapStopWorkerStep);
+				if (result == null) result = caseNamedEntity(cdapStopWorkerStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_STOP_SERVICE_STEP: {
+				CdapStopServiceStep cdapStopServiceStep = (CdapStopServiceStep)theEObject;
+				T result = caseCdapStopServiceStep(cdapStopServiceStep);
+				if (result == null) result = caseCdapStep(cdapStopServiceStep);
+				if (result == null) result = caseNamedEntity(cdapStopServiceStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_STOP_APP_STEP: {
+				CdapStopAppStep cdapStopAppStep = (CdapStopAppStep)theEObject;
+				T result = caseCdapStopAppStep(cdapStopAppStep);
+				if (result == null) result = caseCdapStep(cdapStopAppStep);
+				if (result == null) result = caseNamedEntity(cdapStopAppStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_START_FLOW_STEP: {
+				CdapStartFlowStep cdapStartFlowStep = (CdapStartFlowStep)theEObject;
+				T result = caseCdapStartFlowStep(cdapStartFlowStep);
+				if (result == null) result = caseCdapStep(cdapStartFlowStep);
+				if (result == null) result = caseNamedEntity(cdapStartFlowStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_START_WORKER_STEP: {
+				CdapStartWorkerStep cdapStartWorkerStep = (CdapStartWorkerStep)theEObject;
+				T result = caseCdapStartWorkerStep(cdapStartWorkerStep);
+				if (result == null) result = caseCdapStep(cdapStartWorkerStep);
+				if (result == null) result = caseNamedEntity(cdapStartWorkerStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_START_SERVICE_STEP: {
+				CdapStartServiceStep cdapStartServiceStep = (CdapStartServiceStep)theEObject;
+				T result = caseCdapStartServiceStep(cdapStartServiceStep);
+				if (result == null) result = caseCdapStep(cdapStartServiceStep);
+				if (result == null) result = caseNamedEntity(cdapStartServiceStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_START_APP_STEP: {
+				CdapStartAppStep cdapStartAppStep = (CdapStartAppStep)theEObject;
+				T result = caseCdapStartAppStep(cdapStartAppStep);
+				if (result == null) result = caseCdapStep(cdapStartAppStep);
+				if (result == null) result = caseNamedEntity(cdapStartAppStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_DELETE_APP_STEP: {
+				CdapDeleteAppStep cdapDeleteAppStep = (CdapDeleteAppStep)theEObject;
+				T result = caseCdapDeleteAppStep(cdapDeleteAppStep);
+				if (result == null) result = caseCdapStep(cdapDeleteAppStep);
+				if (result == null) result = caseNamedEntity(cdapDeleteAppStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_DELETE_ARTIFACT: {
+				CdapDeleteArtifact cdapDeleteArtifact = (CdapDeleteArtifact)theEObject;
+				T result = caseCdapDeleteArtifact(cdapDeleteArtifact);
+				if (result == null) result = caseCdapStep(cdapDeleteArtifact);
+				if (result == null) result = caseNamedEntity(cdapDeleteArtifact);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_SUSPEND_SCHEDULE_STEP: {
+				CdapSuspendScheduleStep cdapSuspendScheduleStep = (CdapSuspendScheduleStep)theEObject;
+				T result = caseCdapSuspendScheduleStep(cdapSuspendScheduleStep);
+				if (result == null) result = caseCdapStep(cdapSuspendScheduleStep);
+				if (result == null) result = caseNamedEntity(cdapSuspendScheduleStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_RESUME_SCHEDULE_STEP: {
+				CdapResumeScheduleStep cdapResumeScheduleStep = (CdapResumeScheduleStep)theEObject;
+				T result = caseCdapResumeScheduleStep(cdapResumeScheduleStep);
+				if (result == null) result = caseCdapStep(cdapResumeScheduleStep);
+				if (result == null) result = caseNamedEntity(cdapResumeScheduleStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			default: return defaultCase(theEObject);
 		}
 	}
@@ -251,6 +396,276 @@ public class CdapSwitch<T> extends Switch<T> {
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Step</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>Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapStep(CdapStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Load Artifact Step</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>Load Artifact Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapLoadArtifactStep(CdapLoadArtifactStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Load Artifact With Config Step</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>Load Artifact With Config Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapLoadArtifactWithConfigStep(CdapLoadArtifactWithConfigStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Create App Step</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>Create App Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapCreateAppStep(CdapCreateAppStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Create App With Config Step</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>Create App With Config Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapCreateAppWithConfigStep(CdapCreateAppWithConfigStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Deploy App Step</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>Deploy App Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapDeployAppStep(CdapDeployAppStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Stop Flow Step</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>Stop Flow Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapStopFlowStep(CdapStopFlowStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Stop Worker Step</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>Stop Worker Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapStopWorkerStep(CdapStopWorkerStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Stop Service Step</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>Stop Service Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapStopServiceStep(CdapStopServiceStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Stop App Step</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>Stop App Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapStopAppStep(CdapStopAppStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Start Flow Step</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>Start Flow Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapStartFlowStep(CdapStartFlowStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Start Worker Step</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>Start Worker Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapStartWorkerStep(CdapStartWorkerStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Start Service Step</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>Start Service Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapStartServiceStep(CdapStartServiceStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Start App Step</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>Start App Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapStartAppStep(CdapStartAppStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Delete App Step</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>Delete App Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapDeleteAppStep(CdapDeleteAppStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Delete 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>Delete Artifact</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapDeleteArtifact(CdapDeleteArtifact object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Suspend Schedule Step</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>Suspend Schedule Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapSuspendScheduleStep(CdapSuspendScheduleStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Resume Schedule Step</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>Resume Schedule Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapResumeScheduleStep(CdapResumeScheduleStep 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;
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
index f20e1fa..e75da7d 100644
--- 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
@@ -34,10 +34,10 @@ import org.openecomp.ncomp.cdap.CdapConfiguration;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <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
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
index edc40a8..48147bf 100644
--- 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
@@ -41,6 +41,24 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *  *        http://www.apache.org/licenses/LICENSE-2.0
+ *  * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * <!-- end-model-doc -->
  * @see org.openecomp.dcae.controller.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'"
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
index 2a0e857..2147326 100644
--- 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
@@ -32,7 +32,6 @@ 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;
 
@@ -44,10 +43,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.cdapmanager.impl.CdapManagerImpl#getConfiguration <em>Configuration</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
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
index a423091..95ef83e 100644
--- 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
@@ -70,7 +70,7 @@ public class CdapmanagerSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */