Adding new LCM features to the client lib

Provide support for a new set of LCM actions to support an In-Place
Software Upgrade flow which can be triggered by SO.

Issues included: APPC-346, APPC-349

Issue-ID: APPC-346
Change-Id: I65c10035978aecb543b1102dd9c2dbd8374921bc
Signed-off-by: Skip Wonnell <skip@att.com>

103 files changed, 3365 insertions, 767 deletions

diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/api/LifeCycleManagerStateful.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/api/LifeCycleManagerStateful.java
index 5600f137f..0efbcc3a3 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/api/LifeCycleManagerStateful.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/api/LifeCycleManagerStateful.java
@@ -27,6 +27,10 @@
  */
 package org.onap.appc.client.lcm.api;
 
+import org.onap.appc.client.lcm.model.ActionStatusOutput;
+import org.onap.appc.client.lcm.model.ActionStatusInput;
+import org.onap.appc.client.lcm.model.AttachVolumeOutput;
+import org.onap.appc.client.lcm.model.AttachVolumeInput;
 import org.onap.appc.client.lcm.model.AuditOutput;
 import org.onap.appc.client.lcm.model.AuditInput;
 import org.onap.appc.client.lcm.model.CheckLockOutput;
@@ -45,6 +49,8 @@ import org.onap.appc.client.lcm.model.ConfigScaleoutOutput;
 import org.onap.appc.client.lcm.model.ConfigScaleoutInput;
 import org.onap.appc.client.lcm.model.ConfigureOutput;
 import org.onap.appc.client.lcm.model.ConfigureInput;
+import org.onap.appc.client.lcm.model.DetachVolumeOutput;
+import org.onap.appc.client.lcm.model.DetachVolumeInput;
 import org.onap.appc.client.lcm.model.EvacuateOutput;
 import org.onap.appc.client.lcm.model.EvacuateInput;
 import org.onap.appc.client.lcm.model.HealthCheckOutput;
@@ -55,10 +61,18 @@ import org.onap.appc.client.lcm.model.LockOutput;
 import org.onap.appc.client.lcm.model.LockInput;
 import org.onap.appc.client.lcm.model.MigrateOutput;
 import org.onap.appc.client.lcm.model.MigrateInput;
+import org.onap.appc.client.lcm.model.QueryOutput;
+import org.onap.appc.client.lcm.model.QueryInput;
+import org.onap.appc.client.lcm.model.QuiesceTrafficOutput;
+import org.onap.appc.client.lcm.model.QuiesceTrafficInput;
+import org.onap.appc.client.lcm.model.RebootOutput;
+import org.onap.appc.client.lcm.model.RebootInput;
 import org.onap.appc.client.lcm.model.RebuildOutput;
 import org.onap.appc.client.lcm.model.RebuildInput;
 import org.onap.appc.client.lcm.model.RestartOutput;
 import org.onap.appc.client.lcm.model.RestartInput;
+import org.onap.appc.client.lcm.model.ResumeTrafficOutput;
+import org.onap.appc.client.lcm.model.ResumeTrafficInput;
 import org.onap.appc.client.lcm.model.RollbackOutput;
 import org.onap.appc.client.lcm.model.RollbackInput;
 import org.onap.appc.client.lcm.model.SnapshotOutput;
@@ -67,8 +81,12 @@ import org.onap.appc.client.lcm.model.SoftwareUploadOutput;
 import org.onap.appc.client.lcm.model.SoftwareUploadInput;
 import org.onap.appc.client.lcm.model.StartOutput;
 import org.onap.appc.client.lcm.model.StartInput;
+import org.onap.appc.client.lcm.model.StartApplicationOutput;
+import org.onap.appc.client.lcm.model.StartApplicationInput;
 import org.onap.appc.client.lcm.model.StopOutput;
 import org.onap.appc.client.lcm.model.StopInput;
+import org.onap.appc.client.lcm.model.StopApplicationOutput;
+import org.onap.appc.client.lcm.model.StopApplicationInput;
 import org.onap.appc.client.lcm.model.SyncOutput;
 import org.onap.appc.client.lcm.model.SyncInput;
 import org.onap.appc.client.lcm.model.TerminateOutput;
@@ -77,825 +95,689 @@ import org.onap.appc.client.lcm.model.TestOutput;
 import org.onap.appc.client.lcm.model.TestInput;
 import org.onap.appc.client.lcm.model.UnlockOutput;
 import org.onap.appc.client.lcm.model.UnlockInput;
-import org.onap.appc.RPC;
+import org.onap.appc.client.lcm.model.UpgradeBackoutOutput;
+import org.onap.appc.client.lcm.model.UpgradeBackoutInput;
+import org.onap.appc.client.lcm.model.UpgradeBackupOutput;
+import org.onap.appc.client.lcm.model.UpgradeBackupInput;
+import org.onap.appc.client.lcm.model.UpgradePostCheckOutput;
+import org.onap.appc.client.lcm.model.UpgradePostCheckInput;
+import org.onap.appc.client.lcm.model.UpgradePreCheckOutput;
+import org.onap.appc.client.lcm.model.UpgradePreCheckInput;
+import org.onap.appc.client.lcm.model.UpgradeSoftwareOutput;
+import org.onap.appc.client.lcm.model.UpgradeSoftwareInput;
 import org.onap.appc.client.lcm.exceptions.AppcClientException;
+import org.onap.appc.RPC;
 
 /**
- * Defines the services and request/response requirements for the ECOMP APP-C
- * component.
- */
-@javax.annotation.Generated(value = {
-        "templates/client-kit/open-api-to-java.ftl" }, date = "2017-05-04T20:09:01.723+05:30", comments = "Auto-generated from Open API specification")
+* Defines the services and request/response requirements for the ECOMP APP-C component.
+*/
+@javax.annotation.Generated(
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-27T12:27:49.205-06:00",
+    comments = "Auto-generated from Open API specification")
 public interface LifeCycleManagerStateful {
 
     /**
-     * The Audit command compares the configuration of the VNF associated with the
-     * current request against the configuration that is stored in APPC's
-     * configuration store. A successful Audit means that the current VNF
-     * configuration matches the APPC stored configuration. A failed Audit indicates
-     * that the request configuration is different from the stored configuration.
-     * This command can be applied to any VNF type. The only restriction is that a
-     * particular VNF should be able to support the interface for Reading
-     * Configuration using existing adapters and use the following protocols: CLI,
-     * RestConf and XML. The Audit action does not require any payload parameters
+     * An operation to get the current state of the previously submitted LCM request
+     *
+     * @param actionStatusInput - RPC input object
+     */
+    @RPC(name="action-status", outputType=ActionStatusOutput.class)
+    ActionStatusOutput actionStatus(ActionStatusInput actionStatusInput) throws AppcClientException;
+
+    /**
+     * An operation to get the current state of the previously submitted LCM request
+     *
+     * @param actionStatusInput - RPC input object
+     * @return listener - callback implementation
+     */
+    @RPC(name="action-status", outputType=ActionStatusOutput.class)
+    void actionStatus(ActionStatusInput actionStatusInput, ResponseHandler<ActionStatusOutput> listener) throws AppcClientException;
+
+    /**
+     * An operation to attach a cinder volume to a VM
+     *
+     * @param attachVolumeInput - RPC input object
+     */
+    @RPC(name="attach-volume", outputType=AttachVolumeOutput.class)
+    AttachVolumeOutput attachVolume(AttachVolumeInput attachVolumeInput) throws AppcClientException;
+
+    /**
+     * An operation to attach a cinder volume to a VM
+     *
+     * @param attachVolumeInput - RPC input object
+     * @return listener - callback implementation
+     */
+    @RPC(name="attach-volume", outputType=AttachVolumeOutput.class)
+    void attachVolume(AttachVolumeInput attachVolumeInput, ResponseHandler<AttachVolumeOutput> listener) throws AppcClientException;
+
+    /**
+     * An operation to audit the configurations of a virtual network function (or VM)
      *
-     * @param auditInput
-     *            - RPC input object
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param auditInput - RPC input object
      */
-    @RPC(name = "audit", outputType = AuditOutput.class)
+    @RPC(name="audit", outputType=AuditOutput.class)
     AuditOutput audit(AuditInput auditInput) throws AppcClientException;
 
     /**
-     * The Audit command compares the configuration of the VNF associated with the
-     * current request against the configuration that is stored in APPC's
-     * configuration store. A successful Audit means that the current VNF
-     * configuration matches the APPC stored configuration. A failed Audit indicates
-     * that the request configuration is different from the stored configuration.
-     * This command can be applied to any VNF type. The only restriction is that a
-     * particular VNF should be able to support the interface for Reading
-     * Configuration using existing adapters and use the following protocols: CLI,
-     * RestConf and XML. The Audit action does not require any payload parameters
-     *
-     * @param auditInput
-     *            - RPC input object
-     * @param listener
-     *            - callback implementation
-     * @throws AppcClientException
-     *             - throw AppcClientException
-     */
-    @RPC(name = "audit", outputType = AuditOutput.class)
+     * An operation to audit the configurations of a virtual network function (or VM)
+     *
+     * @param auditInput - RPC input object
+     * @return listener - callback implementation
+     */
+    @RPC(name="audit", outputType=AuditOutput.class)
     void audit(AuditInput auditInput, ResponseHandler<AuditOutput> listener) throws AppcClientException;
 
     /**
-     * The CheckLock command returns true if the specified VNF is locked, false if
-     * not. A CheckLock command is deemed successful if the processing completes
-     * without error, whether the VNF is locked or not. The command returns only a
-     * single response with a final status. The APPC also locks the target VNF
-     * during any command processing, so a VNF can have a locked status even if no
-     * Lock command has been explicitly called. The CheckLock command returns a
-     * specific response structure that extends the default LCM response. The
-     * CheckLock action does not require any payload parameters
+     * An operation to check VNF lock status
      *
-     * @param checkLockInput
-     *            - RPC input object
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param checkLockInput - RPC input object
      */
-    @RPC(name = "check-lock", outputType = CheckLockOutput.class)
+    @RPC(name="check-lock", outputType=CheckLockOutput.class)
     CheckLockOutput checkLock(CheckLockInput checkLockInput) throws AppcClientException;
 
     /**
-     * The CheckLock command returns true if the specified VNF is locked, false if
-     * not. A CheckLock command is deemed successful if the processing completes
-     * without error, whether the VNF is locked or not. The command returns only a
-     * single response with a final status. The APPC also locks the target VNF
-     * during any command processing, so a VNF can have a locked status even if no
-     * Lock command has been explicitly called. The CheckLock command returns a
-     * specific response structure that extends the default LCM response. The
-     * CheckLock action does not require any payload parameters
+     * An operation to check VNF lock status
      *
-     * @param checkLockInput
-     *            - RPC input object
-     * @param listener
-     *            - callback implementation
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param checkLockInput - RPC input object
+     * @return listener - callback implementation
      */
-    @RPC(name = "check-lock", outputType = CheckLockOutput.class)
+    @RPC(name="check-lock", outputType=CheckLockOutput.class)
     void checkLock(CheckLockInput checkLockInput, ResponseHandler<CheckLockOutput> listener) throws AppcClientException;
 
     /**
      * An operation to Backup configurations of a virtual network function (or VM)
      *
-     * @param configBackupInput
-     *            - RPC input object
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param configBackupInput - RPC input object
      */
-    @RPC(name = "config-backup", outputType = ConfigBackupOutput.class)
+    @RPC(name="config-backup", outputType=ConfigBackupOutput.class)
     ConfigBackupOutput configBackup(ConfigBackupInput configBackupInput) throws AppcClientException;
 
     /**
      * An operation to Backup configurations of a virtual network function (or VM)
      *
-     * @param configBackupInput
-     *            - RPC input object
-     * @param listener
-     *            - callback implementation
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param configBackupInput - RPC input object
+     * @return listener - callback implementation
      */
-    @RPC(name = "config-backup", outputType = ConfigBackupOutput.class)
-    void configBackup(ConfigBackupInput configBackupInput, ResponseHandler<ConfigBackupOutput> listener)
-            throws AppcClientException;
+    @RPC(name="config-backup", outputType=ConfigBackupOutput.class)
+    void configBackup(ConfigBackupInput configBackupInput, ResponseHandler<ConfigBackupOutput> listener) throws AppcClientException;
 
     /**
-     * An operation to Delete backup configurations of a virtual network function
-     * (or VM)
+     * An operation to Delete backup configurations of a virtual network function (or VM)
      *
-     * @param configBackupDeleteInput
-     *            - RPC input object
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param configBackupDeleteInput - RPC input object
      */
-    @RPC(name = "config-backup-delete", outputType = ConfigBackupDeleteOutput.class)
-    ConfigBackupDeleteOutput configBackupDelete(ConfigBackupDeleteInput configBackupDeleteInput)
-            throws AppcClientException;
+    @RPC(name="config-backup-delete", outputType=ConfigBackupDeleteOutput.class)
+    ConfigBackupDeleteOutput configBackupDelete(ConfigBackupDeleteInput configBackupDeleteInput) throws AppcClientException;
 
     /**
-     * An operation to Delete backup configurations of a virtual network function
-     * (or VM)
+     * An operation to Delete backup configurations of a virtual network function (or VM)
      *
-     * @param configBackupDeleteInput
-     *            - RPC input object
-     * @param listener
-     *            - callback implementation
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param configBackupDeleteInput - RPC input object
+     * @return listener - callback implementation
      */
-    @RPC(name = "config-backup-delete", outputType = ConfigBackupDeleteOutput.class)
-    void configBackupDelete(ConfigBackupDeleteInput configBackupDeleteInput,
-            ResponseHandler<ConfigBackupDeleteOutput> listener) throws AppcClientException;
+    @RPC(name="config-backup-delete", outputType=ConfigBackupDeleteOutput.class)
+    void configBackupDelete(ConfigBackupDeleteInput configBackupDeleteInput, ResponseHandler<ConfigBackupDeleteOutput> listener) throws AppcClientException;
 
     /**
      * An operation to Export configurations of a virtual network function (or VM)
      *
-     * @param configExportInput
-     *            - RPC input object
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param configExportInput - RPC input object
      */
-    @RPC(name = "config-export", outputType = ConfigExportOutput.class)
+    @RPC(name="config-export", outputType=ConfigExportOutput.class)
     ConfigExportOutput configExport(ConfigExportInput configExportInput) throws AppcClientException;
 
     /**
      * An operation to Export configurations of a virtual network function (or VM)
      *
-     * @param configExportInput
-     *            - RPC input object
-     * @param listener
-     *            - callback implementation
-     * @throws AppcClientException
-     *             - throw AppcClientException
-     */
-    @RPC(name = "config-export", outputType = ConfigExportOutput.class)
-    void configExport(ConfigExportInput configExportInput, ResponseHandler<ConfigExportOutput> listener)
-            throws AppcClientException;
-
-    /**
-     * Use the ModifyConfig command when a full configuration cycle is either not
-     * required or is considered too costly. The ModifyConfig LCM action affects
-     * only a subset of the total configuration data of a VNF. The set of
-     * configuration parameters to be affected is a subset of the total
-     * configuration data of the target VNF type. The payload block must contain the
-     * configuration parameters to be modified and their values. A successful modify
-     * returns a success response. A failed modify returns a failure response and
-     * the specific failure messages in the response payload block
-     *
-     * @param configModifyInput
-     *            - RPC input object
-     * @throws AppcClientException
-     *             - throw AppcClientException
-     */
-    @RPC(name = "config-modify", outputType = ConfigModifyOutput.class)
+     * @param configExportInput - RPC input object
+     * @return listener - callback implementation
+     */
+    @RPC(name="config-export", outputType=ConfigExportOutput.class)
+    void configExport(ConfigExportInput configExportInput, ResponseHandler<ConfigExportOutput> listener) throws AppcClientException;
+
+    /**
+     * Use the ModifyConfig command when a full configuration cycle is either not required or is considered too costly. The ModifyConfig LCM action affects only a subset of the total configuration data of a VNF. The set of configuration parameters to be affected is a subset of the total configuration data of the target VNF type. The payload Stop Application must contain the configuration parameters to be modified and their values. A successful modify returns a success response. A failed modify returns a failure response and the specific failure messages in the response payload Stop Application
+     *
+     * @param configModifyInput - RPC input object
+     */
+    @RPC(name="config-modify", outputType=ConfigModifyOutput.class)
     ConfigModifyOutput configModify(ConfigModifyInput configModifyInput) throws AppcClientException;
 
     /**
-     * Use the ModifyConfig command when a full configuration cycle is either not
-     * required or is considered too costly. The ModifyConfig LCM action affects
-     * only a subset of the total configuration data of a VNF. The set of
-     * configuration parameters to be affected is a subset of the total
-     * configuration data of the target VNF type. The payload block must contain the
-     * configuration parameters to be modified and their values. A successful modify
-     * returns a success response. A failed modify returns a failure response and
-     * the specific failure messages in the response payload block
+     * Use the ModifyConfig command when a full configuration cycle is either not required or is considered too costly. The ModifyConfig LCM action affects only a subset of the total configuration data of a VNF. The set of configuration parameters to be affected is a subset of the total configuration data of the target VNF type. The payload Stop Application must contain the configuration parameters to be modified and their values. A successful modify returns a success response. A failed modify returns a failure response and the specific failure messages in the response payload Stop Application
      *
-     * @param configModifyInput
-     *            - RPC input object
-     * @param listener
-     *            - callback implementation
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param configModifyInput - RPC input object
+     * @return listener - callback implementation
      */
-    @RPC(name = "config-modify", outputType = ConfigModifyOutput.class)
-    void configModify(ConfigModifyInput configModifyInput, ResponseHandler<ConfigModifyOutput> listener)
-            throws AppcClientException;
+    @RPC(name="config-modify", outputType=ConfigModifyOutput.class)
+    void configModify(ConfigModifyInput configModifyInput, ResponseHandler<ConfigModifyOutput> listener) throws AppcClientException;
 
     /**
-     * An operation to restore the configurations of a virtual network function (or
-     * VM)
+     * An operation to restore the configurations of a virtual network function (or VM)
      *
-     * @param configRestoreInput
-     *            - RPC input object
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param configRestoreInput - RPC input object
      */
-    @RPC(name = "config-restore", outputType = ConfigRestoreOutput.class)
+    @RPC(name="config-restore", outputType=ConfigRestoreOutput.class)
     ConfigRestoreOutput configRestore(ConfigRestoreInput configRestoreInput) throws AppcClientException;
 
     /**
-     * An operation to restore the configurations of a virtual network function (or
-     * VM)
+     * An operation to restore the configurations of a virtual network function (or VM)
      *
-     * @param configRestoreInput
-     *            - RPC input object
-     * @param listener
-     *            - callback implementation
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param configRestoreInput - RPC input object
+     * @return listener - callback implementation
      */
-    @RPC(name = "config-restore", outputType = ConfigRestoreOutput.class)
-    void configRestore(ConfigRestoreInput configRestoreInput, ResponseHandler<ConfigRestoreOutput> listener)
-            throws AppcClientException;
+    @RPC(name="config-restore", outputType=ConfigRestoreOutput.class)
+    void configRestore(ConfigRestoreInput configRestoreInput, ResponseHandler<ConfigRestoreOutput> listener) throws AppcClientException;
 
     /**
-     * An operation to scaleout the configurations of a virtual network function (or
-     * VM)
+     * An operation to scaleout the configurations of a virtual network function (or VM)
      *
-     * @param configScaleoutInput
-     *            - RPC input object
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param configScaleoutInput - RPC input object
      */
-    @RPC(name = "config-scaleout", outputType = ConfigScaleoutOutput.class)
+    @RPC(name="config-scaleout", outputType=ConfigScaleoutOutput.class)
     ConfigScaleoutOutput configScaleout(ConfigScaleoutInput configScaleoutInput) throws AppcClientException;
 
     /**
-     * An operation to scaleout the configurations of a virtual network function (or
-     * VM)
+     * An operation to scaleout the configurations of a virtual network function (or VM)
      *
-     * @param configScaleoutInput
-     *            - RPC input object
-     * @param listener
-     *            - callback implementation
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param configScaleoutInput - RPC input object
+     * @return listener - callback implementation
      */
-    @RPC(name = "config-scaleout", outputType = ConfigScaleoutOutput.class)
-    void configScaleout(ConfigScaleoutInput configScaleoutInput, ResponseHandler<ConfigScaleoutOutput> listener)
-            throws AppcClientException;
+    @RPC(name="config-scaleout", outputType=ConfigScaleoutOutput.class)
+    void configScaleout(ConfigScaleoutInput configScaleoutInput, ResponseHandler<ConfigScaleoutOutput> listener) throws AppcClientException;
 
     /**
-     * An operation to configure the configurations of a virtual network function
-     * (or VM)
+     * An operation to configure the configurations of a virtual network function (or VM)
      *
-     * @param configureInput
-     *            - RPC input object
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param configureInput - RPC input object
      */
-    @RPC(name = "configure", outputType = ConfigureOutput.class)
+    @RPC(name="configure", outputType=ConfigureOutput.class)
     ConfigureOutput configure(ConfigureInput configureInput) throws AppcClientException;
 
     /**
-     * An operation to configure the configurations of a virtual network function
-     * (or VM)
+     * An operation to configure the configurations of a virtual network function (or VM)
      *
-     * @param configureInput
-     *            - RPC input object
-     * @param listener
-     *            - callback implementation
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param configureInput - RPC input object
+     * @return listener - callback implementation
      */
-    @RPC(name = "configure", outputType = ConfigureOutput.class)
+    @RPC(name="configure", outputType=ConfigureOutput.class)
     void configure(ConfigureInput configureInput, ResponseHandler<ConfigureOutput> listener) throws AppcClientException;
 
     /**
+     * An operation to detach a cinder volume from a VM
+     *
+     * @param detachVolumeInput - RPC input object
+     */
+    @RPC(name="detach-volume", outputType=DetachVolumeOutput.class)
+    DetachVolumeOutput detachVolume(DetachVolumeInput detachVolumeInput) throws AppcClientException;
+
+    /**
+     * An operation to detach a cinder volume from a VM
+     *
+     * @param detachVolumeInput - RPC input object
+     * @return listener - callback implementation
+     */
+    @RPC(name="detach-volume", outputType=DetachVolumeOutput.class)
+    void detachVolume(DetachVolumeInput detachVolumeInput, ResponseHandler<DetachVolumeOutput> listener) throws AppcClientException;
+
+    /**
      * An operation to evacuate a virtual network function (or VM)
      *
-     * @param evacuateInput
-     *            - RPC input object
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param evacuateInput - RPC input object
      */
-    @RPC(name = "evacuate", outputType = EvacuateOutput.class)
+    @RPC(name="evacuate", outputType=EvacuateOutput.class)
     EvacuateOutput evacuate(EvacuateInput evacuateInput) throws AppcClientException;
 
     /**
      * An operation to evacuate a virtual network function (or VM)
      *
-     * @param evacuateInput
-     *            - RPC input object
-     * @param listener
-     *            - callback implementation
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param evacuateInput - RPC input object
+     * @return listener - callback implementation
      */
-    @RPC(name = "evacuate", outputType = EvacuateOutput.class)
+    @RPC(name="evacuate", outputType=EvacuateOutput.class)
     void evacuate(EvacuateInput evacuateInput, ResponseHandler<EvacuateOutput> listener) throws AppcClientException;
 
     /**
-     * This command runs a VNF health check and returns the result. A health check
-     * is VNF-specific. For a complex VNF, APPC initiates further subordinate health
-     * checks
+     * An operation to perform health check of vSCP prior its upgrading
      *
-     * @param healthCheckInput
-     *            - RPC input object
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param healthCheckInput - RPC input object
      */
-    @RPC(name = "health-check", outputType = HealthCheckOutput.class)
+    @RPC(name="health-check", outputType=HealthCheckOutput.class)
     HealthCheckOutput healthCheck(HealthCheckInput healthCheckInput) throws AppcClientException;
 
     /**
-     * This command runs a VNF health check and returns the result. A health check
-     * is VNF-specific. For a complex VNF, APPC initiates further subordinate health
-     * checks
+     * An operation to perform health check of vSCP prior its upgrading
      *
-     * @param healthCheckInput
-     *            - RPC input object
-     * @param listener
-     *            - callback implementation
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param healthCheckInput - RPC input object
+     * @return listener - callback implementation
      */
-    @RPC(name = "health-check", outputType = HealthCheckOutput.class)
-    void healthCheck(HealthCheckInput healthCheckInput, ResponseHandler<HealthCheckOutput> listener)
-            throws AppcClientException;
+    @RPC(name="health-check", outputType=HealthCheckOutput.class)
+    void healthCheck(HealthCheckInput healthCheckInput, ResponseHandler<HealthCheckOutput> listener) throws AppcClientException;
 
     /**
-     * The LiveUpgrade LCM action upgrades the target VNF to a new version without
-     * interrupting VNF operation. A successful upgrade returns a success status. A
-     * failed upgrade returns a failure code and the failure messages in the
-     * response payload block. The payload includes the IP of the location that
-     * hosts the new software version installer file and the new software version.
-     * Connections or operations that are active at the time of the LiveUpgrade
-     * action request will not be interrupted by the action and, therefore, the
-     * action may take a significant amount of time to run. A LiveUpgrade is defined
-     * as non-disruptive; it is the responsibility of the VNF to handle disruptions
-     * if they occur
+     * An operation to perform upgrade of vSCP
      *
-     * @param liveUpgradeInput
-     *            - RPC input object
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param liveUpgradeInput - RPC input object
      */
-    @RPC(name = "live-upgrade", outputType = LiveUpgradeOutput.class)
+    @RPC(name="live-upgrade", outputType=LiveUpgradeOutput.class)
     LiveUpgradeOutput liveUpgrade(LiveUpgradeInput liveUpgradeInput) throws AppcClientException;
 
     /**
-     * The LiveUpgrade LCM action upgrades the target VNF to a new version without
-     * interrupting VNF operation. A successful upgrade returns a success status. A
-     * failed upgrade returns a failure code and the failure messages in the
-     * response payload block. The payload includes the IP of the location that
-     * hosts the new software version installer file and the new software version.
-     * Connections or operations that are active at the time of the LiveUpgrade
-     * action request will not be interrupted by the action and, therefore, the
-     * action may take a significant amount of time to run. A LiveUpgrade is defined
-     * as non-disruptive; it is the responsibility of the VNF to handle disruptions
-     * if they occur
-     *
-     * @param liveUpgradeInput
-     *            - RPC input object
-     * @param listener
-     *            - callback implementation
-     * @throws AppcClientException
-     *             - throw AppcClientException
-     */
-    @RPC(name = "live-upgrade", outputType = LiveUpgradeOutput.class)
-    void liveUpgrade(LiveUpgradeInput liveUpgradeInput, ResponseHandler<LiveUpgradeOutput> listener)
-            throws AppcClientException;
-
-    /**
-     * Use the Lock command to ensure exclusive access during a series of critical
-     * LCM commands. The Lock action will return a successful result if the VNF is
-     * not already locked or if it was locked with the same request-id, otherwise
-     * the action returns a response with a reject status code. When a VNF is
-     * locked, any subsequent sequential commands with same request-id will be
-     * accepted. Commands associated with other request-ids will be rejected. The
-     * Lock command returns only one final response with the status of the request
-     * processing. The APPC also locks the target VNF during any command processing.
-     * If a lock action is then requested on that VNF, it will be rejected because
-     * the VNF was already locked, even though no actual lock command was explicitly
-     * invoked
-     *
-     * @param lockInput
-     *            - RPC input object
-     * @throws AppcClientException
-     *             - throw AppcClientException
-     */
-    @RPC(name = "lock", outputType = LockOutput.class)
+     * An operation to perform upgrade of vSCP
+     *
+     * @param liveUpgradeInput - RPC input object
+     * @return listener - callback implementation
+     */
+    @RPC(name="live-upgrade", outputType=LiveUpgradeOutput.class)
+    void liveUpgrade(LiveUpgradeInput liveUpgradeInput, ResponseHandler<LiveUpgradeOutput> listener) throws AppcClientException;
+
+    /**
+     * An operation to perform VNF lock operation
+     *
+     * @param lockInput - RPC input object
+     */
+    @RPC(name="lock", outputType=LockOutput.class)
     LockOutput lock(LockInput lockInput) throws AppcClientException;
 
     /**
-     * Use the Lock command to ensure exclusive access during a series of critical
-     * LCM commands. The Lock action will return a successful result if the VNF is
-     * not already locked or if it was locked with the same request-id, otherwise
-     * the action returns a response with a reject status code. When a VNF is
-     * locked, any subsequent sequential commands with same request-id will be
-     * accepted. Commands associated with other request-ids will be rejected. The
-     * Lock command returns only one final response with the status of the request
-     * processing. The APPC also locks the target VNF during any command processing.
-     * If a lock action is then requested on that VNF, it will be rejected because
-     * the VNF was already locked, even though no actual lock command was explicitly
-     * invoked
-     *
-     * @param lockInput
-     *            - RPC input object
-     * @param listener
-     *            - callback implementation
-     * @throws AppcClientException
-     *             - throw AppcClientException
-     */
-    @RPC(name = "lock", outputType = LockOutput.class)
+     * An operation to perform VNF lock operation
+     *
+     * @param lockInput - RPC input object
+     * @return listener - callback implementation
+     */
+    @RPC(name="lock", outputType=LockOutput.class)
     void lock(LockInput lockInput, ResponseHandler<LockOutput> listener) throws AppcClientException;
 
     /**
-     * Migrates a running target VFC from its current AIC host to another. A
-     * destination AIC node will be selected by relying on AIC internal rules to
-     * migrate. A successful Migrate action returns a success response and the new
-     * AIC node identity in the response payload block. A failed Migrate action
-     * returns a failure and the failure messages in the response payload block
+     * An operation to migrate a virtual network function (or VM)
      *
-     * @param migrateInput
-     *            - RPC input object
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param migrateInput - RPC input object
      */
-    @RPC(name = "migrate", outputType = MigrateOutput.class)
+    @RPC(name="migrate", outputType=MigrateOutput.class)
     MigrateOutput migrate(MigrateInput migrateInput) throws AppcClientException;
 
     /**
-     * Migrates a running target VFC from its current AIC host to another. A
-     * destination AIC node will be selected by relying on AIC internal rules to
-     * migrate. A successful Migrate action returns a success response and the new
-     * AIC node identity in the response payload block. A failed Migrate action
-     * returns a failure and the failure messages in the response payload block
+     * An operation to migrate a virtual network function (or VM)
      *
-     * @param migrateInput
-     *            - RPC input object
-     * @param listener
-     *            - callback implementation
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param migrateInput - RPC input object
+     * @return listener - callback implementation
      */
-    @RPC(name = "migrate", outputType = MigrateOutput.class)
+    @RPC(name="migrate", outputType=MigrateOutput.class)
     void migrate(MigrateInput migrateInput, ResponseHandler<MigrateOutput> listener) throws AppcClientException;
 
     /**
-     * Recreates a target VFC instance to a known, stable state. A successful
-     * rebuild returns a success response and the rebuild details in the response
-     * payload block. A failed rebuild returns a failure and the failure messages in
-     * the response payload block
+     * An operation to query the status of a targe VNF. Returns information on each VM, including state (active or standby) and status (healthy or unhealthy)
      *
-     * @param rebuildInput
-     *            - RPC input object
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param queryInput - RPC input object
      */
-    @RPC(name = "rebuild", outputType = RebuildOutput.class)
+    @RPC(name="query", outputType=QueryOutput.class)
+    QueryOutput query(QueryInput queryInput) throws AppcClientException;
+
+    /**
+     * An operation to query the status of a targe VNF. Returns information on each VM, including state (active or standby) and status (healthy or unhealthy)
+     *
+     * @param queryInput - RPC input object
+     * @return listener - callback implementation
+     */
+    @RPC(name="query", outputType=QueryOutput.class)
+    void query(QueryInput queryInput, ResponseHandler<QueryOutput> listener) throws AppcClientException;
+
+    /**
+     * An operation to stop traffic gracefully on the VF. It stops traffic gracefully without stopping the application
+     *
+     * @param quiesceTrafficInput - RPC input object
+     */
+    @RPC(name="quiesce-traffic", outputType=QuiesceTrafficOutput.class)
+    QuiesceTrafficOutput quiesceTraffic(QuiesceTrafficInput quiesceTrafficInput) throws AppcClientException;
+
+    /**
+     * An operation to stop traffic gracefully on the VF. It stops traffic gracefully without stopping the application
+     *
+     * @param quiesceTrafficInput - RPC input object
+     * @return listener - callback implementation
+     */
+    @RPC(name="quiesce-traffic", outputType=QuiesceTrafficOutput.class)
+    void quiesceTraffic(QuiesceTrafficInput quiesceTrafficInput, ResponseHandler<QuiesceTrafficOutput> listener) throws AppcClientException;
+
+    /**
+     * An operation to reboot a specified virtual machine (VM)
+     *
+     * @param rebootInput - RPC input object
+     */
+    @RPC(name="reboot", outputType=RebootOutput.class)
+    RebootOutput reboot(RebootInput rebootInput) throws AppcClientException;
+
+    /**
+     * An operation to reboot a specified virtual machine (VM)
+     *
+     * @param rebootInput - RPC input object
+     * @return listener - callback implementation
+     */
+    @RPC(name="reboot", outputType=RebootOutput.class)
+    void reboot(RebootInput rebootInput, ResponseHandler<RebootOutput> listener) throws AppcClientException;
+
+    /**
+     * An operation to rebuild a virtual network function (or VM)
+     *
+     * @param rebuildInput - RPC input object
+     */
+    @RPC(name="rebuild", outputType=RebuildOutput.class)
     RebuildOutput rebuild(RebuildInput rebuildInput) throws AppcClientException;
 
     /**
-     * Recreates a target VFC instance to a known, stable state. A successful
-     * rebuild returns a success response and the rebuild details in the response
-     * payload block. A failed rebuild returns a failure and the failure messages in
-     * the response payload block
+     * An operation to rebuild a virtual network function (or VM)
      *
-     * @param rebuildInput
-     *            - RPC input object
-     * @param listener
-     *            - callback implementation
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param rebuildInput - RPC input object
+     * @return listener - callback implementation
      */
-    @RPC(name = "rebuild", outputType = RebuildOutput.class)
+    @RPC(name="rebuild", outputType=RebuildOutput.class)
     void rebuild(RebuildInput rebuildInput, ResponseHandler<RebuildOutput> listener) throws AppcClientException;
 
     /**
      * An operation to restart a virtual network function (or VM)
      *
-     * @param restartInput
-     *            - RPC input object
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param restartInput - RPC input object
      */
-    @RPC(name = "restart", outputType = RestartOutput.class)
+    @RPC(name="restart", outputType=RestartOutput.class)
     RestartOutput restart(RestartInput restartInput) throws AppcClientException;
 
     /**
      * An operation to restart a virtual network function (or VM)
      *
-     * @param restartInput
-     *            - RPC input object
-     * @param listener
-     *            - callback implementation
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param restartInput - RPC input object
+     * @return listener - callback implementation
      */
-    @RPC(name = "restart", outputType = RestartOutput.class)
+    @RPC(name="restart", outputType=RestartOutput.class)
     void restart(RestartInput restartInput, ResponseHandler<RestartOutput> listener) throws AppcClientException;
 
     /**
-     * Sets a VNF to the previous version of the configuration without explicitly
-     * invoking the configuration set name. This command is used when the
-     * configuration was successful, but the health-check was not. A successful
-     * rollback returns a success status when the restart process has completed. A
-     * failed or a partially failed (for a complex VNF) rollback returns a failure
-     * and the failure messages in the response payload block. This command can be
-     * applied to any VNF type. The only restriction is that the particular VNF
-     * should be built based on the generic heap stack
+     * An operation to resume traffic gracefully on the VF. It resumes traffic gracefully without stopping the application
+     *
+     * @param resumeTrafficInput - RPC input object
+     */
+    @RPC(name="resume-traffic", outputType=ResumeTrafficOutput.class)
+    ResumeTrafficOutput resumeTraffic(ResumeTrafficInput resumeTrafficInput) throws AppcClientException;
+
+    /**
+     * An operation to resume traffic gracefully on the VF. It resumes traffic gracefully without stopping the application
      *
-     * @param rollbackInput
-     *            - RPC input object
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param resumeTrafficInput - RPC input object
+     * @return listener - callback implementation
      */
-    @RPC(name = "rollback", outputType = RollbackOutput.class)
+    @RPC(name="resume-traffic", outputType=ResumeTrafficOutput.class)
+    void resumeTraffic(ResumeTrafficInput resumeTrafficInput, ResponseHandler<ResumeTrafficOutput> listener) throws AppcClientException;
+
+    /**
+     * An operation to rollback to particular snapshot of a virtual network function (or VM)
+     *
+     * @param rollbackInput - RPC input object
+     */
+    @RPC(name="rollback", outputType=RollbackOutput.class)
     RollbackOutput rollback(RollbackInput rollbackInput) throws AppcClientException;
 
     /**
-     * Sets a VNF to the previous version of the configuration without explicitly
-     * invoking the configuration set name. This command is used when the
-     * configuration was successful, but the health-check was not. A successful
-     * rollback returns a success status when the restart process has completed. A
-     * failed or a partially failed (for a complex VNF) rollback returns a failure
-     * and the failure messages in the response payload block. This command can be
-     * applied to any VNF type. The only restriction is that the particular VNF
-     * should be built based on the generic heap stack
+     * An operation to rollback to particular snapshot of a virtual network function (or VM)
      *
-     * @param rollbackInput
-     *            - RPC input object
-     * @param listener
-     *            - callback implementation
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param rollbackInput - RPC input object
+     * @return listener - callback implementation
      */
-    @RPC(name = "rollback", outputType = RollbackOutput.class)
+    @RPC(name="rollback", outputType=RollbackOutput.class)
     void rollback(RollbackInput rollbackInput, ResponseHandler<RollbackOutput> listener) throws AppcClientException;
 
     /**
-     * Creates a snapshot of a VNF, or VM. The Snapshot command returns a customized
-     * response containing a reference to the newly created snapshot instance if the
-     * action is successful. This command can be applied to any VNF type. The only
-     * restriction is that the particular VNF should be built based on the generic
-     * heap stack
+     * An operation to create a snapshot of a virtual network function (or VM)
      *
-     * @param snapshotInput
-     *            - RPC input object
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param snapshotInput - RPC input object
      */
-    @RPC(name = "snapshot", outputType = SnapshotOutput.class)
+    @RPC(name="snapshot", outputType=SnapshotOutput.class)
     SnapshotOutput snapshot(SnapshotInput snapshotInput) throws AppcClientException;
 
     /**
-     * Creates a snapshot of a VNF, or VM. The Snapshot command returns a customized
-     * response containing a reference to the newly created snapshot instance if the
-     * action is successful. This command can be applied to any VNF type. The only
-     * restriction is that the particular VNF should be built based on the generic
-     * heap stack
+     * An operation to create a snapshot of a virtual network function (or VM)
      *
-     * @param snapshotInput
-     *            - RPC input object
-     * @param listener
-     *            - callback implementation
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param snapshotInput - RPC input object
+     * @return listener - callback implementation
      */
-    @RPC(name = "snapshot", outputType = SnapshotOutput.class)
+    @RPC(name="snapshot", outputType=SnapshotOutput.class)
     void snapshot(SnapshotInput snapshotInput, ResponseHandler<SnapshotOutput> listener) throws AppcClientException;
 
     /**
-     * This LCM command uploads the file that contains a new software version to the
-     * target VNF
+     * An operation to upload a new version of vSCP image to vSCP for updating it
      *
-     * @param softwareUploadInput
-     *            - RPC input object
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param softwareUploadInput - RPC input object
      */
-    @RPC(name = "software-upload", outputType = SoftwareUploadOutput.class)
+    @RPC(name="software-upload", outputType=SoftwareUploadOutput.class)
     SoftwareUploadOutput softwareUpload(SoftwareUploadInput softwareUploadInput) throws AppcClientException;
 
     /**
-     * This LCM command uploads the file that contains a new software version to the
-     * target VNF
+     * An operation to upload a new version of vSCP image to vSCP for updating it
      *
-     * @param softwareUploadInput
-     *            - RPC input object
-     * @param listener
-     *            - callback implementation
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param softwareUploadInput - RPC input object
+     * @return listener - callback implementation
      */
-    @RPC(name = "software-upload", outputType = SoftwareUploadOutput.class)
-    void softwareUpload(SoftwareUploadInput softwareUploadInput, ResponseHandler<SoftwareUploadOutput> listener)
-            throws AppcClientException;
+    @RPC(name="software-upload", outputType=SoftwareUploadOutput.class)
+    void softwareUpload(SoftwareUploadInput softwareUploadInput, ResponseHandler<SoftwareUploadOutput> listener) throws AppcClientException;
 
     /**
      * An operation to start a virtual network function (or VM)
      *
-     * @param startInput
-     *            - RPC input object
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param startInput - RPC input object
      */
-    @RPC(name = "start", outputType = StartOutput.class)
+    @RPC(name="start", outputType=StartOutput.class)
     StartOutput start(StartInput startInput) throws AppcClientException;
 
     /**
      * An operation to start a virtual network function (or VM)
      *
-     * @param startInput
-     *            - RPC input object
-     * @param listener
-     *            - callback implementation
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param startInput - RPC input object
+     * @return listener - callback implementation
      */
-    @RPC(name = "start", outputType = StartOutput.class)
+    @RPC(name="start", outputType=StartOutput.class)
     void start(StartInput startInput, ResponseHandler<StartOutput> listener) throws AppcClientException;
 
     /**
-     * Stop a target VNF or VNFC. A successful stop returns a success response. For
-     * a multi-component stop to be considered successful, all component stop
-     * actions must succeed. A failed stop returns a failure and the failure
-     * messages in the response payload block
+     * An operation to perform VNF Start Application operation
      *
-     * @param stopInput
-     *            - RPC input object
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param startApplicationInput - RPC input object
      */
-    @RPC(name = "stop", outputType = StopOutput.class)
+    @RPC(name="start-application", outputType=StartApplicationOutput.class)
+    StartApplicationOutput startApplication(StartApplicationInput startApplicationInput) throws AppcClientException;
+
+    /**
+     * An operation to perform VNF Start Application operation
+     *
+     * @param startApplicationInput - RPC input object
+     * @return listener - callback implementation
+     */
+    @RPC(name="start-application", outputType=StartApplicationOutput.class)
+    void startApplication(StartApplicationInput startApplicationInput, ResponseHandler<StartApplicationOutput> listener) throws AppcClientException;
+
+    /**
+     * An operation to stop the configurations of a virtual network function (or VM)
+     *
+     * @param stopInput - RPC input object
+     */
+    @RPC(name="stop", outputType=StopOutput.class)
     StopOutput stop(StopInput stopInput) throws AppcClientException;
 
     /**
-     * Stop a target VNF or VNFC. A successful stop returns a success response. For
-     * a multi-component stop to be considered successful, all component stop
-     * actions must succeed. A failed stop returns a failure and the failure
-     * messages in the response payload block
+     * An operation to stop the configurations of a virtual network function (or VM)
      *
-     * @param stopInput
-     *            - RPC input object
-     * @param listener
-     *            - callback implementation
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param stopInput - RPC input object
+     * @return listener - callback implementation
      */
-    @RPC(name = "stop", outputType = StopOutput.class)
+    @RPC(name="stop", outputType=StopOutput.class)
     void stop(StopInput stopInput, ResponseHandler<StopOutput> listener) throws AppcClientException;
 
     /**
-     * The Sync action updates the current configuration in the APPC store with the
-     * running configuration from the device. A successful Sync returns a success
-     * status. A failed Sync returns a failure response status and failure messages
-     * in the response payload block. This command can be applied to any VNF type.
-     * The only restriction is that a particular VNF should be able to support the
-     * interface for Reading Configuration using existing adapters and use the
-     * following protocols: CLI, RestConf and XML
+     * An operation to Stop Application traffic to a virtual network function
+     *
+     * @param stopApplicationInput - RPC input object
+     */
+    @RPC(name="stop-application", outputType=StopApplicationOutput.class)
+    StopApplicationOutput stopApplication(StopApplicationInput stopApplicationInput) throws AppcClientException;
+
+    /**
+     * An operation to Stop Application traffic to a virtual network function
      *
-     * @param syncInput
-     *            - RPC input object
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param stopApplicationInput - RPC input object
+     * @return listener - callback implementation
      */
-    @RPC(name = "sync", outputType = SyncOutput.class)
+    @RPC(name="stop-application", outputType=StopApplicationOutput.class)
+    void stopApplication(StopApplicationInput stopApplicationInput, ResponseHandler<StopApplicationOutput> listener) throws AppcClientException;
+
+    /**
+     * An operation to sync the configurations of a virtual network function (or VM)
+     *
+     * @param syncInput - RPC input object
+     */
+    @RPC(name="sync", outputType=SyncOutput.class)
     SyncOutput sync(SyncInput syncInput) throws AppcClientException;
 
     /**
-     * The Sync action updates the current configuration in the APPC store with the
-     * running configuration from the device. A successful Sync returns a success
-     * status. A failed Sync returns a failure response status and failure messages
-     * in the response payload block. This command can be applied to any VNF type.
-     * The only restriction is that a particular VNF should be able to support the
-     * interface for Reading Configuration using existing adapters and use the
-     * following protocols: CLI, RestConf and XML
+     * An operation to sync the configurations of a virtual network function (or VM)
      *
-     * @param syncInput
-     *            - RPC input object
-     * @param listener
-     *            - callback implementation
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param syncInput - RPC input object
+     * @return listener - callback implementation
      */
-    @RPC(name = "sync", outputType = SyncOutput.class)
+    @RPC(name="sync", outputType=SyncOutput.class)
     void sync(SyncInput syncInput, ResponseHandler<SyncOutput> listener) throws AppcClientException;
 
     /**
-     * Terminate a target VNF and release its resources (possibly gracefully).
-     * Specific scripts can be run before termination by placing them under the
-     * Terminate life cycle event. All configuration files related to the target VNF
-     * are deleted. The resources of a terminated VNF that are not managed by APPC,
-     * such as those handled by SDNC or other components, are not handled and remain
-     * the responsibility of their respective managing functions. A successful
-     * Terminate action returns a success response. For a multi-component terminate
-     * to be considered successful, all component Terminate actions must also
-     * succeed. A failed Terminate returns a failure status and the failure messages
-     * in the response payload block
+     * An operation to terminate the configurations of a virtual network function (or VM)
      *
-     * @param terminateInput
-     *            - RPC input object
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param terminateInput - RPC input object
      */
-    @RPC(name = "terminate", outputType = TerminateOutput.class)
+    @RPC(name="terminate", outputType=TerminateOutput.class)
     TerminateOutput terminate(TerminateInput terminateInput) throws AppcClientException;
 
     /**
-     * Terminate a target VNF and release its resources (possibly gracefully).
-     * Specific scripts can be run before termination by placing them under the
-     * Terminate life cycle event. All configuration files related to the target VNF
-     * are deleted. The resources of a terminated VNF that are not managed by APPC,
-     * such as those handled by SDNC or other components, are not handled and remain
-     * the responsibility of their respective managing functions. A successful
-     * Terminate action returns a success response. For a multi-component terminate
-     * to be considered successful, all component Terminate actions must also
-     * succeed. A failed Terminate returns a failure status and the failure messages
-     * in the response payload block
-     *
-     * @param terminateInput
-     *            - RPC input object
-     * @param listener
-     *            - callback implementation
-     * @throws AppcClientException
-     *             - throw AppcClientException
-     */
-    @RPC(name = "terminate", outputType = TerminateOutput.class)
+     * An operation to terminate the configurations of a virtual network function (or VM)
+     *
+     * @param terminateInput - RPC input object
+     * @return listener - callback implementation
+     */
+    @RPC(name="terminate", outputType=TerminateOutput.class)
     void terminate(TerminateInput terminateInput, ResponseHandler<TerminateOutput> listener) throws AppcClientException;
 
     /**
-     * The Test LCM action checks a target VNF or VNFC for correct operation. The
-     * functionality of the Test LCM action involves should involve more than a
-     * HealthCheck , it should provide a means for launching a test transaction and
-     * determining if the transaction completed successfully or not. A transaction
-     * launcher microservice will have to be supplied by the VNF and called by APPC.
-     * A successful test returns a success and the results of the test in the
-     * payload block. A failed test returns a failure and specific failure messages
-     * in the payload block
+     * An operation to test the configurations of a virtual network function (or VM)
      *
-     * @param testInput
-     *            - RPC input object
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param testInput - RPC input object
      */
-    @RPC(name = "test", outputType = TestOutput.class)
+    @RPC(name="test", outputType=TestOutput.class)
     TestOutput test(TestInput testInput) throws AppcClientException;
 
     /**
-     * The Test LCM action checks a target VNF or VNFC for correct operation. The
-     * functionality of the Test LCM action involves should involve more than a
-     * HealthCheck , it should provide a means for launching a test transaction and
-     * determining if the transaction completed successfully or not. A transaction
-     * launcher microservice will have to be supplied by the VNF and called by APPC.
-     * A successful test returns a success and the results of the test in the
-     * payload block. A failed test returns a failure and specific failure messages
-     * in the payload block
+     * An operation to test the configurations of a virtual network function (or VM)
      *
-     * @param testInput
-     *            - RPC input object
-     * @param listener
-     *            - callback implementation
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param testInput - RPC input object
+     * @return listener - callback implementation
      */
-    @RPC(name = "test", outputType = TestOutput.class)
+    @RPC(name="test", outputType=TestOutput.class)
     void test(TestInput testInput, ResponseHandler<TestOutput> listener) throws AppcClientException;
 
     /**
-     * Run the Unlock command to release the lock on a VNF and allow other clients
-     * to perform LCM commands on that VNF. The Unlock command will result in
-     * success if the VNF successfully unlocked or if it was already unlocked,
-     * otherwise commands will be rejected. The Unlock command will only return
-     * success if the VNF was locked with same request-id (on page 6). The Unlock
-     * command returns only one final response with the status of the request
-     * processing. The APPC also locks the target VNF during any command processing.
-     * If an Unlock action is then requested on that VNF with a different
-     * request-id, it will be rejected because the VNF is already locked for another
-     * process, even though no actual lock command was explicitly invoked
+     * An operation to perform VNF unlock operation
      *
-     * @param unlockInput
-     *            - RPC input object
-     * @throws AppcClientException
-     *             - throw AppcClientException
+     * @param unlockInput - RPC input object
      */
-    @RPC(name = "unlock", outputType = UnlockOutput.class)
+    @RPC(name="unlock", outputType=UnlockOutput.class)
     UnlockOutput unlock(UnlockInput unlockInput) throws AppcClientException;
 
     /**
-     * Run the Unlock command to release the lock on a VNF and allow other clients
-     * to perform LCM commands on that VNF. The Unlock command will result in
-     * success if the VNF successfully unlocked or if it was already unlocked,
-     * otherwise commands will be rejected. The Unlock command will only return
-     * success if the VNF was locked with same request-id (on page 6). The Unlock
-     * command returns only one final response with the status of the request
-     * processing. The APPC also locks the target VNF during any command processing.
-     * If an Unlock action is then requested on that VNF with a different
-     * request-id, it will be rejected because the VNF is already locked for another
-     * process, even though no actual lock command was explicitly invoked
-     *
-     * @param unlockInput
-     *            - RPC input object
-     * @param listener
-     *            - callback implementation
-     * @throws AppcClientException
-     *             - throw AppcClientException
-     */
-    @RPC(name = "unlock", outputType = UnlockOutput.class)
+     * An operation to perform VNF unlock operation
+     *
+     * @param unlockInput - RPC input object
+     * @return listener - callback implementation
+     */
+    @RPC(name="unlock", outputType=UnlockOutput.class)
     void unlock(UnlockInput unlockInput, ResponseHandler<UnlockOutput> listener) throws AppcClientException;
 
+    /**
+     * An operation does a backout after an UpgradeSoftware is completed (either successfully or unsuccessfully).
+     *
+     * @param upgradeBackoutInput - RPC input object
+     */
+    @RPC(name="upgrade-backout", outputType=UpgradeBackoutOutput.class)
+    UpgradeBackoutOutput upgradeBackout(UpgradeBackoutInput upgradeBackoutInput) throws AppcClientException;
+
+    /**
+     * An operation does a backout after an UpgradeSoftware is completed (either successfully or unsuccessfully).
+     *
+     * @param upgradeBackoutInput - RPC input object
+     * @return listener - callback implementation
+     */
+    @RPC(name="upgrade-backout", outputType=UpgradeBackoutOutput.class)
+    void upgradeBackout(UpgradeBackoutInput upgradeBackoutInput, ResponseHandler<UpgradeBackoutOutput> listener) throws AppcClientException;
+
+    /**
+     * An operation to do full backup of the VNF data prior to an upgrade.
+     *
+     * @param upgradeBackupInput - RPC input object
+     */
+    @RPC(name="upgrade-backup", outputType=UpgradeBackupOutput.class)
+    UpgradeBackupOutput upgradeBackup(UpgradeBackupInput upgradeBackupInput) throws AppcClientException;
+
+    /**
+     * An operation to do full backup of the VNF data prior to an upgrade.
+     *
+     * @param upgradeBackupInput - RPC input object
+     * @return listener - callback implementation
+     */
+    @RPC(name="upgrade-backup", outputType=UpgradeBackupOutput.class)
+    void upgradeBackup(UpgradeBackupInput upgradeBackupInput, ResponseHandler<UpgradeBackupOutput> listener) throws AppcClientException;
+
+    /**
+     * An operation to check the VNF upgrade has been successful completed and all processes are running properly.
+     *
+     * @param upgradePostCheckInput - RPC input object
+     */
+    @RPC(name="upgrade-post-check", outputType=UpgradePostCheckOutput.class)
+    UpgradePostCheckOutput upgradePostCheck(UpgradePostCheckInput upgradePostCheckInput) throws AppcClientException;
+
+    /**
+     * An operation to check the VNF upgrade has been successful completed and all processes are running properly.
+     *
+     * @param upgradePostCheckInput - RPC input object
+     * @return listener - callback implementation
+     */
+    @RPC(name="upgrade-post-check", outputType=UpgradePostCheckOutput.class)
+    void upgradePostCheck(UpgradePostCheckInput upgradePostCheckInput, ResponseHandler<UpgradePostCheckOutput> listener) throws AppcClientException;
+
+    /**
+     * An operation to check that the VNF has the correct software version needed for a software upgrade.
+     *
+     * @param upgradePreCheckInput - RPC input object
+     */
+    @RPC(name="upgrade-pre-check", outputType=UpgradePreCheckOutput.class)
+    UpgradePreCheckOutput upgradePreCheck(UpgradePreCheckInput upgradePreCheckInput) throws AppcClientException;
+
+    /**
+     * An operation to check that the VNF has the correct software version needed for a software upgrade.
+     *
+     * @param upgradePreCheckInput - RPC input object
+     * @return listener - callback implementation
+     */
+    @RPC(name="upgrade-pre-check", outputType=UpgradePreCheckOutput.class)
+    void upgradePreCheck(UpgradePreCheckInput upgradePreCheckInput, ResponseHandler<UpgradePreCheckOutput> listener) throws AppcClientException;
+
+    /**
+     * An operation to upgrade the target VNF to a new version and expected that the VNF is in a quiesced status .
+     *
+     * @param upgradeSoftwareInput - RPC input object
+     */
+    @RPC(name="upgrade-software", outputType=UpgradeSoftwareOutput.class)
+    UpgradeSoftwareOutput upgradeSoftware(UpgradeSoftwareInput upgradeSoftwareInput) throws AppcClientException;
+
+    /**
+     * An operation to upgrade the target VNF to a new version and expected that the VNF is in a quiesced status .
+     *
+     * @param upgradeSoftwareInput - RPC input object
+     * @return listener - callback implementation
+     */
+    @RPC(name="upgrade-software", outputType=UpgradeSoftwareOutput.class)
+    void upgradeSoftware(UpgradeSoftwareInput upgradeSoftwareInput, ResponseHandler<UpgradeSoftwareOutput> listener) throws AppcClientException;
+
 }
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Action.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Action.java
index d43a61c92..4b024a9ef 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Action.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Action.java
@@ -59,7 +59,15 @@ public enum Action {
     ConfigRestore("ConfigRestore"),
     ConfigBackup("ConfigBackup"),
     ConfigBackupDelete("ConfigBackupDelete"),
-    ConfigExport("ConfigExport");
+    ConfigExport("ConfigExport"),
+    StopApplication("StopApplication"),
+    StartApplication("StartApplication"),
+    ActionStatus("ActionStatus"),
+    Query("Query"),
+    Reboot("Reboot"),
+    AttachVolume("AttachVolume"),
+    DetachVolume("DetachVolume"),
+    Quiesce("Quiesce");
 
     private String value;
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ActionIdentifiers.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ActionIdentifiers.java
index bff2c44cb..60910bde1 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ActionIdentifiers.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ActionIdentifiers.java
@@ -33,8 +33,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
  */
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.501+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.322Z",
     comments = "Auto-generated from Open API specification")
 public class ActionIdentifiers {
 
@@ -44,6 +44,9 @@ public class ActionIdentifiers {
     @JsonProperty("vnf-id")
     private String vnfId;
 
+    @JsonProperty("vf-module-id")
+    private String vfModuleId;
+
     @JsonProperty("vnfc-name")
     private String vnfcName;
 
@@ -79,6 +82,20 @@ public class ActionIdentifiers {
     }
 
     /**
+     * identifies the VF module to which this action is to be applied.
+     */
+    public String getVfModuleId() {
+        return vfModuleId;
+    }
+
+    /**
+     * identifies the VF module to which this action is to be applied.
+     */
+    public void setVfModuleId(String vfModuleId) {
+        this.vfModuleId = vfModuleId;
+    }
+
+    /**
      * identifies the VNFC to which this action is to be applied. Some actions apply only to a component within a VNF (e.g. RESTART is sometimes applied to on VM only). In such a case, the name of the VNFC is used to search for the component within the VNF
      */
     public String getVnfcName() {
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ActionStatusInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ActionStatusInput.java
new file mode 100644
index 000000000..5b5a0c1fa
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ActionStatusInput.java
@@ -0,0 +1,106 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@javax.annotation.Generated(
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.328Z",
+    comments = "Auto-generated from Open API specification")
+public class ActionStatusInput {
+
+    @JsonProperty("common-header")
+    private CommonHeader commonHeader;
+
+    @JsonProperty("action")
+    private Action action;
+
+    @JsonProperty("action-identifiers")
+    private ActionIdentifiers actionIdentifiers;
+
+    @JsonProperty("payload")
+    private Payload payload;
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public CommonHeader getCommonHeader() {
+        return commonHeader;
+    }
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public void setCommonHeader(CommonHeader commonHeader) {
+        this.commonHeader = commonHeader;
+    }
+
+    /**
+     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
+     */
+    public Action getAction() {
+        return action;
+    }
+
+    /**
+     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
+     */
+    public void setAction(Action action) {
+        this.action = action;
+    }
+
+    /**
+     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
+     */
+    public ActionIdentifiers getActionIdentifiers() {
+        return actionIdentifiers;
+    }
+
+    /**
+     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
+     */
+    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
+        this.actionIdentifiers = actionIdentifiers;
+    }
+
+    /**
+     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
+     */
+    public Payload getPayload() {
+        return payload;
+    }
+
+    /**
+     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
+     */
+    public void setPayload(Payload payload) {
+        this.payload = payload;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ActionStatusOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ActionStatusOutput.java
new file mode 100644
index 000000000..1eeda6bd2
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ActionStatusOutput.java
@@ -0,0 +1,89 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@javax.annotation.Generated(
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.33Z",
+    comments = "Auto-generated from Open API specification")
+public class ActionStatusOutput {
+
+    @JsonProperty("common-header")
+    private CommonHeader commonHeader;
+
+    @JsonProperty("status")
+    private Status status;
+
+    @JsonProperty("payload")
+    private Payload payload;
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public CommonHeader getCommonHeader() {
+        return commonHeader;
+    }
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public void setCommonHeader(CommonHeader commonHeader) {
+        this.commonHeader = commonHeader;
+    }
+
+    /**
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
+     */
+    public Status getStatus() {
+        return status;
+    }
+
+    /**
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
+     */
+    public void setStatus(Status status) {
+        this.status = status;
+    }
+
+    /**
+     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
+     */
+    public Payload getPayload() {
+        return payload;
+    }
+
+    /**
+     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
+     */
+    public void setPayload(Payload payload) {
+        this.payload = payload;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/AttachVolumeInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/AttachVolumeInput.java
new file mode 100644
index 000000000..5b8348b1c
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/AttachVolumeInput.java
@@ -0,0 +1,106 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@javax.annotation.Generated(
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.332Z",
+    comments = "Auto-generated from Open API specification")
+public class AttachVolumeInput {
+
+    @JsonProperty("common-header")
+    private CommonHeader commonHeader;
+
+    @JsonProperty("action")
+    private Action action;
+
+    @JsonProperty("action-identifiers")
+    private ActionIdentifiers actionIdentifiers;
+
+    @JsonProperty("payload")
+    private Payload payload;
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public CommonHeader getCommonHeader() {
+        return commonHeader;
+    }
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public void setCommonHeader(CommonHeader commonHeader) {
+        this.commonHeader = commonHeader;
+    }
+
+    /**
+     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
+     */
+    public Action getAction() {
+        return action;
+    }
+
+    /**
+     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
+     */
+    public void setAction(Action action) {
+        this.action = action;
+    }
+
+    /**
+     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
+     */
+    public ActionIdentifiers getActionIdentifiers() {
+        return actionIdentifiers;
+    }
+
+    /**
+     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
+     */
+    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
+        this.actionIdentifiers = actionIdentifiers;
+    }
+
+    /**
+     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
+     */
+    public Payload getPayload() {
+        return payload;
+    }
+
+    /**
+     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
+     */
+    public void setPayload(Payload payload) {
+        this.payload = payload;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/AttachVolumeOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/AttachVolumeOutput.java
new file mode 100644
index 000000000..6fdb7a9de
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/AttachVolumeOutput.java
@@ -0,0 +1,72 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@javax.annotation.Generated(
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.334Z",
+    comments = "Auto-generated from Open API specification")
+public class AttachVolumeOutput {
+
+    @JsonProperty("common-header")
+    private CommonHeader commonHeader;
+
+    @JsonProperty("status")
+    private Status status;
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public CommonHeader getCommonHeader() {
+        return commonHeader;
+    }
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public void setCommonHeader(CommonHeader commonHeader) {
+        this.commonHeader = commonHeader;
+    }
+
+    /**
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
+     */
+    public Status getStatus() {
+        return status;
+    }
+
+    /**
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
+     */
+    public void setStatus(Status status) {
+        this.status = status;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/AuditInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/AuditInput.java
index 2301913a9..6542ff3c7 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/AuditInput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/AuditInput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.512+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.335Z",
     comments = "Auto-generated from Open API specification")
 public class AuditInput {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/AuditOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/AuditOutput.java
index 00f4244ba..8f573285e 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/AuditOutput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/AuditOutput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.517+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.336Z",
     comments = "Auto-generated from Open API specification")
 public class AuditOutput {
 
@@ -59,14 +59,14 @@ public class AuditOutput {
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public Status getStatus() {
         return status;
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public void setStatus(Status status) {
         this.status = status;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/CheckLockInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/CheckLockInput.java
index 840aad615..9b70f5fc2 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/CheckLockInput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/CheckLockInput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.519+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.342Z",
     comments = "Auto-generated from Open API specification")
 public class CheckLockInput {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/CheckLockOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/CheckLockOutput.java
index 2bfdea0fe..04b2a0092 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/CheckLockOutput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/CheckLockOutput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.523+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.343Z",
     comments = "Auto-generated from Open API specification")
 public class CheckLockOutput {
 
@@ -64,14 +64,14 @@ public class CheckLockOutput {
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public Status getStatus() {
         return status;
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public void setStatus(Status status) {
         this.status = status;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/CommonHeader.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/CommonHeader.java
index 43320d333..6c32fd680 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/CommonHeader.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/CommonHeader.java
@@ -33,8 +33,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * A common header for all APP-C requests
  */
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.49+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.312Z",
     comments = "Auto-generated from Open API specification")
 public class CommonHeader {
 
@@ -85,14 +85,14 @@ public class CommonHeader {
     }
 
     /**
-     * originator-id an identifier of the calling system which can be used addressing purposes, i.e. returning asynchronous response to the proper destination over UEB (especially in case of multiple consumers of APP-C APIs)
+     * originator-id an identifier of the calling system which can be used addressing purposes, i.e. returning asynchronous response to the proper destination over DMaaP (especially in case of multiple consumers of APP-C APIs)
      */
     public String getOriginatorId() {
         return originatorId;
     }
 
     /**
-     * originator-id an identifier of the calling system which can be used addressing purposes, i.e. returning asynchronous response to the proper destination over UEB (especially in case of multiple consumers of APP-C APIs)
+     * originator-id an identifier of the calling system which can be used addressing purposes, i.e. returning asynchronous response to the proper destination over DMaaP (especially in case of multiple consumers of APP-C APIs)
      */
     public void setOriginatorId(String originatorId) {
         this.originatorId = originatorId;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupDeleteInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupDeleteInput.java
index c5f14b6ae..d5b9d2348 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupDeleteInput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupDeleteInput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.533+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.347Z",
     comments = "Auto-generated from Open API specification")
 public class ConfigBackupDeleteInput {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupDeleteOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupDeleteOutput.java
index 730240276..cdadf15ae 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupDeleteOutput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupDeleteOutput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.537+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.355Z",
     comments = "Auto-generated from Open API specification")
 public class ConfigBackupDeleteOutput {
 
@@ -59,14 +59,14 @@ public class ConfigBackupDeleteOutput {
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public Status getStatus() {
         return status;
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public void setStatus(Status status) {
         this.status = status;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupInput.java
index 26f799cb4..91aa25b4c 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupInput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupInput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.526+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.344Z",
     comments = "Auto-generated from Open API specification")
 public class ConfigBackupInput {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupOutput.java
index 1768ea74d..a96006800 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupOutput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigBackupOutput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.529+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.346Z",
     comments = "Auto-generated from Open API specification")
 public class ConfigBackupOutput {
 
@@ -59,14 +59,14 @@ public class ConfigBackupOutput {
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public Status getStatus() {
         return status;
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public void setStatus(Status status) {
         this.status = status;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigExportInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigExportInput.java
index 5c2d98d19..ea927534d 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigExportInput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigExportInput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.541+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.356Z",
     comments = "Auto-generated from Open API specification")
 public class ConfigExportInput {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigExportOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigExportOutput.java
index bbfe27af1..b8a251c51 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigExportOutput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigExportOutput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.543+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.357Z",
     comments = "Auto-generated from Open API specification")
 public class ConfigExportOutput {
 
@@ -56,14 +56,14 @@ public class ConfigExportOutput {
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public Status getStatus() {
         return status;
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public void setStatus(Status status) {
         this.status = status;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigModifyInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigModifyInput.java
index c1a9e6be6..ff10ae6b1 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigModifyInput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigModifyInput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.559+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.358Z",
     comments = "Auto-generated from Open API specification")
 public class ConfigModifyInput {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigModifyOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigModifyOutput.java
index 356299d77..72ecfdea0 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigModifyOutput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigModifyOutput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.563+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.36Z",
     comments = "Auto-generated from Open API specification")
 public class ConfigModifyOutput {
 
@@ -59,14 +59,14 @@ public class ConfigModifyOutput {
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public Status getStatus() {
         return status;
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public void setStatus(Status status) {
         this.status = status;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigRestoreInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigRestoreInput.java
index ec26bae34..6c5827476 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigRestoreInput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigRestoreInput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.565+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.361Z",
     comments = "Auto-generated from Open API specification")
 public class ConfigRestoreInput {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigRestoreOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigRestoreOutput.java
index 0646d670b..fcb4770e1 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigRestoreOutput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigRestoreOutput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.568+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.363Z",
     comments = "Auto-generated from Open API specification")
 public class ConfigRestoreOutput {
 
@@ -59,14 +59,14 @@ public class ConfigRestoreOutput {
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public Status getStatus() {
         return status;
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public void setStatus(Status status) {
         this.status = status;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigScaleoutInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigScaleoutInput.java
index 14c62689a..039074431 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigScaleoutInput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigScaleoutInput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.571+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.374Z",
     comments = "Auto-generated from Open API specification")
 public class ConfigScaleoutInput {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigScaleoutOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigScaleoutOutput.java
index fb3f1973a..f6138c266 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigScaleoutOutput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigScaleoutOutput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.574+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.375Z",
     comments = "Auto-generated from Open API specification")
 public class ConfigScaleoutOutput {
 
@@ -59,14 +59,14 @@ public class ConfigScaleoutOutput {
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public Status getStatus() {
         return status;
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public void setStatus(Status status) {
         this.status = status;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigureInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigureInput.java
index b56d692b8..4acb10e74 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigureInput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigureInput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.577+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.376Z",
     comments = "Auto-generated from Open API specification")
 public class ConfigureInput {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigureOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigureOutput.java
index fcf32bf2d..6e9f72a20 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigureOutput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ConfigureOutput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.585+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.378Z",
     comments = "Auto-generated from Open API specification")
 public class ConfigureOutput {
 
@@ -59,14 +59,14 @@ public class ConfigureOutput {
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public Status getStatus() {
         return status;
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public void setStatus(Status status) {
         this.status = status;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/DetachVolumeInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/DetachVolumeInput.java
new file mode 100644
index 000000000..975550781
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/DetachVolumeInput.java
@@ -0,0 +1,106 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@javax.annotation.Generated(
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.379Z",
+    comments = "Auto-generated from Open API specification")
+public class DetachVolumeInput {
+
+    @JsonProperty("common-header")
+    private CommonHeader commonHeader;
+
+    @JsonProperty("action")
+    private Action action;
+
+    @JsonProperty("action-identifiers")
+    private ActionIdentifiers actionIdentifiers;
+
+    @JsonProperty("payload")
+    private Payload payload;
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public CommonHeader getCommonHeader() {
+        return commonHeader;
+    }
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public void setCommonHeader(CommonHeader commonHeader) {
+        this.commonHeader = commonHeader;
+    }
+
+    /**
+     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
+     */
+    public Action getAction() {
+        return action;
+    }
+
+    /**
+     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
+     */
+    public void setAction(Action action) {
+        this.action = action;
+    }
+
+    /**
+     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
+     */
+    public ActionIdentifiers getActionIdentifiers() {
+        return actionIdentifiers;
+    }
+
+    /**
+     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
+     */
+    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
+        this.actionIdentifiers = actionIdentifiers;
+    }
+
+    /**
+     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
+     */
+    public Payload getPayload() {
+        return payload;
+    }
+
+    /**
+     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
+     */
+    public void setPayload(Payload payload) {
+        this.payload = payload;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/DetachVolumeOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/DetachVolumeOutput.java
new file mode 100644
index 000000000..9d799c431
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/DetachVolumeOutput.java
@@ -0,0 +1,72 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@javax.annotation.Generated(
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.38Z",
+    comments = "Auto-generated from Open API specification")
+public class DetachVolumeOutput {
+
+    @JsonProperty("common-header")
+    private CommonHeader commonHeader;
+
+    @JsonProperty("status")
+    private Status status;
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public CommonHeader getCommonHeader() {
+        return commonHeader;
+    }
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public void setCommonHeader(CommonHeader commonHeader) {
+        this.commonHeader = commonHeader;
+    }
+
+    /**
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
+     */
+    public Status getStatus() {
+        return status;
+    }
+
+    /**
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
+     */
+    public void setStatus(Status status) {
+        this.status = status;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/EvacuateInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/EvacuateInput.java
index 85c36e8a4..bf288bbd5 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/EvacuateInput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/EvacuateInput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.587+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.381Z",
     comments = "Auto-generated from Open API specification")
 public class EvacuateInput {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/EvacuateOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/EvacuateOutput.java
index 2c73a5b84..7f6466913 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/EvacuateOutput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/EvacuateOutput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.59+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.382Z",
     comments = "Auto-generated from Open API specification")
 public class EvacuateOutput {
 
@@ -56,14 +56,14 @@ public class EvacuateOutput {
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public Status getStatus() {
         return status;
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public void setStatus(Status status) {
         this.status = status;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Flags.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Flags.java
index 01d2652dd..a254e412f 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Flags.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Flags.java
@@ -33,8 +33,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * Flags are generic flags that apply to any and all commands, all are optional
  */
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.498+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.32Z",
     comments = "Auto-generated from Open API specification")
 public class Flags {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/HealthCheckInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/HealthCheckInput.java
index 7bd3207cb..2be84d19d 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/HealthCheckInput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/HealthCheckInput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.593+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.386Z",
     comments = "Auto-generated from Open API specification")
 public class HealthCheckInput {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/HealthCheckOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/HealthCheckOutput.java
index 41a907c71..1ab7327b6 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/HealthCheckOutput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/HealthCheckOutput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.596+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.391Z",
     comments = "Auto-generated from Open API specification")
 public class HealthCheckOutput {
 
@@ -56,14 +56,14 @@ public class HealthCheckOutput {
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public Status getStatus() {
         return status;
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public void setStatus(Status status) {
         this.status = status;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LcmActionStatus.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LcmActionStatus.java
new file mode 100644
index 000000000..34d72a9a6
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LcmActionStatus.java
@@ -0,0 +1,66 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+
+/**
+* The status of the requested LCM action
+*
+*/
+public enum LcmActionStatus {
+
+    IN_PROGRESS("IN_PROGRESS"),
+    SUCCESSFUL("SUCCESSFUL"),
+    FAILED("FAILED"),
+    NOT_FOUND("NOT_FOUND"),
+    ABORTED("ABORTED"),
+    MULTIPLE_REQUESTS_FOUND("MULTIPLE_REQUESTS_FOUND");
+
+    private String value;
+
+    LcmActionStatus(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static LcmActionStatus fromValue(String text) {
+        for (LcmActionStatus var : LcmActionStatus.values()) {
+            if (String.valueOf(var.value).equals(text)) {
+                return var;
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LiveUpgradeInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LiveUpgradeInput.java
index 82a971bc7..dd95fc43f 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LiveUpgradeInput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LiveUpgradeInput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.602+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.392Z",
     comments = "Auto-generated from Open API specification")
 public class LiveUpgradeInput {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LiveUpgradeOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LiveUpgradeOutput.java
index 809adcd8f..33c5fb4e8 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LiveUpgradeOutput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LiveUpgradeOutput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.604+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.396Z",
     comments = "Auto-generated from Open API specification")
 public class LiveUpgradeOutput {
 
@@ -56,14 +56,14 @@ public class LiveUpgradeOutput {
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public Status getStatus() {
         return status;
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public void setStatus(Status status) {
         this.status = status;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LockInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LockInput.java
index f6f68d2c6..c665ca833 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LockInput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LockInput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.607+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.397Z",
     comments = "Auto-generated from Open API specification")
 public class LockInput {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LockOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LockOutput.java
index 0f77bced6..abdfa0e6e 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LockOutput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/LockOutput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.609+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.4Z",
     comments = "Auto-generated from Open API specification")
 public class LockOutput {
 
@@ -56,14 +56,14 @@ public class LockOutput {
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public Status getStatus() {
         return status;
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public void setStatus(Status status) {
         this.status = status;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/MigrateInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/MigrateInput.java
index 5877aab07..42bd0c6b3 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/MigrateInput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/MigrateInput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.612+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.401Z",
     comments = "Auto-generated from Open API specification")
 public class MigrateInput {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/MigrateOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/MigrateOutput.java
index 4d804db9a..b0e506e45 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/MigrateOutput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/MigrateOutput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.615+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.403Z",
     comments = "Auto-generated from Open API specification")
 public class MigrateOutput {
 
@@ -56,14 +56,14 @@ public class MigrateOutput {
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public Status getStatus() {
         return status;
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public void setStatus(Status status) {
         this.status = status;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Payload.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Payload.java
index 56ce6c529..5be1df26d 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Payload.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Payload.java
@@ -34,8 +34,8 @@ import com.fasterxml.jackson.annotation.JsonValue;
  * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
  */
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.472+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.292Z",
     comments = "Auto-generated from Open API specification")
 public class Payload {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QueryInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QueryInput.java
new file mode 100644
index 000000000..b8ff318da
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QueryInput.java
@@ -0,0 +1,89 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@javax.annotation.Generated(
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.404Z",
+    comments = "Auto-generated from Open API specification")
+public class QueryInput {
+
+    @JsonProperty("common-header")
+    private CommonHeader commonHeader;
+
+    @JsonProperty("action")
+    private Action action;
+
+    @JsonProperty("action-identifiers")
+    private ActionIdentifiers actionIdentifiers;
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public CommonHeader getCommonHeader() {
+        return commonHeader;
+    }
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public void setCommonHeader(CommonHeader commonHeader) {
+        this.commonHeader = commonHeader;
+    }
+
+    /**
+     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
+     */
+    public Action getAction() {
+        return action;
+    }
+
+    /**
+     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
+     */
+    public void setAction(Action action) {
+        this.action = action;
+    }
+
+    /**
+     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
+     */
+    public ActionIdentifiers getActionIdentifiers() {
+        return actionIdentifiers;
+    }
+
+    /**
+     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
+     */
+    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
+        this.actionIdentifiers = actionIdentifiers;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QueryOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QueryOutput.java
new file mode 100644
index 000000000..9a31e0a0b
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QueryOutput.java
@@ -0,0 +1,83 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@javax.annotation.Generated(
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.405Z",
+    comments = "Auto-generated from Open API specification")
+public class QueryOutput {
+
+    @JsonProperty("common-header")
+    private CommonHeader commonHeader;
+
+    @JsonProperty("status")
+    private Status status;
+
+    @JsonProperty("query-results")
+    private QueryResults queryResults;
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public CommonHeader getCommonHeader() {
+        return commonHeader;
+    }
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public void setCommonHeader(CommonHeader commonHeader) {
+        this.commonHeader = commonHeader;
+    }
+
+    /**
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
+     */
+    public Status getStatus() {
+        return status;
+    }
+
+    /**
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
+     */
+    public void setStatus(Status status) {
+        this.status = status;
+    }
+
+    public QueryResults getQueryResults() {
+        return queryResults;
+    }
+
+    public void setQueryResults(QueryResults queryResults) {
+        this.queryResults = queryResults;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QueryResults.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QueryResults.java
new file mode 100644
index 000000000..4f91ad5d8
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QueryResults.java
@@ -0,0 +1,89 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@javax.annotation.Generated(
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.326Z",
+    comments = "Auto-generated from Open API specification")
+public class QueryResults {
+
+    @JsonProperty("vserver-id")
+    private String vserverId;
+
+    @JsonProperty("vm-state")
+    private VmState vmState;
+
+    @JsonProperty("vm-status")
+    private VmStatus vmStatus;
+
+    /**
+     * Identifier of a VM
+     */
+    public String getVserverId() {
+        return vserverId;
+    }
+
+    /**
+     * Identifier of a VM
+     */
+    public void setVserverId(String vserverId) {
+        this.vserverId = vserverId;
+    }
+
+    /**
+     * The state of a VM
+     */
+    public VmState getVmState() {
+        return vmState;
+    }
+
+    /**
+     * The state of a VM
+     */
+    public void setVmState(VmState vmState) {
+        this.vmState = vmState;
+    }
+
+    /**
+     * The status of a VM
+     */
+    public VmStatus getVmStatus() {
+        return vmStatus;
+    }
+
+    /**
+     * The status of a VM
+     */
+    public void setVmStatus(VmStatus vmStatus) {
+        this.vmStatus = vmStatus;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QuiesceTrafficInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QuiesceTrafficInput.java
new file mode 100644
index 000000000..c1b309ff6
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QuiesceTrafficInput.java
@@ -0,0 +1,106 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@javax.annotation.Generated(
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-27T12:27:49.028-06:00",
+    comments = "Auto-generated from Open API specification")
+public class QuiesceTrafficInput {
+
+    @JsonProperty("common-header")
+    private CommonHeader commonHeader;
+
+    @JsonProperty("action")
+    private Action action;
+
+    @JsonProperty("action-identifiers")
+    private ActionIdentifiers actionIdentifiers;
+
+    @JsonProperty("payload")
+    private Payload payload;
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public CommonHeader getCommonHeader() {
+        return commonHeader;
+    }
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public void setCommonHeader(CommonHeader commonHeader) {
+        this.commonHeader = commonHeader;
+    }
+
+    /**
+     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
+     */
+    public Action getAction() {
+        return action;
+    }
+
+    /**
+     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
+     */
+    public void setAction(Action action) {
+        this.action = action;
+    }
+
+    /**
+     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
+     */
+    public ActionIdentifiers getActionIdentifiers() {
+        return actionIdentifiers;
+    }
+
+    /**
+     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
+     */
+    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
+        this.actionIdentifiers = actionIdentifiers;
+    }
+
+    /**
+     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
+     */
+    public Payload getPayload() {
+        return payload;
+    }
+
+    /**
+     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
+     */
+    public void setPayload(Payload payload) {
+        this.payload = payload;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QuiesceTrafficOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QuiesceTrafficOutput.java
new file mode 100644
index 000000000..bf322cf0e
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/QuiesceTrafficOutput.java
@@ -0,0 +1,72 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@javax.annotation.Generated(
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-27T12:27:49.032-06:00",
+    comments = "Auto-generated from Open API specification")
+public class QuiesceTrafficOutput {
+
+    @JsonProperty("common-header")
+    private CommonHeader commonHeader;
+
+    @JsonProperty("status")
+    private Status status;
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public CommonHeader getCommonHeader() {
+        return commonHeader;
+    }
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public void setCommonHeader(CommonHeader commonHeader) {
+        this.commonHeader = commonHeader;
+    }
+
+    /**
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
+     */
+    public Status getStatus() {
+        return status;
+    }
+
+    /**
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
+     */
+    public void setStatus(Status status) {
+        this.status = status;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RebootInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RebootInput.java
new file mode 100644
index 000000000..5fce23c6c
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RebootInput.java
@@ -0,0 +1,106 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@javax.annotation.Generated(
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.407Z",
+    comments = "Auto-generated from Open API specification")
+public class RebootInput {
+
+    @JsonProperty("common-header")
+    private CommonHeader commonHeader;
+
+    @JsonProperty("action")
+    private Action action;
+
+    @JsonProperty("action-identifiers")
+    private ActionIdentifiers actionIdentifiers;
+
+    @JsonProperty("payload")
+    private Payload payload;
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public CommonHeader getCommonHeader() {
+        return commonHeader;
+    }
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public void setCommonHeader(CommonHeader commonHeader) {
+        this.commonHeader = commonHeader;
+    }
+
+    /**
+     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
+     */
+    public Action getAction() {
+        return action;
+    }
+
+    /**
+     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
+     */
+    public void setAction(Action action) {
+        this.action = action;
+    }
+
+    /**
+     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
+     */
+    public ActionIdentifiers getActionIdentifiers() {
+        return actionIdentifiers;
+    }
+
+    /**
+     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
+     */
+    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
+        this.actionIdentifiers = actionIdentifiers;
+    }
+
+    /**
+     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
+     */
+    public Payload getPayload() {
+        return payload;
+    }
+
+    /**
+     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
+     */
+    public void setPayload(Payload payload) {
+        this.payload = payload;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RebootOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RebootOutput.java
new file mode 100644
index 000000000..10f1188a5
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RebootOutput.java
@@ -0,0 +1,72 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@javax.annotation.Generated(
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.408Z",
+    comments = "Auto-generated from Open API specification")
+public class RebootOutput {
+
+    @JsonProperty("common-header")
+    private CommonHeader commonHeader;
+
+    @JsonProperty("status")
+    private Status status;
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public CommonHeader getCommonHeader() {
+        return commonHeader;
+    }
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public void setCommonHeader(CommonHeader commonHeader) {
+        this.commonHeader = commonHeader;
+    }
+
+    /**
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
+     */
+    public Status getStatus() {
+        return status;
+    }
+
+    /**
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
+     */
+    public void setStatus(Status status) {
+        this.status = status;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RebuildInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RebuildInput.java
index ecd199dee..7efd26864 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RebuildInput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RebuildInput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.618+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.411Z",
     comments = "Auto-generated from Open API specification")
 public class RebuildInput {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RebuildOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RebuildOutput.java
index 0816c5b87..c516c08a2 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RebuildOutput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RebuildOutput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.621+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.412Z",
     comments = "Auto-generated from Open API specification")
 public class RebuildOutput {
 
@@ -56,14 +56,14 @@ public class RebuildOutput {
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public Status getStatus() {
         return status;
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public void setStatus(Status status) {
         this.status = status;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RestartInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RestartInput.java
index 4df2184c4..e2119b709 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RestartInput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RestartInput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.623+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.413Z",
     comments = "Auto-generated from Open API specification")
 public class RestartInput {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RestartOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RestartOutput.java
index 8c44631dd..6fbcf9282 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RestartOutput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RestartOutput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.629+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.414Z",
     comments = "Auto-generated from Open API specification")
 public class RestartOutput {
 
@@ -56,14 +56,14 @@ public class RestartOutput {
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public Status getStatus() {
         return status;
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public void setStatus(Status status) {
         this.status = status;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ResumeTrafficInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ResumeTrafficInput.java
new file mode 100644
index 000000000..d6f9b362a
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ResumeTrafficInput.java
@@ -0,0 +1,89 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@javax.annotation.Generated(
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-27T12:27:49.064-06:00",
+    comments = "Auto-generated from Open API specification")
+public class ResumeTrafficInput {
+
+    @JsonProperty("common-header")
+    private CommonHeader commonHeader;
+
+    @JsonProperty("action")
+    private Action action;
+
+    @JsonProperty("action-identifiers")
+    private ActionIdentifiers actionIdentifiers;
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public CommonHeader getCommonHeader() {
+        return commonHeader;
+    }
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public void setCommonHeader(CommonHeader commonHeader) {
+        this.commonHeader = commonHeader;
+    }
+
+    /**
+     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
+     */
+    public Action getAction() {
+        return action;
+    }
+
+    /**
+     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
+     */
+    public void setAction(Action action) {
+        this.action = action;
+    }
+
+    /**
+     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
+     */
+    public ActionIdentifiers getActionIdentifiers() {
+        return actionIdentifiers;
+    }
+
+    /**
+     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
+     */
+    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
+        this.actionIdentifiers = actionIdentifiers;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ResumeTrafficOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ResumeTrafficOutput.java
new file mode 100644
index 000000000..89207cbb2
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ResumeTrafficOutput.java
@@ -0,0 +1,72 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@javax.annotation.Generated(
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-27T12:27:49.068-06:00",
+    comments = "Auto-generated from Open API specification")
+public class ResumeTrafficOutput {
+
+    @JsonProperty("common-header")
+    private CommonHeader commonHeader;
+
+    @JsonProperty("status")
+    private Status status;
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public CommonHeader getCommonHeader() {
+        return commonHeader;
+    }
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public void setCommonHeader(CommonHeader commonHeader) {
+        this.commonHeader = commonHeader;
+    }
+
+    /**
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
+     */
+    public Status getStatus() {
+        return status;
+    }
+
+    /**
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
+     */
+    public void setStatus(Status status) {
+        this.status = status;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RollbackInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RollbackInput.java
index db688c0ec..ffa0d91ff 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RollbackInput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RollbackInput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.653+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.421Z",
     comments = "Auto-generated from Open API specification")
 public class RollbackInput {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RollbackOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RollbackOutput.java
index 21aa1f08f..84f121d3c 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RollbackOutput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/RollbackOutput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.656+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.429Z",
     comments = "Auto-generated from Open API specification")
 public class RollbackOutput {
 
@@ -56,14 +56,14 @@ public class RollbackOutput {
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public Status getStatus() {
         return status;
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public void setStatus(Status status) {
         this.status = status;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SnapshotInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SnapshotInput.java
index b3492c2dd..ef4a70326 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SnapshotInput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SnapshotInput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.659+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.429Z",
     comments = "Auto-generated from Open API specification")
 public class SnapshotInput {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SnapshotOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SnapshotOutput.java
index 9036b2607..9d4780e8e 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SnapshotOutput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SnapshotOutput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.665+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.432Z",
     comments = "Auto-generated from Open API specification")
 public class SnapshotOutput {
 
@@ -59,14 +59,14 @@ public class SnapshotOutput {
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public Status getStatus() {
         return status;
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public void setStatus(Status status) {
         this.status = status;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SoftwareUploadInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SoftwareUploadInput.java
index 270121a96..208778073 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SoftwareUploadInput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SoftwareUploadInput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.668+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.433Z",
     comments = "Auto-generated from Open API specification")
 public class SoftwareUploadInput {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SoftwareUploadOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SoftwareUploadOutput.java
index 8e32dd3a2..061f76bef 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SoftwareUploadOutput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SoftwareUploadOutput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.672+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.434Z",
     comments = "Auto-generated from Open API specification")
 public class SoftwareUploadOutput {
 
@@ -56,14 +56,14 @@ public class SoftwareUploadOutput {
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public Status getStatus() {
         return status;
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public void setStatus(Status status) {
         this.status = status;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartApplicationInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartApplicationInput.java
index dca0bc47b..f6f5d0a27 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartApplicationInput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartApplicationInput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-07-19T14:31:26.579+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.436Z",
     comments = "Auto-generated from Open API specification")
 public class StartApplicationInput {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartApplicationOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartApplicationOutput.java
index 061f2476e..4d7f8bee4 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartApplicationOutput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartApplicationOutput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-07-19T14:31:26.58+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.437Z",
     comments = "Auto-generated from Open API specification")
 public class StartApplicationOutput {
 
@@ -56,14 +56,14 @@ public class StartApplicationOutput {
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public Status getStatus() {
         return status;
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public void setStatus(Status status) {
         this.status = status;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartInput.java
index 3e0829b52..78c3d7d9c 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartInput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartInput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.675+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.435Z",
     comments = "Auto-generated from Open API specification")
 public class StartInput {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartOutput.java
index 1efcae95d..f589a23b8 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartOutput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StartOutput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.679+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.435Z",
     comments = "Auto-generated from Open API specification")
 public class StartOutput {
 
@@ -56,14 +56,14 @@ public class StartOutput {
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public Status getStatus() {
         return status;
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public void setStatus(Status status) {
         this.status = status;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Status.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Status.java
index 85f64c790..b3593b483 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Status.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/Status.java
@@ -30,11 +30,11 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+ * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
  */
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.507+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.325Z",
     comments = "Auto-generated from Open API specification")
 public class Status {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopApplicationInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopApplicationInput.java
index dc9bf4840..3ba9cb98f 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopApplicationInput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopApplicationInput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-07-19T14:31:26.586+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.439Z",
     comments = "Auto-generated from Open API specification")
 public class StopApplicationInput {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopApplicationOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopApplicationOutput.java
index d0193a16d..11c97685c 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopApplicationOutput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopApplicationOutput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-07-19T14:31:26.588+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.44Z",
     comments = "Auto-generated from Open API specification")
 public class StopApplicationOutput {
 
@@ -56,14 +56,14 @@ public class StopApplicationOutput {
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public Status getStatus() {
         return status;
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public void setStatus(Status status) {
         this.status = status;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopInput.java
index f5477405e..de65a9669 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopInput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopInput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.689+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.438Z",
     comments = "Auto-generated from Open API specification")
 public class StopInput {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopOutput.java
index 9160a98f7..ba852c8fe 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopOutput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/StopOutput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.692+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.439Z",
     comments = "Auto-generated from Open API specification")
 public class StopOutput {
 
@@ -56,14 +56,14 @@ public class StopOutput {
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public Status getStatus() {
         return status;
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public void setStatus(Status status) {
         this.status = status;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SyncInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SyncInput.java
index 2928c76a2..c8e1d997b 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SyncInput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SyncInput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.695+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.441Z",
     comments = "Auto-generated from Open API specification")
 public class SyncInput {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SyncOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SyncOutput.java
index 82347d295..8ad92139e 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SyncOutput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/SyncOutput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.698+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.441Z",
     comments = "Auto-generated from Open API specification")
 public class SyncOutput {
 
@@ -59,14 +59,14 @@ public class SyncOutput {
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public Status getStatus() {
         return status;
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public void setStatus(Status status) {
         this.status = status;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TerminateInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TerminateInput.java
index de45dddda..00c3ffa24 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TerminateInput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TerminateInput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.701+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.442Z",
     comments = "Auto-generated from Open API specification")
 public class TerminateInput {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TerminateOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TerminateOutput.java
index 1a78f0e3f..b323be906 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TerminateOutput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TerminateOutput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.704+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.451Z",
     comments = "Auto-generated from Open API specification")
 public class TerminateOutput {
 
@@ -56,14 +56,14 @@ public class TerminateOutput {
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public Status getStatus() {
         return status;
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public void setStatus(Status status) {
         this.status = status;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TestInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TestInput.java
index 33dab668e..88872fa00 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TestInput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TestInput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.706+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.452Z",
     comments = "Auto-generated from Open API specification")
 public class TestInput {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TestOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TestOutput.java
index 283a92d7e..139e2c8b2 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TestOutput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/TestOutput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.708+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.453Z",
     comments = "Auto-generated from Open API specification")
 public class TestOutput {
 
@@ -56,14 +56,14 @@ public class TestOutput {
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public Status getStatus() {
         return status;
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public void setStatus(Status status) {
         this.status = status;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UnlockInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UnlockInput.java
index b03c683b7..c0deccff9 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UnlockInput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UnlockInput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.711+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.459Z",
     comments = "Auto-generated from Open API specification")
 public class UnlockInput {
 
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UnlockOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UnlockOutput.java
index 9830c8f87..a6d5de193 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UnlockOutput.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UnlockOutput.java
@@ -30,8 +30,8 @@ package org.onap.appc.client.lcm.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.716+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.468Z",
     comments = "Auto-generated from Open API specification")
 public class UnlockOutput {
 
@@ -56,14 +56,14 @@ public class UnlockOutput {
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public Status getStatus() {
         return status;
     }
 
     /**
-     * The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
      */
     public void setStatus(Status status) {
         this.status = status;
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeBackoutInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeBackoutInput.java
new file mode 100644
index 000000000..85a0e687a
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeBackoutInput.java
@@ -0,0 +1,106 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@javax.annotation.Generated(
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-27T12:27:49.159-06:00",
+    comments = "Auto-generated from Open API specification")
+public class UpgradeBackoutInput {
+
+    @JsonProperty("common-header")
+    private CommonHeader commonHeader;
+
+    @JsonProperty("action")
+    private Action action;
+
+    @JsonProperty("action-identifiers")
+    private ActionIdentifiers actionIdentifiers;
+
+    @JsonProperty("payload")
+    private Payload payload;
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public CommonHeader getCommonHeader() {
+        return commonHeader;
+    }
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public void setCommonHeader(CommonHeader commonHeader) {
+        this.commonHeader = commonHeader;
+    }
+
+    /**
+     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
+     */
+    public Action getAction() {
+        return action;
+    }
+
+    /**
+     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
+     */
+    public void setAction(Action action) {
+        this.action = action;
+    }
+
+    /**
+     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
+     */
+    public ActionIdentifiers getActionIdentifiers() {
+        return actionIdentifiers;
+    }
+
+    /**
+     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
+     */
+    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
+        this.actionIdentifiers = actionIdentifiers;
+    }
+
+    /**
+     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
+     */
+    public Payload getPayload() {
+        return payload;
+    }
+
+    /**
+     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
+     */
+    public void setPayload(Payload payload) {
+        this.payload = payload;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeBackoutOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeBackoutOutput.java
new file mode 100644
index 000000000..2ca81eb9f
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeBackoutOutput.java
@@ -0,0 +1,72 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@javax.annotation.Generated(
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-27T12:27:49.162-06:00",
+    comments = "Auto-generated from Open API specification")
+public class UpgradeBackoutOutput {
+
+    @JsonProperty("common-header")
+    private CommonHeader commonHeader;
+
+    @JsonProperty("status")
+    private Status status;
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public CommonHeader getCommonHeader() {
+        return commonHeader;
+    }
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public void setCommonHeader(CommonHeader commonHeader) {
+        this.commonHeader = commonHeader;
+    }
+
+    /**
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
+     */
+    public Status getStatus() {
+        return status;
+    }
+
+    /**
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
+     */
+    public void setStatus(Status status) {
+        this.status = status;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeBackupInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeBackupInput.java
new file mode 100644
index 000000000..f93142fb0
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeBackupInput.java
@@ -0,0 +1,106 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@javax.annotation.Generated(
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-27T12:27:49.165-06:00",
+    comments = "Auto-generated from Open API specification")
+public class UpgradeBackupInput {
+
+    @JsonProperty("common-header")
+    private CommonHeader commonHeader;
+
+    @JsonProperty("action")
+    private Action action;
+
+    @JsonProperty("action-identifiers")
+    private ActionIdentifiers actionIdentifiers;
+
+    @JsonProperty("payload")
+    private Payload payload;
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public CommonHeader getCommonHeader() {
+        return commonHeader;
+    }
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public void setCommonHeader(CommonHeader commonHeader) {
+        this.commonHeader = commonHeader;
+    }
+
+    /**
+     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
+     */
+    public Action getAction() {
+        return action;
+    }
+
+    /**
+     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
+     */
+    public void setAction(Action action) {
+        this.action = action;
+    }
+
+    /**
+     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
+     */
+    public ActionIdentifiers getActionIdentifiers() {
+        return actionIdentifiers;
+    }
+
+    /**
+     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
+     */
+    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
+        this.actionIdentifiers = actionIdentifiers;
+    }
+
+    /**
+     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
+     */
+    public Payload getPayload() {
+        return payload;
+    }
+
+    /**
+     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
+     */
+    public void setPayload(Payload payload) {
+        this.payload = payload;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeBackupOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeBackupOutput.java
new file mode 100644
index 000000000..55d12c29f
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeBackupOutput.java
@@ -0,0 +1,72 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@javax.annotation.Generated(
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-27T12:27:49.169-06:00",
+    comments = "Auto-generated from Open API specification")
+public class UpgradeBackupOutput {
+
+    @JsonProperty("common-header")
+    private CommonHeader commonHeader;
+
+    @JsonProperty("status")
+    private Status status;
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public CommonHeader getCommonHeader() {
+        return commonHeader;
+    }
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public void setCommonHeader(CommonHeader commonHeader) {
+        this.commonHeader = commonHeader;
+    }
+
+    /**
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
+     */
+    public Status getStatus() {
+        return status;
+    }
+
+    /**
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
+     */
+    public void setStatus(Status status) {
+        this.status = status;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradePostCheckInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradePostCheckInput.java
new file mode 100644
index 000000000..268833737
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradePostCheckInput.java
@@ -0,0 +1,106 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@javax.annotation.Generated(
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-27T12:27:49.172-06:00",
+    comments = "Auto-generated from Open API specification")
+public class UpgradePostCheckInput {
+
+    @JsonProperty("common-header")
+    private CommonHeader commonHeader;
+
+    @JsonProperty("action")
+    private Action action;
+
+    @JsonProperty("action-identifiers")
+    private ActionIdentifiers actionIdentifiers;
+
+    @JsonProperty("payload")
+    private Payload payload;
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public CommonHeader getCommonHeader() {
+        return commonHeader;
+    }
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public void setCommonHeader(CommonHeader commonHeader) {
+        this.commonHeader = commonHeader;
+    }
+
+    /**
+     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
+     */
+    public Action getAction() {
+        return action;
+    }
+
+    /**
+     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
+     */
+    public void setAction(Action action) {
+        this.action = action;
+    }
+
+    /**
+     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
+     */
+    public ActionIdentifiers getActionIdentifiers() {
+        return actionIdentifiers;
+    }
+
+    /**
+     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
+     */
+    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
+        this.actionIdentifiers = actionIdentifiers;
+    }
+
+    /**
+     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
+     */
+    public Payload getPayload() {
+        return payload;
+    }
+
+    /**
+     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
+     */
+    public void setPayload(Payload payload) {
+        this.payload = payload;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradePostCheckOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradePostCheckOutput.java
new file mode 100644
index 000000000..010b0f316
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradePostCheckOutput.java
@@ -0,0 +1,72 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@javax.annotation.Generated(
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-27T12:27:49.175-06:00",
+    comments = "Auto-generated from Open API specification")
+public class UpgradePostCheckOutput {
+
+    @JsonProperty("common-header")
+    private CommonHeader commonHeader;
+
+    @JsonProperty("status")
+    private Status status;
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public CommonHeader getCommonHeader() {
+        return commonHeader;
+    }
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public void setCommonHeader(CommonHeader commonHeader) {
+        this.commonHeader = commonHeader;
+    }
+
+    /**
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
+     */
+    public Status getStatus() {
+        return status;
+    }
+
+    /**
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
+     */
+    public void setStatus(Status status) {
+        this.status = status;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradePreCheckInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradePreCheckInput.java
new file mode 100644
index 000000000..d102fae57
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradePreCheckInput.java
@@ -0,0 +1,106 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@javax.annotation.Generated(
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-27T12:27:49.178-06:00",
+    comments = "Auto-generated from Open API specification")
+public class UpgradePreCheckInput {
+
+    @JsonProperty("common-header")
+    private CommonHeader commonHeader;
+
+    @JsonProperty("action")
+    private Action action;
+
+    @JsonProperty("action-identifiers")
+    private ActionIdentifiers actionIdentifiers;
+
+    @JsonProperty("payload")
+    private Payload payload;
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public CommonHeader getCommonHeader() {
+        return commonHeader;
+    }
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public void setCommonHeader(CommonHeader commonHeader) {
+        this.commonHeader = commonHeader;
+    }
+
+    /**
+     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
+     */
+    public Action getAction() {
+        return action;
+    }
+
+    /**
+     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
+     */
+    public void setAction(Action action) {
+        this.action = action;
+    }
+
+    /**
+     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
+     */
+    public ActionIdentifiers getActionIdentifiers() {
+        return actionIdentifiers;
+    }
+
+    /**
+     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
+     */
+    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
+        this.actionIdentifiers = actionIdentifiers;
+    }
+
+    /**
+     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
+     */
+    public Payload getPayload() {
+        return payload;
+    }
+
+    /**
+     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
+     */
+    public void setPayload(Payload payload) {
+        this.payload = payload;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradePreCheckOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradePreCheckOutput.java
new file mode 100644
index 000000000..f2765c27f
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradePreCheckOutput.java
@@ -0,0 +1,72 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@javax.annotation.Generated(
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-27T12:27:49.182-06:00",
+    comments = "Auto-generated from Open API specification")
+public class UpgradePreCheckOutput {
+
+    @JsonProperty("common-header")
+    private CommonHeader commonHeader;
+
+    @JsonProperty("status")
+    private Status status;
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public CommonHeader getCommonHeader() {
+        return commonHeader;
+    }
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public void setCommonHeader(CommonHeader commonHeader) {
+        this.commonHeader = commonHeader;
+    }
+
+    /**
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
+     */
+    public Status getStatus() {
+        return status;
+    }
+
+    /**
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
+     */
+    public void setStatus(Status status) {
+        this.status = status;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeSoftwareInput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeSoftwareInput.java
new file mode 100644
index 000000000..3e217dff9
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeSoftwareInput.java
@@ -0,0 +1,106 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@javax.annotation.Generated(
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-27T12:27:49.186-06:00",
+    comments = "Auto-generated from Open API specification")
+public class UpgradeSoftwareInput {
+
+    @JsonProperty("common-header")
+    private CommonHeader commonHeader;
+
+    @JsonProperty("action")
+    private Action action;
+
+    @JsonProperty("action-identifiers")
+    private ActionIdentifiers actionIdentifiers;
+
+    @JsonProperty("payload")
+    private Payload payload;
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public CommonHeader getCommonHeader() {
+        return commonHeader;
+    }
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public void setCommonHeader(CommonHeader commonHeader) {
+        this.commonHeader = commonHeader;
+    }
+
+    /**
+     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
+     */
+    public Action getAction() {
+        return action;
+    }
+
+    /**
+     * The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate
+     */
+    public void setAction(Action action) {
+        this.action = action;
+    }
+
+    /**
+     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
+     */
+    public ActionIdentifiers getActionIdentifiers() {
+        return actionIdentifiers;
+    }
+
+    /**
+     * A block containing the action arguments. These are used to specify the object upon which APP-C LCM command is to operate
+     */
+    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
+        this.actionIdentifiers = actionIdentifiers;
+    }
+
+    /**
+     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
+     */
+    public Payload getPayload() {
+        return payload;
+    }
+
+    /**
+     * The payload can be any valid JSON string value. Json escape characters need to be added when required to include an inner json within the payload to make it a valid json string value
+     */
+    public void setPayload(Payload payload) {
+        this.payload = payload;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeSoftwareOutput.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeSoftwareOutput.java
new file mode 100644
index 000000000..e0dc518aa
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/UpgradeSoftwareOutput.java
@@ -0,0 +1,72 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@javax.annotation.Generated(
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-27T12:27:49.19-06:00",
+    comments = "Auto-generated from Open API specification")
+public class UpgradeSoftwareOutput {
+
+    @JsonProperty("common-header")
+    private CommonHeader commonHeader;
+
+    @JsonProperty("status")
+    private Status status;
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public CommonHeader getCommonHeader() {
+        return commonHeader;
+    }
+
+    /**
+     * A common header for all APP-C requests
+     */
+    public void setCommonHeader(CommonHeader commonHeader) {
+        this.commonHeader = commonHeader;
+    }
+
+    /**
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
+     */
+    public Status getStatus() {
+        return status;
+    }
+
+    /**
+     * The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement
+     */
+    public void setStatus(Status status) {
+        this.status = status;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/VmState.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/VmState.java
new file mode 100644
index 000000000..350ca2796
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/VmState.java
@@ -0,0 +1,64 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+
+/**
+* The state of a VM
+*
+*/
+public enum VmState {
+
+    active("active"),
+    standby("standby"),
+    inactive("inactive"),
+    unknown("unknown");
+
+    private String value;
+
+    VmState(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static VmState fromValue(String text) {
+        for (VmState var : VmState.values()) {
+            if (String.valueOf(var.value).equals(text)) {
+                return var;
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/VmStatus.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/VmStatus.java
new file mode 100644
index 000000000..3193a4fce
--- /dev/null
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/VmStatus.java
@@ -0,0 +1,63 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+/**
+ * NOTE: This file is auto-generated and should not be changed manually.
+ */
+package org.onap.appc.client.lcm.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+
+/**
+* The status of a VM
+*
+*/
+public enum VmStatus {
+
+    healthy("healthy"),
+    unhealthy("unhealthy"),
+    unknown("unknown");
+
+    private String value;
+
+    VmStatus(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static VmStatus fromValue(String text) {
+        for (VmStatus var : VmStatus.values()) {
+            if (String.valueOf(var.value).equals(text)) {
+                return var;
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ZULU.java b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ZULU.java
index 416b56a20..5d8c33678 100644
--- a/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ZULU.java
+++ b/appc-client/client-kit/src/main/java/org/onap/appc/client/lcm/model/ZULU.java
@@ -34,8 +34,8 @@ import com.fasterxml.jackson.annotation.JsonValue;
  * Define a common definition of a time stamp (expressed as a formatted string) as follows yyyy-MM-ddTHH:mm:ss.SSSSSSSSZ
  */
 @javax.annotation.Generated(
-    value = {"templates/client-kit/open-api-to-java.ftl"},
-    date = "2017-05-04T20:09:01.441+05:30",
+    value = {"client-kit/open-api-to-java.ftl"},
+    date = "2017-11-16T17:10:10.189Z",
     comments = "Auto-generated from Open API specification")
 public class ZULU {
 
diff --git a/appc-client/client-kit/src/test/java/client/lcm/api/AppcClientServiceFactoryProviderTest.java b/appc-client/client-kit/src/test/java/client/lcm/api/AppcClientServiceFactoryProviderTest.java
index 9c06f5aa3..687acea52 100644
--- a/appc-client/client-kit/src/test/java/client/lcm/api/AppcClientServiceFactoryProviderTest.java
+++ b/appc-client/client-kit/src/test/java/client/lcm/api/AppcClientServiceFactoryProviderTest.java
@@ -9,15 +9,15 @@
  * 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.
- *
+ * 
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
diff --git a/appc-client/client-kit/src/test/java/client/lcm/api/ApplicationContextTest.java b/appc-client/client-kit/src/test/java/client/lcm/api/ApplicationContextTest.java
index 5bfad74dd..8c8419e6e 100644
--- a/appc-client/client-kit/src/test/java/client/lcm/api/ApplicationContextTest.java
+++ b/appc-client/client-kit/src/test/java/client/lcm/api/ApplicationContextTest.java
@@ -1,3 +1,27 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
 package client.lcm.api;
 
 import org.junit.Assert;
diff --git a/appc-client/client-kit/src/test/java/org/onap/appc/client/lcm/impl/business/TestAppcLifeCycleManagerServiceFactoryImpl.java b/appc-client/client-kit/src/test/java/org/onap/appc/client/lcm/impl/business/TestAppcLifeCycleManagerServiceFactoryImpl.java
index 6b24b0a83..2e219df97 100644
--- a/appc-client/client-kit/src/test/java/org/onap/appc/client/lcm/impl/business/TestAppcLifeCycleManagerServiceFactoryImpl.java
+++ b/appc-client/client-kit/src/test/java/org/onap/appc/client/lcm/impl/business/TestAppcLifeCycleManagerServiceFactoryImpl.java
@@ -1,3 +1,27 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
 package org.onap.appc.client.lcm.impl.business;
 
 
diff --git a/appc-client/client-kit/src/test/java/org/onap/appc/client/lcm/model/TestModelPOJO.java b/appc-client/client-kit/src/test/java/org/onap/appc/client/lcm/model/TestModelPOJO.java
index 9cb3b9f56..a58b3e7ab 100644
--- a/appc-client/client-kit/src/test/java/org/onap/appc/client/lcm/model/TestModelPOJO.java
+++ b/appc-client/client-kit/src/test/java/org/onap/appc/client/lcm/model/TestModelPOJO.java
@@ -1,3 +1,27 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
 package org.onap.appc.client.lcm.model;
 
 import org.junit.Assert;
diff --git a/appc-client/client-kit/src/test/resources/data/client-simulator.properties b/appc-client/client-kit/src/test/resources/data/client-simulator.properties
index 4125e2fb6..ec3358070 100644
--- a/appc-client/client-kit/src/test/resources/data/client-simulator.properties
+++ b/appc-client/client-kit/src/test/resources/data/client-simulator.properties
@@ -1,3 +1,27 @@
+###
+# ============LICENSE_START=======================================================
+# ONAP : APPC
+# ================================================================================
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
+# 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.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+# ============LICENSE_END=========================================================
+###
+
 #
 # Default Properties - Configured for client simulator
 #
diff --git a/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/protocol/ConsumerImpl.java b/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/protocol/ConsumerImpl.java
index 913f80f44..8fc678828 100644
--- a/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/protocol/ConsumerImpl.java
+++ b/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/protocol/ConsumerImpl.java
@@ -105,6 +105,14 @@ class ConsumerImpl implements Consumer {
         builder.usingHosts(hosts).onTopic(topic).knownAs(group, groupId);
         builder.withSocketTimeout(timeout + 5000).waitAtServer(timeout);
         builder.receivingAtMost(DEFAULT_LIMIT);
+        
+        //added for loop for defect 354330
+        for (String url : hosts) {
+            if (url.contains("3905") || url.contains("https")) {
+            	builder.usingHttps(true);
+                break;
+            }
+        }
 
         // Add credentials if provided
         if (authKey != null && authSecret != null) {
diff --git a/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/protocol/ProducerImpl.java b/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/protocol/ProducerImpl.java
index 7729db98d..b979c9d48 100644
--- a/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/protocol/ProducerImpl.java
+++ b/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/protocol/ProducerImpl.java
@@ -62,6 +62,14 @@ class ProducerImpl implements Producer {
     private CambriaBatchingPublisher getProducer() throws MalformedURLException, GeneralSecurityException {
 
         PublisherBuilder builder = new PublisherBuilder().usingHosts(hosts);
+        
+        //added for loop for defect 354330
+        for (String url : hosts) {
+            if (url.contains("3905") || url.contains("https")) {
+            	builder.usingHttps(true);
+                break;
+            }
+        }
 
         // Add credentials if provided
         if (authKey != null && authSecret != null) {
diff --git a/appc-client/client-simulator/src/test/java/org/onap/appc/simulator/client/impl/TestJsonRequestHandler.java b/appc-client/client-simulator/src/test/java/org/onap/appc/simulator/client/impl/TestJsonRequestHandler.java
index ba3696f26..fed8a22ad 100644
--- a/appc-client/client-simulator/src/test/java/org/onap/appc/simulator/client/impl/TestJsonRequestHandler.java
+++ b/appc-client/client-simulator/src/test/java/org/onap/appc/simulator/client/impl/TestJsonRequestHandler.java
@@ -1,14 +1,42 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
 package org.onap.appc.simulator.client.impl;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.io.filefilter.WildcardFileFilter;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Matchers;
 import org.mockito.Mockito;
 import org.onap.appc.client.lcm.api.LifeCycleManagerStateful;
 import org.onap.appc.client.lcm.exceptions.AppcClientException;
+import org.onap.appc.simulator.client.main.ClientRunner;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
@@ -50,4 +78,4 @@ public class TestJsonRequestHandler {
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/appc-client/client-simulator/src/test/java/org/onap/appc/simulator/client/impl/TestJsonResponseHandler.java b/appc-client/client-simulator/src/test/java/org/onap/appc/simulator/client/impl/TestJsonResponseHandler.java
index 59ffe1b31..fe0e1ad59 100644
--- a/appc-client/client-simulator/src/test/java/org/onap/appc/simulator/client/impl/TestJsonResponseHandler.java
+++ b/appc-client/client-simulator/src/test/java/org/onap/appc/simulator/client/impl/TestJsonResponseHandler.java
@@ -1,8 +1,46 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
 package org.onap.appc.simulator.client.impl;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.io.filefilter.WildcardFileFilter;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Matchers;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.internal.stubbing.defaultanswers.ReturnsSmartNulls;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
 import java.io.*;
 import java.net.URISyntaxException;
 import java.nio.file.Path;
diff --git a/appc-client/client-simulator/src/test/java/org/onap/appc/simulator/client/main/TestClientRunner.java b/appc-client/client-simulator/src/test/java/org/onap/appc/simulator/client/main/TestClientRunner.java
index db648f957..ffb3d2a8a 100644
--- a/appc-client/client-simulator/src/test/java/org/onap/appc/simulator/client/main/TestClientRunner.java
+++ b/appc-client/client-simulator/src/test/java/org/onap/appc/simulator/client/main/TestClientRunner.java
@@ -1,14 +1,43 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
 package org.onap.appc.simulator.client.main;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import org.apache.commons.io.filefilter.WildcardFileFilter;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
 import org.mockito.Matchers;
+import org.mockito.Mock;
 import org.mockito.Mockito;
+import org.mockito.internal.stubbing.answers.DoesNothing;
 import org.onap.appc.client.lcm.exceptions.AppcClientException;
+import org.onap.appc.simulator.client.RequestHandler;
 import org.onap.appc.simulator.client.impl.JsonRequestHandler;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
diff --git a/appc-client/client-simulator/src/test/resources/data/client-simulator.properties b/appc-client/client-simulator/src/test/resources/data/client-simulator.properties
index 4125e2fb6..ec3358070 100644
--- a/appc-client/client-simulator/src/test/resources/data/client-simulator.properties
+++ b/appc-client/client-simulator/src/test/resources/data/client-simulator.properties
@@ -1,3 +1,27 @@
+###
+# ============LICENSE_START=======================================================
+# ONAP : APPC
+# ================================================================================
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
+# 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.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+# ============LICENSE_END=========================================================
+###
+
 #
 # Default Properties - Configured for client simulator
 #
diff --git a/appc-client/code-generator/src/test/java/org/onap/appc/tools/generator/api/CLITest.java b/appc-client/code-generator/src/test/java/org/onap/appc/tools/generator/api/CLITest.java
index 4cd6bb5f5..4ae3c3b61 100644
--- a/appc-client/code-generator/src/test/java/org/onap/appc/tools/generator/api/CLITest.java
+++ b/appc-client/code-generator/src/test/java/org/onap/appc/tools/generator/api/CLITest.java
@@ -1,3 +1,27 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
 package org.onap.appc.tools.generator.api;
 
 import org.junit.Assert;
diff --git a/appc-client/code-generator/src/test/java/org/onap/appc/tools/generator/impl/CodeGenWriterTest.java b/appc-client/code-generator/src/test/java/org/onap/appc/tools/generator/impl/CodeGenWriterTest.java
index e0669b836..2a1c409fd 100644
--- a/appc-client/code-generator/src/test/java/org/onap/appc/tools/generator/impl/CodeGenWriterTest.java
+++ b/appc-client/code-generator/src/test/java/org/onap/appc/tools/generator/impl/CodeGenWriterTest.java
@@ -1,3 +1,27 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
 package org.onap.appc.tools.generator.impl;
 
 import org.junit.Assert;