aboutsummaryrefslogtreecommitdiffstats
path: root/ncomp-cdap-adaptor
diff options
context:
space:
mode:
Diffstat (limited to 'ncomp-cdap-adaptor')
-rw-r--r--ncomp-cdap-adaptor/src/main/java/org/openecomp/ncomp/servers/cdap/CdapCdapClusterProvider.java7
-rw-r--r--ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapCluster.java10
-rw-r--r--ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterClient.java4
-rw-r--r--ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterConsole.java4
-rw-r--r--ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterProviderTemplate.java2
5 files changed, 15 insertions, 12 deletions
diff --git a/ncomp-cdap-adaptor/src/main/java/org/openecomp/ncomp/servers/cdap/CdapCdapClusterProvider.java b/ncomp-cdap-adaptor/src/main/java/org/openecomp/ncomp/servers/cdap/CdapCdapClusterProvider.java
index 2de8297..41885b8 100644
--- a/ncomp-cdap-adaptor/src/main/java/org/openecomp/ncomp/servers/cdap/CdapCdapClusterProvider.java
+++ b/ncomp-cdap-adaptor/src/main/java/org/openecomp/ncomp/servers/cdap/CdapCdapClusterProvider.java
@@ -420,8 +420,11 @@ public class CdapCdapClusterProvider extends BasicAdaptorProvider {
return customRunCDAPcliCommand(namespace, "set stream ttl " + streamName + " " + ttlSeconds);
}
- public String stopApp(String namespace, String appName) {
- return customRunCDAPcliCommand(namespace, "stop app " + appName + " programs");
+ public String stopApp(String namespace, String appName, String programTypes) {
+ if (programTypes == null)
+ return customRunCDAPcliCommand(namespace, "stop app " + appName + " programs");
+ else
+ return customRunCDAPcliCommand(namespace, "stop app " + appName + " programs " + programTypes);
}
public String startWorker(String namespace, String appName,
diff --git a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapCluster.java b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapCluster.java
index 75c3598..22f75f9 100644
--- a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapCluster.java
+++ b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapCluster.java
@@ -380,21 +380,21 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusProvider,
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(CdapClusterOperationEnum.CdapCluster_stopApp,server,this);
ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_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(CdapClusterMessageEnum.REQUEST_FAILED_stopApp, e.toString());
EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_stopApp,e,e.getMessage());
@@ -404,7 +404,7 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusProvider,
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/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterClient.java b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterClient.java
index e49315d..18a7c9d 100644
--- a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterClient.java
+++ b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterClient.java
@@ -274,12 +274,12 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
}
- public java.lang.String stopApp(String path, java.lang.String namespace, java.lang.String appName) {
+ public java.lang.String stopApp(String path, java.lang.String namespace, java.lang.String appName, java.lang.String programTypes) {
EClass c = CdapPackage.eINSTANCE.getCdapCluster();
ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_stopApp,client.getRemote());
java.lang.String res;
try {
- res = (java.lang.String) client.operationPath(path, c, "stopApp", null, namespace,appName);
+ res = (java.lang.String) client.operationPath(path, c, "stopApp", null, namespace,appName,programTypes);
}
catch (Exception e) {
ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_stopApp, e.toString());
diff --git a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterConsole.java b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterConsole.java
index bd302cd..e58c2a1 100644
--- a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterConsole.java
+++ b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterConsole.java
@@ -175,10 +175,10 @@ public class CdapCdapClusterConsole extends Console {
return res;
}
- public java.lang.String stopApp(String path, java.lang.String namespace, java.lang.String appName) {
+ public java.lang.String stopApp(String path, java.lang.String namespace, java.lang.String appName, java.lang.String programTypes) {
java.lang.String res = null;
try {
- res = controller.stopApp(path,namespace,appName);
+ res = controller.stopApp(path,namespace,appName,programTypes);
}
catch (ManagementServerError e) {
System.err.println("ERROR: " + e.getJson().toString(2));
diff --git a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterProviderTemplate.java b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterProviderTemplate.java
index c5956b7..12dd085 100644
--- a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterProviderTemplate.java
+++ b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterProviderTemplate.java
@@ -121,7 +121,7 @@ public class CdapCdapClusterProviderTemplate extends BasicAdaptorProvider {
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();