Merge "[DCAE-15] Final update for rebased code."

5 files changed, 12 insertions, 12 deletions

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();