You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2013/10/25 10:29:10 UTC
git commit: adding dynamic payload handling at the cloud controller
Updated Branches:
refs/heads/master 3633ae43a -> a240481c2
adding dynamic payload handling at the cloud controller
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/a240481c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a240481c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a240481c
Branch: refs/heads/master
Commit: a240481c2a36a0c2fdbedaec5c94a0c49bf90a3c
Parents: 3633ae4
Author: rekathiru <rt...@gmail.com>
Authored: Fri Oct 25 13:58:49 2013 +0530
Committer: rekathiru <rt...@gmail.com>
Committed: Fri Oct 25 13:58:49 2013 +0530
----------------------------------------------------------------------
.../src/conf/cartridge-config.properties | 3 +-
.../client/CloudControllerServiceClient.java | 3 +-
.../stratos/adc/mgt/payload/CarbonPayload.java | 4 ++
.../stratos/adc/mgt/payload/DataPayload.java | 6 ++
.../adc/mgt/payload/NonCarbonPayload.java | 4 ++
.../apache/stratos/adc/mgt/payload/Payload.java | 75 ++------------------
.../mgt/utils/ApplicationManagementUtil.java | 16 ++---
.../adc/mgt/utils/CartridgeConstants.java | 3 +
.../stratos/adc/mgt/test/PayloadTest.java | 8 +--
.../controller/axiom/AxiomXpathParser.java | 2 +-
.../impl/CloudControllerServiceImpl.java | 40 ++++++-----
.../interfaces/CloudControllerService.java | 2 +-
.../controller/util/CloudControllerUtil.java | 16 +----
.../cloud/controller/util/IaasProvider.java | 4 +-
.../cloud/controller/util/ServiceContext.java | 72 +++++++++++++++----
.../main/resources/CloudControllerService.wsdl | 2 +-
16 files changed, 126 insertions(+), 134 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a240481c/components/org.apache.stratos.adc.mgt/src/conf/cartridge-config.properties
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/conf/cartridge-config.properties b/components/org.apache.stratos.adc.mgt/src/conf/cartridge-config.properties
index e360277..0f8743a 100644
--- a/components/org.apache.stratos.adc.mgt/src/conf/cartridge-config.properties
+++ b/components/org.apache.stratos.adc.mgt/src/conf/cartridge-config.properties
@@ -35,7 +35,8 @@ adc.jdbc.username=wso2carbon
adc.jdbc.password=wso2carbon
adc.jdbc.driver=org.h2.Driver
-mb.server.ip=cc.wso2.com:5673
+mb.ip=mb.stratos.apache.org
+mb.port=5677
feature.externalrepo.validation.enabled=true
feature.internalrepo.enabled=false
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a240481c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java
index d62ecda..36db631 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java
@@ -31,7 +31,6 @@ import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregister
import org.apache.stratos.cloud.controller.util.xsd.CartridgeInfo;
import org.apache.stratos.cloud.controller.util.xsd.Properties;
-import javax.activation.DataHandler;
import java.rmi.RemoteException;
public class CloudControllerServiceClient {
@@ -69,7 +68,7 @@ public class CloudControllerServiceClient {
}
public boolean register(String clusterId, String cartridgeType,
- DataHandler payload, String tenantRange,
+ String payload, String tenantRange,
String hostName, Properties properties,
String autoscalorPolicyName) throws RemoteException, CloudControllerServiceUnregisteredCartridgeExceptionException
{
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a240481c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/CarbonPayload.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/CarbonPayload.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/CarbonPayload.java
index 7581138..1fd2b32 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/CarbonPayload.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/CarbonPayload.java
@@ -40,5 +40,9 @@ public class CarbonPayload extends Payload {
payloadBuilder.append("MULTITENANT=" + payloadArg.getCartridgeInfo().getMultiTenant());
payloadBuilder.append(",");
payloadBuilder.append("DOMAIN=" + payloadArg.getServiceDomain());
+ payloadBuilder.append(",");
+ payloadBuilder.append("MB_IP=" + System.getProperty(CartridgeConstants.MB_IP));
+ payloadBuilder.append(",");
+ payloadBuilder.append("MB_PORT=" + System.getProperty(CartridgeConstants.MB_PORT));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a240481c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/DataPayload.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/DataPayload.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/DataPayload.java
index f4c8701..5869ab3 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/DataPayload.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/DataPayload.java
@@ -19,6 +19,8 @@
package org.apache.stratos.adc.mgt.payload;
+import org.apache.stratos.adc.mgt.utils.CartridgeConstants;
+
public class DataPayload extends NonCarbonPayload {
public DataPayload(String payloadFilePath) {
@@ -36,5 +38,9 @@ public class DataPayload extends NonCarbonPayload {
payloadBuilder.append("MYSQL_HOST=" + payloadArg.getDataCartridgeHost());
payloadBuilder.append(",");
payloadBuilder.append("MYSQL_PASSWORD=" + payloadArg.getDataCartridgeAdminPassword());
+ payloadBuilder.append(",");
+ payloadBuilder.append("MB_IP=" + System.getProperty(CartridgeConstants.MB_IP));
+ payloadBuilder.append(",");
+ payloadBuilder.append("MB_PORT=" + System.getProperty(CartridgeConstants.MB_PORT));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a240481c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/NonCarbonPayload.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/NonCarbonPayload.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/NonCarbonPayload.java
index 86c365b..599c04d 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/NonCarbonPayload.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/NonCarbonPayload.java
@@ -42,6 +42,10 @@ public class NonCarbonPayload extends Payload {
payloadBuilder.append("CARTRIDGE_AGENT_EPR=" + System.getProperty(CartridgeConstants.CARTRIDGE_AGENT_EPR));
payloadBuilder.append(",");
payloadBuilder.append("APP_PATH=" + payloadArg.getCartridgeInfo().getBaseDir());
+ payloadBuilder.append(",");
+ payloadBuilder.append("MB_IP=" + System.getProperty(CartridgeConstants.MB_IP));
+ payloadBuilder.append(",");
+ payloadBuilder.append("MB_PORT=" + System.getProperty(CartridgeConstants.MB_PORT));
//port mapping specific
if(payloadArg.getCartridgeInfo() != null) {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a240481c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/Payload.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/Payload.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/Payload.java
index ed21758..2dce3a9 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/Payload.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/Payload.java
@@ -22,11 +22,11 @@ package org.apache.stratos.adc.mgt.payload;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.adc.mgt.exception.ADCException;
-import org.wso2.carbon.utils.CarbonUtils;
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@@ -116,7 +116,7 @@ public abstract class Payload {
* @return DataHandler subscription with payload
* @throws ADCException in case of an error
*/
- public DataHandler createPayload () throws ADCException {
+ public StringBuilder createPayload () throws ADCException {
if(payloadBuilder.length() == 0) {
log.warn("Payload string length is zero. Create payload failed");
@@ -130,70 +130,7 @@ public abstract class Payload {
log.info("** Payload ** " + payloadBuilder.toString());
- String payloadStringTempFile = "launch-params";
-
- FileWriter fstream = null;
- try {
- fstream = new FileWriter(payloadStringTempFile);
-
- } catch (IOException e) {
- log.error(e.getMessage());
- throw new ADCException(e.getMessage(), e);
- }
- BufferedWriter out = new BufferedWriter(fstream);
- try {
- out.write(payloadBuilder.toString());
- out.close();
-
- } catch (IOException e) {
- log.error(e.getMessage());
- throw new ADCException(e.getMessage(), e);
- }
-
- FileOutputStream fos = null;
- try {
- fos = new FileOutputStream(getPayloadFilePath());
-
- } catch (FileNotFoundException e) {
- log.error(e.getMessage());
- throw new ADCException(e.getMessage(), e);
- }
-
- ZipOutputStream zos = new ZipOutputStream(fos);
- addToZipFile(System.getProperty("user.dir"), payloadStringTempFile, zos);
-
- File folder = new File(CarbonUtils.getCarbonHome() + File.separator
- + "repository" + File.separator + "resources" + File.separator
- + "user-data");
-
- if(folder != null && folder.exists()) {
- for (File fileEntry : folder.listFiles()) {
- if (fileEntry != null && !fileEntry.isDirectory()) {
- addToZipFile(folder.getPath(), fileEntry.getName(), zos);
- }
- }
- }
-
- try {
- zos.close();
- fos.close();
-
- } catch (IOException e) {
- log.error(e.getMessage());
- throw new ADCException(e.getMessage(), e);
- }
-
- FileDataSource payloadDataSource;
- try {
- payloadDataSource = new FileDataSource(new File(payloadFilePath));
-
- } catch (Exception e) {
- log.error(e.getMessage());
- throw new ADCException(e.getMessage(), e);
- }
-
- DataHandler payloadDataHandler = new DataHandler(payloadDataSource);
- return payloadDataHandler;
+ return payloadBuilder;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a240481c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java
index ed3b353..cf569b4 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java
@@ -143,13 +143,13 @@ public class ApplicationManagementUtil {
dataCartridge.setUserName(CartridgeConstants.MYSQL_DEFAULT_USER);
clusterDomain = getDynamicClusterDomain(cartridgeType, cartName, cartridgeInfo);
- registerService(cartridgeType,
+ /*egisterService(cartridgeType,
clusterDomain,
clusterSubDomain,
createPayload(cartridgeInfo, cartName, autoScalingPolicy, repoURL, mysqlPassword, "localhost", payloadZipFileName, tenantId, tenantDomain),
"*",
cartName + "." + cartridgeInfo.getHostName(),
- setRegisterServiceProperties(autoScalingPolicy, tenantId,cartName));
+ setRegisterServiceProperties(autoScalingPolicy, tenantId,cartName));*/
deletePayloadFile(payloadZipFileName);
} else {
@@ -198,13 +198,13 @@ public class ApplicationManagementUtil {
if (cartridgeInfo.getProvider().equalsIgnoreCase(CartridgeConstants.PROVIDER_NAME_WSO2)) { //carbon cartridge private jet mode
clusterDomain = getDynamicClusterDomain(cartridgeType, cartName, cartridgeInfo);
- registerService(cartridgeType,
+ /* registerService(cartridgeType,
clusterDomain,
clusterSubDomain,
createCarbonPayload(cartridgeInfo, cartName, alias, payloadZipFileName, tenantDomain, false),
Integer.toString(tenantId),
cartName + "." + cartridgeInfo.getHostName(),
- setRegisterServiceProperties(autoScalingPolicy,tenantId,cartName));
+ setRegisterServiceProperties(autoScalingPolicy,tenantId,cartName));*/
deletePayloadFile(payloadZipFileName);
} else {
@@ -248,13 +248,13 @@ public class ApplicationManagementUtil {
log.info(" MYSQL Cartridge info retrieved ");
}
- registerService(cartridgeType,
+ /*registerService(cartridgeType,
clusterDomain,
clusterSubDomain,
createPayload(cartridgeInfo, cartName, autoScalingPolicy, repoURL, mySQLPassword,
mySQLHostName, payloadZipFileName, tenantId, tenantDomain), "*",
cartName + "." + cartridgeInfo.getHostName(),
- setRegisterServiceProperties(autoScalingPolicy,tenantId,cartName));
+ setRegisterServiceProperties(autoScalingPolicy,tenantId,cartName));*/
deletePayloadFile(payloadZipFileName);
}
@@ -928,11 +928,11 @@ public class ApplicationManagementUtil {
}
public static void registerService(String cartridgeType, String domain, String subDomain,
- DataHandler payload, String tenantRange, String hostName, Properties properties)
+ StringBuilder payload, String tenantRange, String hostName, Properties properties)
throws ADCException, UnregisteredCartridgeException {
log.info("Register service..");
try {
- CloudControllerServiceClient.getServiceClient().register(domain, cartridgeType, payload, tenantRange,
+ CloudControllerServiceClient.getServiceClient().register(domain, cartridgeType, payload.toString(), tenantRange,
hostName, properties, "economy");
} catch (CloudControllerServiceUnregisteredCartridgeExceptionException e) {
String msg = "Exception is occurred in register service operation. Reason :" + e.getMessage();
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a240481c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/CartridgeConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/CartridgeConstants.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/CartridgeConstants.java
index 8c18742..d261918 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/CartridgeConstants.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/CartridgeConstants.java
@@ -35,6 +35,9 @@ public class CartridgeConstants {
public static final String NOT_READY = "NOT-READY";
public static final String SUBSCRIBED = "SUBSCRIBED";
public static final String UNSUBSCRIBED = "UNSUBSCRIBED";
+ public static final String MB_IP = "mb.ip";
+ public static final String MB_PORT = "mb.port";
+
public static final String DB_DATASOURCE = "adc.datasource";
public static final String DB_URL = "adc.jdbc.url";
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a240481c/components/org.apache.stratos.adc.mgt/src/test/java/org/apache/stratos/adc/mgt/test/PayloadTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/test/java/org/apache/stratos/adc/mgt/test/PayloadTest.java b/components/org.apache.stratos.adc.mgt/src/test/java/org/apache/stratos/adc/mgt/test/PayloadTest.java
index c86cc98..564f8d3 100644
--- a/components/org.apache.stratos.adc.mgt/src/test/java/org/apache/stratos/adc/mgt/test/PayloadTest.java
+++ b/components/org.apache.stratos.adc.mgt/src/test/java/org/apache/stratos/adc/mgt/test/PayloadTest.java
@@ -90,7 +90,7 @@ public class PayloadTest extends TestCase {
payloadArg.setServiceDomain("__$default");
Payload payload = createPayload(payloadArg, "wso2", "esb", "foo.com", "carbon1");
assertNotNull(payload);
- assertTrue(payload.delete());
+ //assertTrue(payload.delete());
}
public void testSingleTenantCarbonPayload() {
@@ -105,7 +105,7 @@ public class PayloadTest extends TestCase {
payloadArg.setServiceDomain("__$default");
Payload payload = createPayload(payloadArg, "wso2", "as", "foo.com", "carbon2");
assertNotNull(payload);
- assertTrue(payload.delete());
+ //assertTrue(payload.delete());
}
public void testNonCarbonPayload() {
@@ -143,7 +143,7 @@ public class PayloadTest extends TestCase {
payloadArg.setServiceDomain("__$default");
Payload payload = createPayload(payloadArg, "php-provider", "php", "foo.com", "php1");
assertNotNull(payload);
- assertTrue(payload.delete());
+ //assertTrue(payload.delete());
}
public void testDataPayload() {
@@ -181,7 +181,7 @@ public class PayloadTest extends TestCase {
payloadArg.setServiceDomain("__$default");
Payload payload = createPayload(payloadArg, "mysql-provider", "mysql", "foo.com", "mysql1");
assertNotNull(payload);
- assertTrue(payload.delete());
+ //assertTrue(payload.delete());
}
protected void tearDown() throws java.lang.Exception {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a240481c/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/axiom/AxiomXpathParser.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/axiom/AxiomXpathParser.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/axiom/AxiomXpathParser.java
index ec7c615..fe17fb9 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/axiom/AxiomXpathParser.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/axiom/AxiomXpathParser.java
@@ -835,7 +835,7 @@ public class AxiomXpathParser {
OMElement node = (OMElement) nodes.get(0);
if (node.getText() != null) {
- byte[] payload = CloudControllerUtil.getBytesFromFile(node.getText());
+ StringBuilder payload = new StringBuilder(node.getText());
serviceCtxt.setPayload(payload);
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a240481c/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
index 0b7e03c..f3d7bfe 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
@@ -239,7 +239,6 @@ public class CloudControllerServiceImpl implements CloudControllerService {
// load Cartridge
ctxt.setCartridge(loadCartridge(
ctxt.getCartridgeType(),
- ctxt.getPayload(),
serializedObj.getCartridges()));
}
@@ -291,7 +290,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
// load Cartridge
serviceCtxt.setCartridge(loadCartridge(serviceCtxt.getCartridgeType(),
- serviceCtxt.getPayload(), dataHolder
+ dataHolder
.getCartridges()));
if (serviceCtxt.getCartridge() == null) {
@@ -323,7 +322,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
}
//checking for the cloud and the region
//TODO adding more locations and retrieve it from the request received
- if(iaas.getType().equals(cloud) && (region == null || region == "" || iaas.getRegion().equals(region))) {
+ if(iaas.getType().equals(cloud)) {
IaasContext ctxt;
if ((ctxt = serviceCtxt.getIaasContext(iaas.getType())) == null) {
ctxt = serviceCtxt.addIaasContext(iaas.getType());
@@ -332,6 +331,11 @@ public class CloudControllerServiceImpl implements CloudControllerService {
//generating the Unique member ID...
String memberID = generateMemberId(clusterId);
//have to add memberID to the payload
+ serviceCtxt.getPayload().append(",");
+ serviceCtxt.getPayload().append(memberID);
+ //reloading the payload with memberID
+ reloadPayload(serviceCtxt.getCartridge(), serviceCtxt.generatePayload());
+
iaas.getIaas().setDynamicPayload(iaas);
// get the ComputeService
@@ -519,21 +523,25 @@ public class CloudControllerServiceImpl implements CloudControllerService {
return clusterId + memberId.toString();
}
- private Cartridge loadCartridge(String cartridgeType, byte[] payload,
+ private Cartridge loadCartridge(String cartridgeType,
List<Cartridge> cartridges) {
for (Cartridge cartridge : cartridges) {
if (cartridge.getType().equals(cartridgeType)) {
- for (IaasProvider iaas : cartridge.getIaases()) {
- iaas.setPayload(payload);
- }
- return cartridge;
+ return cartridge;
}
}
return null;
}
+ private void reloadPayload(Cartridge cartridge, byte[] payload) {
+ for (IaasProvider iaas : cartridge.getIaases()) {
+ iaas.setPayload(payload);
+ }
+
+ }
+
@Override
public boolean terminateInstance(String clusterId, LocationScope locationScope) {
@@ -553,7 +561,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
// load Cartridge, if null
if (serviceCtxt.getCartridge() == null) {
serviceCtxt.setCartridge(loadCartridge(
- serviceCtxt.getCartridgeType(), serviceCtxt.getPayload(),
+ serviceCtxt.getCartridgeType(),
dataHolder.getCartridges()));
}
@@ -645,7 +653,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
// load Cartridge, if null
if (serviceCtxt.getCartridge() == null) {
serviceCtxt.setCartridge(loadCartridge(
- serviceCtxt.getCartridgeType(), serviceCtxt.getPayload(),
+ serviceCtxt.getCartridgeType(),
dataHolder.getCartridges()));
}
@@ -718,7 +726,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
// load Cartridge, if null
if (serviceCtxt.getCartridge() == null) {
serviceCtxt.setCartridge(loadCartridge(
- serviceCtxt.getCartridgeType(), serviceCtxt.getPayload(),
+ serviceCtxt.getCartridgeType(),
dataHolder.getCartridges()));
}
@@ -776,7 +784,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
// load cartridge
subjectedSerCtxt.setCartridge(loadCartridge(subjectedSerCtxt
- .getCartridgeType(), subjectedSerCtxt.getPayload(),
+ .getCartridgeType(),
dataHolder.getCartridges()));
if (subjectedSerCtxt.getCartridge() == null) {
@@ -957,7 +965,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
@Override
public boolean registerService(String clusterId,
String tenantRange, String cartridgeType, String hostName,
- Properties properties, byte[] payload, String autoScalerPolicyName)
+ Properties properties, String payload, String autoScalerPolicyName)
throws UnregisteredCartridgeException {
// create a ServiceContext dynamically
@@ -967,6 +975,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
newServiceCtxt.setTenantRange(tenantRange);
newServiceCtxt.setHostName(hostName);
newServiceCtxt.setAutoScalerPolicyName(autoScalerPolicyName);
+ newServiceCtxt.setPayload(new StringBuilder(payload));
if (properties != null && properties.getProperties() != null) {
// add properties
@@ -995,7 +1004,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
throw new UnregisteredCartridgeException(msg);
}
- if (payload != null && payload.length != 0) {
+/*
// write payload file
try {
@@ -1017,7 +1026,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
} else {
log.debug("Payload is null or empty for :\n "
+ newServiceCtxt);
- }
+ }*/
// persist
String uniqueName = clusterId + "-"
@@ -1028,7 +1037,6 @@ public class CloudControllerServiceImpl implements CloudControllerService {
} catch (IOException e) {
//TODO
}
-
log.info("Service successfully registered! Domain - " + clusterId
+ ", Cartridge type - " + cartridgeType);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a240481c/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java
index c12fa31..24428fc 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java
@@ -61,7 +61,7 @@ public interface CloudControllerService {
* not a registered one.
*/
public boolean registerService(String clusterId, String tenantRange, String cartridgeType,
- String hostName, Properties properties, byte[] payload, String autoScalerPolicyName) throws UnregisteredCartridgeException;
+ String hostName, Properties properties, String payload, String autoScalerPolicyName) throws UnregisteredCartridgeException;
/**
* Calling this method will result in an instance startup, which is belong
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a240481c/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
index c07f2a9..f308d1f 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
@@ -18,13 +18,10 @@
*/
package org.apache.stratos.cloud.controller.util;
-import org.apache.commons.io.FileUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cloud.controller.exception.CloudControllerException;
-import java.io.File;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -34,18 +31,7 @@ import java.util.Map.Entry;
public class CloudControllerUtil {
private static final Log log = LogFactory.getLog(CloudControllerUtil.class);
- public static byte[] getBytesFromFile(String path) {
-
- try {
- return FileUtils.readFileToByteArray(new File(path));
- } catch (IOException e) {
-
- handleException("Failed to read the file "+path, e);
- }
- return new byte[0];
- }
-
- public static CartridgeInfo toCartridgeInfo(Cartridge cartridge) {
+ public static CartridgeInfo toCartridgeInfo(Cartridge cartridge) {
CartridgeInfo carInfo = new CartridgeInfo();
carInfo.setType(cartridge.getType());
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a240481c/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/IaasProvider.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/IaasProvider.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/IaasProvider.java
index 52e9450..f724653 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/IaasProvider.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/IaasProvider.java
@@ -235,11 +235,11 @@ public class IaasProvider implements Serializable{
this.className = className;
}
- public byte[] getPayload() {
+ public byte [] getPayload() {
return payload;
}
- public void setPayload(byte[] payload) {
+ public void setPayload(byte[]payload) {
this.payload = payload;
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a240481c/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/ServiceContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/ServiceContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/ServiceContext.java
index dd3a1fa..8820964 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/ServiceContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/ServiceContext.java
@@ -19,9 +19,11 @@
package org.apache.stratos.cloud.controller.util;
import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.cloud.controller.exception.CloudControllerException;
-import java.io.File;
-import java.io.Serializable;
+import java.io.*;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -31,6 +33,7 @@ import java.util.Map;
* in this object.
*/
public class ServiceContext implements Serializable{
+ private static Log log = LogFactory.getLog(ServiceContext.class);
private static final long serialVersionUID = -6740964802890082678L;
private File file;
@@ -40,7 +43,7 @@ public class ServiceContext implements Serializable{
private String payloadFilePath;
private String cartridgeType;
private Cartridge cartridge;
- private byte[] payload;
+ private StringBuilder payload;
private String autoScalerPolicyName;
/**
* Key - Value pair.
@@ -148,11 +151,11 @@ public class ServiceContext implements Serializable{
this.cartridgeType = cartridgeType;
}
- public byte[] getPayload() {
+ public StringBuilder getPayload() {
return payload;
}
- public void setPayload(byte[] payload) {
+ public void setPayload(StringBuilder payload) {
this.payload = payload;
}
@@ -165,18 +168,11 @@ public class ServiceContext implements Serializable{
}
public String toXml() {
- String str =
- payloadFilePath == null ? "<service domain=\"" + clusterId +
- "\" tenantRange=\"" + tenantRange + "\">\n" +
- "\t<cartridge type=\"" + cartridgeType +
- "\"/>\n" + "\t<host>" + hostName +
- "</host>\n" + "</service>"
-
- : "<service domain=\"" + clusterId +
+ String str = "<service domain=\"" + clusterId +
"\" tenantRange=\"" + tenantRange + "\">\n" +
"\t<cartridge type=\"" + cartridgeType +
"\"/>\n" + "\t<host>" + hostName +
- "</host>\n" + "\t<payload>" + payloadFilePath +
+ "</host>\n" + "\t<payload>" + payload +
"</payload>\n" +
propertiesToXml() +
"</service>";
@@ -198,6 +194,54 @@ public class ServiceContext implements Serializable{
return builder.toString();
}
+
+ public byte[] generatePayload() {
+ String payloadStringTempFile = "launch-params";
+
+ FileWriter fstream;
+ try {
+ fstream = new FileWriter(payloadStringTempFile);
+
+ } catch (IOException e) {
+ log.error(e.getMessage());
+ throw new CloudControllerException(e.getMessage(), e);
+ }
+ BufferedWriter out = new BufferedWriter(fstream);
+ try {
+ out.write(payload.toString());
+ out.close();
+
+ } catch (IOException e) {
+ log.error(e.getMessage());
+ throw new CloudControllerException(e.getMessage(), e);
+ }
+
+
+ FileInputStream fis;
+ try {
+ fis = new FileInputStream(payloadStringTempFile);
+ } catch (FileNotFoundException e) {
+ String msg = "Failed while persisting the payload of clusterId : "
+ + clusterId;
+ log.error(msg, e);
+ throw new CloudControllerException(msg, e);
+ }
+
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ byte[] buf = new byte[1024];
+ try {
+ for (int readNum; (readNum = fis.read(buf)) != -1;) {
+ bos.write(buf, 0, readNum);
+ }
+ } catch (IOException ex) {
+ String msg = "Failed while persisting the payload of clusterId : "
+ + clusterId;
+ log.error(msg, ex);
+ throw new CloudControllerException(msg, ex);
+ }
+ byte[] bytes = bos.toByteArray();
+ return bytes;
+ }
public boolean equals(Object obj) {
if (obj instanceof ServiceContext) {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a240481c/service-stubs/org.apache.stratos.lb.cartridge.autoscaler.service.stub/src/main/resources/CloudControllerService.wsdl
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.lb.cartridge.autoscaler.service.stub/src/main/resources/CloudControllerService.wsdl b/service-stubs/org.apache.stratos.lb.cartridge.autoscaler.service.stub/src/main/resources/CloudControllerService.wsdl
index 6645a20..3147092 100644
--- a/service-stubs/org.apache.stratos.lb.cartridge.autoscaler.service.stub/src/main/resources/CloudControllerService.wsdl
+++ b/service-stubs/org.apache.stratos.lb.cartridge.autoscaler.service.stub/src/main/resources/CloudControllerService.wsdl
@@ -152,7 +152,7 @@
<xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/>
- <xs:element minOccurs="0" name="payload" nillable="true" type="xs:base64Binary"/>
+ <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="autoScalerPolicyName" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>