diff options
Diffstat (limited to 'dcae-controller-service-cdap')
13 files changed, 163 insertions, 24 deletions
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceProvider.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceProvider.java index aa0ad80..186e03f 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceProvider.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceProvider.java @@ -43,6 +43,8 @@ import org.openecomp.dcae.controller.service.cdap.CdapApplication; import org.openecomp.dcae.controller.service.cdap.CdapArtifact; import org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep; import org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfigStep; +import org.openecomp.dcae.controller.service.cdap.CdapDeleteAppStep; +import org.openecomp.dcae.controller.service.cdap.CdapDeleteArtifact; import org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep; import org.openecomp.dcae.controller.service.cdap.CdapFactory; import org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration; @@ -60,6 +62,7 @@ import org.openecomp.dcae.controller.service.cdap.CdapStopAppStep; import org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep; import org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep; import org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep; +import org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep; import org.openecomp.dcae.controller.service.cdap.cluster.servers.manager.DcaeCdapClusterManagerConsole; import org.openecomp.dcae.controller.service.cdap.cluster.servers.service.DcaeCdapClusterService; import org.openecomp.dcae.controller.service.cdap.cluster.servers.service.DcaeCdapClusterServiceProvider; @@ -98,7 +101,7 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider { throw new RuntimeException("Unable to find container object: " + containerPath); } if (!(s.o instanceof CdapClusterServiceInstance)) - throw new RuntimeException("Unable to deploy to this container: " + s.o); + throw new RuntimeException("Unable to deploy to this non cdap cluster container: " + containerPath); i.setClusterService((CdapClusterServiceInstance) s.o); } i.setCdapName(cdapName(i)); @@ -190,7 +193,7 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider { } if (s instanceof CdapStopAppStep) { CdapStopAppStep s1 = (CdapStopAppStep) s; - console.stopApp(i.getCdapName(), s1.getAppId()); + console.stopApp(i.getCdapName(), s1.getAppId(),s1.getProgramTypes()); continue; } if (s instanceof CdapStopFlowStep) { @@ -213,6 +216,22 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider { console.resumeSchedule(i.getCdapName(), s1.getAppId(), s1.getScheduleId()); continue; } + if (s instanceof CdapDeleteAppStep) { + CdapDeleteAppStep s1 = (CdapDeleteAppStep) s; + console.deleteApp(i.getCdapName(), s1.getAppId()); + continue; + } + if (s instanceof CdapDeleteArtifact) { + CdapDeleteArtifact s1 = (CdapDeleteArtifact) s; + console.deleteArtifact(i.getCdapName(), s1.getArtifactName(),s1.getVersion()); + continue; + } + if (s instanceof CdapSuspendScheduleStep) { + CdapSuspendScheduleStep s1 = (CdapSuspendScheduleStep) s; + console.suspendSchedule(i.getCdapName(), s1.getAppId(),s1.getScheduleId()); + continue; + } + throw new RuntimeException("Unable to support: " + s.eClass().getName()); } } @@ -235,7 +254,7 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider { } for (String a : i.getAppNames()) { try { - console.stopApp(i.getCdapName(), a); + console.stopApp(i.getCdapName(), a, null); } catch (Exception e) { e.printStackTrace(); } @@ -253,7 +272,7 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider { } for (CdapApplication a : i.getApps()) { try { - console.stopApp(i.getCdapName(), a.getName()); + console.stopApp(i.getCdapName(), a.getName(), null); console.deleteApp(i.getCdapName(), a.getName()); console.deleteArtifact(i.getCdapName(), a.getArtifactName(), a.getVersion()); } catch (Exception e) { @@ -270,14 +289,14 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider { synchronized (i) { for (CdapArtifact a : i.getArtifacts()) { try { - console.stopApp(i.getCdapName(), a.getName()); + console.stopApp(i.getCdapName(), a.getName(), null); } catch (Exception e) { e.printStackTrace(); } } for (CdapApplication a : i.getApps()) { try { - console.stopApp(i.getCdapName(), a.getName()); + console.stopApp(i.getCdapName(), a.getName(),null); } catch (Exception e) { e.printStackTrace(); } diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/java/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerProvider.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/java/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerProvider.java index 5680c6f..c27689f 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/java/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerProvider.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/java/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerProvider.java @@ -223,8 +223,8 @@ public class DcaeCdapClusterManagerProvider extends DcaeVirtualMachineManagerPro // System.err.println(json.toString(2)); } - public String stopApp(String namespace, String appName) { - return getCluster().stopApp(namespace, appName); + public String stopApp(String namespace, String appName, String programTypes) { + return getCluster().stopApp(namespace, appName, programTypes); } public String startWorker(String namespace, String appName, diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManager.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManager.java index 9258c81..23555cd 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManager.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManager.java @@ -818,21 +818,21 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl implements IS return res; } - public java.lang.String stopApp(java.lang.String namespace, java.lang.String appName) { + public java.lang.String stopApp(java.lang.String namespace, java.lang.String appName, java.lang.String programTypes) { java.lang.String res = null; long duration_ = 0; if (server != null) - server.getServer().recordApi(null, this, "stopApp", ApiRequestStatus.START, duration_,namespace,appName); + server.getServer().recordApi(null, this, "stopApp", ApiRequestStatus.START, duration_,namespace,appName,programTypes); Date now_ = new Date(); ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_stopApp,server,this); ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_stopApp,"self:" + ManagementServer.object2ref(this)); try { - res = controller.stopApp(namespace,appName); + res = controller.stopApp(namespace,appName,programTypes); } catch (Exception e) { duration_ = new Date().getTime()-now_.getTime(); if (server != null) - server.getServer().recordApi(null, this, "stopApp", ApiRequestStatus.ERROR, duration_,namespace,appName); + server.getServer().recordApi(null, this, "stopApp", ApiRequestStatus.ERROR, duration_,namespace,appName,programTypes); System.err.println("ERROR: " + e); ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_stopApp, e.toString()); EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_stopApp,e,e.getMessage()); @@ -842,7 +842,7 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl implements IS ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) - server.getServer().recordApi(null, this, "stopApp", ApiRequestStatus.OKAY, duration_,namespace,appName); + server.getServer().recordApi(null, this, "stopApp", ApiRequestStatus.OKAY, duration_,namespace,appName,programTypes); return res; } diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerClient.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerClient.java index fb346f4..222293a 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerClient.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerClient.java @@ -543,12 +543,12 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl { } @Override - public java.lang.String stopApp(java.lang.String namespace, java.lang.String appName) { + public java.lang.String stopApp(java.lang.String namespace, java.lang.String appName, java.lang.String programTypes) { EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_stopApp,client.getRemote()); java.lang.String res; try { - res = (java.lang.String) client.operationPath("/resources", c, "stopApp", null, namespace,appName); + res = (java.lang.String) client.operationPath("/resources", c, "stopApp", null, namespace,appName,programTypes); } catch (Exception e) { ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_stopApp, e.toString()); diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerConsole.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerConsole.java index 6f89203..9a34e25 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerConsole.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerConsole.java @@ -344,10 +344,10 @@ public class DcaeCdapClusterManagerConsole extends Console { return res; } - public java.lang.String stopApp(java.lang.String namespace, java.lang.String appName) { + public java.lang.String stopApp(java.lang.String namespace, java.lang.String appName, java.lang.String programTypes) { java.lang.String res = null; try { - res = controller.stopApp(namespace,appName); + res = controller.stopApp(namespace,appName,programTypes); } catch (ManagementServerError e) { System.err.println("ERROR: " + e.getJson().toString(2)); diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerProviderTemplate.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerProviderTemplate.java index 2825ae5..b7aacb1 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerProviderTemplate.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerProviderTemplate.java @@ -124,7 +124,7 @@ public class DcaeCdapClusterManagerProviderTemplate extends DcaeVirtualMachineMa throw new UnsupportedOperationException(); } - public java.lang.String stopApp(java.lang.String namespace, java.lang.String appName) { + public java.lang.String stopApp(java.lang.String namespace, java.lang.String appName, java.lang.String programTypes) { java.lang.String res = null; // TODO IMPLEMENT throw new UnsupportedOperationException(); diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/ManagerPackage.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/ManagerPackage.java index 90aeb8f..99a4ca5 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/ManagerPackage.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/ManagerPackage.java @@ -427,7 +427,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___STOP_APP__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 10; + int CDAP_CLUSTER_MANAGER___STOP_APP__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 10; /** * The operation id for the '<em>Delete App</em>' operation. diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/impl/CdapClusterManagerImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/impl/CdapClusterManagerImpl.java index c5710dc..bd71802 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/impl/CdapClusterManagerImpl.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/impl/CdapClusterManagerImpl.java @@ -349,7 +349,7 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements * <!-- end-user-doc --> * @generated */ - public String stopApp(String namespace, String appName) { + public String stopApp(String namespace, String appName, String programTypes) { // TODO: implement this method // Ensure that you remove @generated or mark it @generated NOT throw new UnsupportedOperationException(); @@ -861,7 +861,7 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements case CdapPackage.CDAP_API___START_WORKER__STRING_STRING_STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___START_WORKER__STRING_STRING_STRING_STRING; case CdapPackage.CDAP_API___START_SERVICE__STRING_STRING_STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___START_SERVICE__STRING_STRING_STRING_STRING; case CdapPackage.CDAP_API___START_APP__STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___START_APP__STRING_STRING; - case CdapPackage.CDAP_API___STOP_APP__STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___STOP_APP__STRING_STRING; + case CdapPackage.CDAP_API___STOP_APP__STRING_STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___STOP_APP__STRING_STRING_STRING; case CdapPackage.CDAP_API___DELETE_APP__STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___DELETE_APP__STRING_STRING; case CdapPackage.CDAP_API___LOAD_PREFERENCES_APP__STRING_STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___LOAD_PREFERENCES_APP__STRING_STRING_STRING; case CdapPackage.CDAP_API___LOAD_PREFERENCES_FLOW__STRING_STRING_STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___LOAD_PREFERENCES_FLOW__STRING_STRING_STRING_STRING; @@ -926,8 +926,8 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements return startService((String)arguments.get(0), (String)arguments.get(1), (String)arguments.get(2), (String)arguments.get(3)); case ManagerPackage.CDAP_CLUSTER_MANAGER___START_APP__STRING_STRING: return startApp((String)arguments.get(0), (String)arguments.get(1)); - case ManagerPackage.CDAP_CLUSTER_MANAGER___STOP_APP__STRING_STRING: - return stopApp((String)arguments.get(0), (String)arguments.get(1)); + case ManagerPackage.CDAP_CLUSTER_MANAGER___STOP_APP__STRING_STRING_STRING: + return stopApp((String)arguments.get(0), (String)arguments.get(1), (String)arguments.get(2)); case ManagerPackage.CDAP_CLUSTER_MANAGER___DELETE_APP__STRING_STRING: return deleteApp((String)arguments.get(0), (String)arguments.get(1)); case ManagerPackage.CDAP_CLUSTER_MANAGER___LOAD_PREFERENCES_APP__STRING_STRING_STRING: diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapPackage.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapPackage.java index 7582421..881564e 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapPackage.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapPackage.java @@ -1841,13 +1841,22 @@ public interface CdapPackage extends EPackage { int CDAP_STOP_APP_STEP__APP_ID = CDAP_STEP_FEATURE_COUNT + 0; /** + * The feature id for the '<em><b>Program Types</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDAP_STOP_APP_STEP__PROGRAM_TYPES = CDAP_STEP_FEATURE_COUNT + 1; + + /** * The number of structural features of the '<em>Stop App Step</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CDAP_STOP_APP_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 1; + int CDAP_STOP_APP_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 2; /** * The number of operations of the '<em>Stop App Step</em>' class. @@ -3287,6 +3296,17 @@ public interface CdapPackage extends EPackage { EAttribute getCdapStopAppStep_AppId(); /** + * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStopAppStep#getProgramTypes <em>Program Types</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Program Types</em>'. + * @see org.openecomp.dcae.controller.service.cdap.CdapStopAppStep#getProgramTypes() + * @see #getCdapStopAppStep() + * @generated + */ + EAttribute getCdapStopAppStep_ProgramTypes(); + + /** * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep <em>Start Flow Step</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -4108,6 +4128,13 @@ public interface CdapPackage extends EPackage { */ EAttribute CDAP_STOP_APP_STEP__APP_ID = eINSTANCE.getCdapStopAppStep_AppId(); /** + * The meta object literal for the '<em><b>Program Types</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute CDAP_STOP_APP_STEP__PROGRAM_TYPES = eINSTANCE.getCdapStopAppStep_ProgramTypes(); + /** * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartFlowStepImpl <em>Start Flow Step</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopAppStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopAppStep.java index e882774..3217654 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopAppStep.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopAppStep.java @@ -13,6 +13,7 @@ package org.openecomp.dcae.controller.service.cdap; * </p> * <ul> * <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStopAppStep#getAppId <em>App Id</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStopAppStep#getProgramTypes <em>Program Types</em>}</li> * </ul> * * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStopAppStep() @@ -46,4 +47,30 @@ public interface CdapStopAppStep extends CdapStep { */ void setAppId(String value); + /** + * Returns the value of the '<em><b>Program Types</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Program Types</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Program Types</em>' attribute. + * @see #setProgramTypes(String) + * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStopAppStep_ProgramTypes() + * @model unique="false" + * @generated + */ + String getProgramTypes(); + + /** + * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStopAppStep#getProgramTypes <em>Program Types</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Program Types</em>' attribute. + * @see #getProgramTypes() + * @generated + */ + void setProgramTypes(String value); + } // CdapStopAppStep diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapPackageImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapPackageImpl.java index d2df369..176ccaf 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapPackageImpl.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapPackageImpl.java @@ -950,6 +950,15 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage { * <!-- end-user-doc --> * @generated */ + public EAttribute getCdapStopAppStep_ProgramTypes() { + return (EAttribute)cdapStopAppStepEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public EClass getCdapStartFlowStep() { return cdapStartFlowStepEClass; } @@ -1285,6 +1294,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage { cdapStopAppStepEClass = createEClass(CDAP_STOP_APP_STEP); createEAttribute(cdapStopAppStepEClass, CDAP_STOP_APP_STEP__APP_ID); + createEAttribute(cdapStopAppStepEClass, CDAP_STOP_APP_STEP__PROGRAM_TYPES); cdapStartFlowStepEClass = createEClass(CDAP_START_FLOW_STEP); createEAttribute(cdapStartFlowStepEClass, CDAP_START_FLOW_STEP__APP_ID); @@ -1469,6 +1479,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage { initEClass(cdapStopAppStepEClass, CdapStopAppStep.class, "CdapStopAppStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getCdapStopAppStep_AppId(), theEcorePackage.getEString(), "appId", null, 0, 1, CdapStopAppStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getCdapStopAppStep_ProgramTypes(), theEcorePackage.getEString(), "programTypes", null, 0, 1, CdapStopAppStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(cdapStartFlowStepEClass, CdapStartFlowStep.class, "CdapStartFlowStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getCdapStartFlowStep_AppId(), theEcorePackage.getEString(), "appId", null, 0, 1, CdapStartFlowStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopAppStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopAppStepImpl.java index 90eb037..f5229d2 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopAppStepImpl.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopAppStepImpl.java @@ -20,6 +20,7 @@ import org.openecomp.dcae.controller.service.cdap.CdapStopAppStep; * </p> * <ul> * <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopAppStepImpl#getAppId <em>App Id</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopAppStepImpl#getProgramTypes <em>Program Types</em>}</li> * </ul> * * @generated @@ -46,6 +47,26 @@ public class CdapStopAppStepImpl extends CdapStepImpl implements CdapStopAppStep protected String appId = APP_ID_EDEFAULT; /** + * The default value of the '{@link #getProgramTypes() <em>Program Types</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getProgramTypes() + * @generated + * @ordered + */ + protected static final String PROGRAM_TYPES_EDEFAULT = null; + + /** + * The cached value of the '{@link #getProgramTypes() <em>Program Types</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getProgramTypes() + * @generated + * @ordered + */ + protected String programTypes = PROGRAM_TYPES_EDEFAULT; + + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -90,11 +111,34 @@ public class CdapStopAppStepImpl extends CdapStepImpl implements CdapStopAppStep * <!-- end-user-doc --> * @generated */ + public String getProgramTypes() { + return programTypes; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setProgramTypes(String newProgramTypes) { + String oldProgramTypes = programTypes; + programTypes = newProgramTypes; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_STOP_APP_STEP__PROGRAM_TYPES, oldProgramTypes, programTypes)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case CdapPackage.CDAP_STOP_APP_STEP__APP_ID: return getAppId(); + case CdapPackage.CDAP_STOP_APP_STEP__PROGRAM_TYPES: + return getProgramTypes(); } return super.eGet(featureID, resolve, coreType); } @@ -110,6 +154,9 @@ public class CdapStopAppStepImpl extends CdapStepImpl implements CdapStopAppStep case CdapPackage.CDAP_STOP_APP_STEP__APP_ID: setAppId((String)newValue); return; + case CdapPackage.CDAP_STOP_APP_STEP__PROGRAM_TYPES: + setProgramTypes((String)newValue); + return; } super.eSet(featureID, newValue); } @@ -125,6 +172,9 @@ public class CdapStopAppStepImpl extends CdapStepImpl implements CdapStopAppStep case CdapPackage.CDAP_STOP_APP_STEP__APP_ID: setAppId(APP_ID_EDEFAULT); return; + case CdapPackage.CDAP_STOP_APP_STEP__PROGRAM_TYPES: + setProgramTypes(PROGRAM_TYPES_EDEFAULT); + return; } super.eUnset(featureID); } @@ -139,6 +189,8 @@ public class CdapStopAppStepImpl extends CdapStepImpl implements CdapStopAppStep switch (featureID) { case CdapPackage.CDAP_STOP_APP_STEP__APP_ID: return APP_ID_EDEFAULT == null ? appId != null : !APP_ID_EDEFAULT.equals(appId); + case CdapPackage.CDAP_STOP_APP_STEP__PROGRAM_TYPES: + return PROGRAM_TYPES_EDEFAULT == null ? programTypes != null : !PROGRAM_TYPES_EDEFAULT.equals(programTypes); } return super.eIsSet(featureID); } @@ -155,6 +207,8 @@ public class CdapStopAppStepImpl extends CdapStepImpl implements CdapStopAppStep StringBuffer result = new StringBuffer(super.toString()); result.append(" (appId: "); result.append(appId); + result.append(", programTypes: "); + result.append(programTypes); result.append(')'); return result.toString(); } diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore/service.xcore b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore/service.xcore index 4dd1bb3..eb5b903 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore/service.xcore +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore/service.xcore @@ -149,6 +149,7 @@ class CdapStopServiceStep extends CdapStep { class CdapStopAppStep extends CdapStep { String appId + String programTypes } class CdapStartFlowStep extends CdapStep { |