You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2014/12/22 08:41:59 UTC
[1/4] stratos git commit: Removing Member.instanceId to avoid the
confusion with application/group/cluster instance id
Repository: stratos
Updated Branches:
refs/heads/master fbc20b008 -> c7feb35fa
Removing Member.instanceId to avoid the confusion with application/group/cluster instance id
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0626501e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0626501e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0626501e
Branch: refs/heads/master
Commit: 0626501e6ba0db671665f4d18467d619d19a613b
Parents: 120c573
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon Dec 22 12:26:02 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Dec 22 13:11:51 2014 +0530
----------------------------------------------------------------------
.../autoscaler/api/AutoScalerServiceImpl.java | 5 ++-
.../AutoscalerTopologyEventReceiver.java | 16 +++++-----
.../monitor/cluster/ClusterMonitor.java | 14 ++++-----
.../publisher/CartridgeAgentEventPublisher.java | 7 ++---
.../publisher/HealthStatisticsNotifier.java | 2 ++
.../publisher/HealthStatisticsPublisher.java | 5 ++-
.../iaases/mock/MockMemberEventPublisher.java | 3 --
.../publisher/TopologyEventPublisher.java | 32 ++++++++++----------
.../messaging/topology/TopologyBuilder.java | 18 +++++------
.../impl/CloudControllerServiceImpl.java | 31 ++++++++++---------
.../stratos/common/beans/topology/Member.java | 10 ------
.../conf/LoadBalancerConfiguration.java | 2 +-
.../messaging/domain/topology/Member.java | 9 +-----
.../event/health/stat/MemberFaultEvent.java | 8 +----
.../status/InstanceMaintenanceModeEvent.java | 9 +-----
.../status/InstanceReadyToShutdownEvent.java | 9 +-----
.../instance/status/InstanceStartedEvent.java | 8 +----
.../stratos/messaging/event/ping/PingEvent.java | 30 ------------------
.../event/topology/InstanceSpawnedEvent.java | 8 +----
.../event/topology/MemberActivatedEvent.java | 8 +----
.../topology/MemberMaintenanceModeEvent.java | 8 +----
.../topology/MemberReadyToShutdownEvent.java | 10 ++----
.../event/topology/MemberStartedEvent.java | 11 ++-----
.../event/topology/MemberSuspendedEvent.java | 8 +----
.../event/topology/MemberTerminatedEvent.java | 8 +----
.../InstanceSpawnedMessageProcessor.java | 3 +-
.../util/converter/ObjectConverter.java | 5 +--
.../extension/FaultHandlingWindowProcessor.java | 6 ++--
28 files changed, 91 insertions(+), 202 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
index 551a501..1886073 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
@@ -203,8 +203,11 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface {
ApplicationBuilder.handleApplicationCreated(application, applicationParser.getApplicationClusterContexts());
try {
- validateDeploymentPolicy(deploymentPolicy);
+ // Update kubernetes cluster ids
updateKubernetesClusterIds(deploymentPolicy);
+ // Validate deployment policy via cloud controller
+ validateDeploymentPolicy(deploymentPolicy);
+ // Add deployment policy
PolicyManager.getInstance().addDeploymentPolicy(deploymentPolicy);
applicationContext.setStatus(ApplicationContext.STATUS_DEPLOYED);
AutoscalerContext.getInstance().updateApplicationContext(applicationContext);
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
index f5875ce..5f77a1a 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
@@ -242,7 +242,7 @@ public class AutoscalerTopologyEventReceiver {
log.info("[ClusterTerminatingEvent] Received: " + event.getClass());
ClusterInstanceTerminatingEvent clusterTerminatingEvent = (ClusterInstanceTerminatingEvent) event;
String clusterId = clusterTerminatingEvent.getClusterId();
- String instanceId = clusterTerminatingEvent.getInstanceId();
+ String clusterInstanceId = clusterTerminatingEvent.getInstanceId();
AutoscalerContext asCtx = AutoscalerContext.getInstance();
AbstractClusterMonitor monitor;
monitor = asCtx.getClusterMonitor(clusterId);
@@ -253,22 +253,22 @@ public class AutoscalerTopologyEventReceiver {
}
// if monitor does not exist, send cluster terminated event
ClusterStatusEventPublisher.sendClusterTerminatedEvent(clusterTerminatingEvent.getAppId(),
- clusterTerminatingEvent.getServiceName(), clusterId, instanceId);
+ clusterTerminatingEvent.getServiceName(), clusterId, clusterInstanceId);
return;
}
//changing the status in the monitor, will notify its parent monitor
- ClusterInstance clusterInstance = (ClusterInstance) monitor.getInstance(instanceId);
+ ClusterInstance clusterInstance = (ClusterInstance) monitor.getInstance(clusterInstanceId);
if (clusterInstance.getCurrentState() == ClusterStatus.Active) {
// terminated gracefully
- monitor.notifyParentMonitor(ClusterStatus.Terminating, instanceId);
+ monitor.notifyParentMonitor(ClusterStatus.Terminating, clusterInstanceId);
InstanceNotificationPublisher.getInstance().
- sendInstanceCleanupEventForCluster(clusterId, instanceId);
+ sendInstanceCleanupEventForCluster(clusterId, clusterInstanceId);
} else {
- monitor.notifyParentMonitor(ClusterStatus.Terminating, instanceId);
- monitor.terminateAllMembers(instanceId, clusterInstance.getNetworkPartitionId());
+ monitor.notifyParentMonitor(ClusterStatus.Terminating, clusterInstanceId);
+ monitor.terminateAllMembers(clusterInstanceId, clusterInstance.getNetworkPartitionId());
}
ServiceReferenceHolder.getInstance().getClusterStatusProcessorChain().
- process("", clusterId, instanceId);
+ process("", clusterId, clusterInstanceId);
}
});
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
index f4032c6..1ef3895 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
@@ -891,9 +891,9 @@ public class ClusterMonitor extends AbstractClusterMonitor {
String networkPartitionId = maintenanceModeEvent.getNetworkPartitionId();
String partitionId = maintenanceModeEvent.getPartitionId();
String memberId = maintenanceModeEvent.getMemberId();
- String instanceId = maintenanceModeEvent.getInstanceId();
+ String clusterInstanceId = maintenanceModeEvent.getClusterInstanceId();
ClusterInstanceContext networkPartitionCtxt = getClusterInstanceContext(networkPartitionId,
- instanceId);
+ clusterInstanceId);
ClusterLevelPartitionContext clusterMonitorPartitionContext = networkPartitionCtxt.
getPartitionCtxt(partitionId);
clusterMonitorPartitionContext.addMemberStatsContext(new MemberStatsContext(memberId));
@@ -909,8 +909,8 @@ public class ClusterMonitor extends AbstractClusterMonitor {
ClusterInstanceContext nwPartitionCtxt;
String networkPartitionId = memberReadyToShutdownEvent.getNetworkPartitionId();
- String instanceId = memberReadyToShutdownEvent.getInstanceId();
- nwPartitionCtxt = getClusterInstanceContext(networkPartitionId, instanceId);
+ String clusterInstanceId = memberReadyToShutdownEvent.getClusterInstanceId();
+ nwPartitionCtxt = getClusterInstanceContext(networkPartitionId, clusterInstanceId);
// start a new member in the same Partition
String memberId = memberReadyToShutdownEvent.getMemberId();
@@ -954,10 +954,10 @@ public class ClusterMonitor extends AbstractClusterMonitor {
String networkPartitionId = memberTerminatedEvent.getNetworkPartitionId();
String memberId = memberTerminatedEvent.getMemberId();
String clusterId = memberTerminatedEvent.getClusterId();
- String instanceId = memberTerminatedEvent.getInstanceId();
+ String clusterInstanceId = memberTerminatedEvent.getClusterInstanceId();
String partitionId = memberTerminatedEvent.getPartitionId();
ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext(
- networkPartitionId, instanceId);
+ networkPartitionId, clusterInstanceId);
ClusterLevelPartitionContext clusterMonitorPartitionContext =
clusterLevelNetworkPartitionContext.getPartitionCtxt(partitionId);
clusterMonitorPartitionContext.removeMemberStatsContext(memberId);
@@ -989,7 +989,7 @@ public class ClusterMonitor extends AbstractClusterMonitor {
}
//Checking whether the cluster state can be changed either from in_active to created/terminating to terminated
ServiceReferenceHolder.getInstance().getClusterStatusProcessorChain().process(
- ClusterStatusTerminatedProcessor.class.getName(), clusterId, instanceId);
+ ClusterStatusTerminatedProcessor.class.getName(), clusterId, clusterInstanceId);
}
@Override
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java
index 269cb47..a47497b 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java
@@ -1,5 +1,3 @@
-package org.apache.stratos.cartridge.agent.event.publisher;
-
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +18,8 @@ package org.apache.stratos.cartridge.agent.event.publisher;
* under the License.
*/
+package org.apache.stratos.cartridge.agent.event.publisher;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cartridge.agent.config.CartridgeAgentConfiguration;
@@ -52,7 +52,6 @@ public class CartridgeAgentEventPublisher {
CartridgeAgentConfiguration.getInstance().getServiceName(),
CartridgeAgentConfiguration.getInstance().getClusterId(),
CartridgeAgentConfiguration.getInstance().getMemberId(),
- CartridgeAgentConfiguration.getInstance().getInstanceId(),
CartridgeAgentConfiguration.getInstance().getClusterInstanceId(),
CartridgeAgentConfiguration.getInstance().getNetworkPartitionId(),
CartridgeAgentConfiguration.getInstance().getPartitionId());
@@ -121,7 +120,6 @@ public class CartridgeAgentEventPublisher {
CartridgeAgentConfiguration.getInstance().getServiceName(),
CartridgeAgentConfiguration.getInstance().getClusterId(),
CartridgeAgentConfiguration.getInstance().getMemberId(),
- CartridgeAgentConfiguration.getInstance().getInstanceId(),
CartridgeAgentConfiguration.getInstance().getClusterInstanceId(),
CartridgeAgentConfiguration.getInstance().getNetworkPartitionId(),
CartridgeAgentConfiguration.getInstance().getPartitionId());
@@ -149,7 +147,6 @@ public class CartridgeAgentEventPublisher {
CartridgeAgentConfiguration.getInstance().getServiceName(),
CartridgeAgentConfiguration.getInstance().getClusterId(),
CartridgeAgentConfiguration.getInstance().getMemberId(),
- CartridgeAgentConfiguration.getInstance().getInstanceId(),
CartridgeAgentConfiguration.getInstance().getClusterInstanceId(),
CartridgeAgentConfiguration.getInstance().getNetworkPartitionId(),
CartridgeAgentConfiguration.getInstance().getPartitionId());
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java
index 40826c5..6e8ebe3 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java
@@ -110,6 +110,7 @@ public class HealthStatisticsNotifier implements Runnable {
}
statsPublisher.publish(
CartridgeAgentConfiguration.getInstance().getClusterId(),
+ CartridgeAgentConfiguration.getInstance().getClusterInstanceId(),
CartridgeAgentConfiguration.getInstance().getNetworkPartitionId(),
CartridgeAgentConfiguration.getInstance().getMemberId(),
CartridgeAgentConfiguration.getInstance().getPartitionId(),
@@ -122,6 +123,7 @@ public class HealthStatisticsNotifier implements Runnable {
}
statsPublisher.publish(
CartridgeAgentConfiguration.getInstance().getClusterId(),
+ CartridgeAgentConfiguration.getInstance().getClusterInstanceId(),
CartridgeAgentConfiguration.getInstance().getNetworkPartitionId(),
CartridgeAgentConfiguration.getInstance().getMemberId(),
CartridgeAgentConfiguration.getInstance().getPartitionId(),
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsPublisher.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsPublisher.java
index 0e9da7c..a0f4aeb 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsPublisher.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsPublisher.java
@@ -46,6 +46,7 @@ public class HealthStatisticsPublisher extends WSO2CEPStatisticsPublisher {
// Payload definition
List<Attribute> payloadData = new ArrayList<Attribute>();
payloadData.add(new Attribute("cluster_id", AttributeType.STRING));
+ payloadData.add(new Attribute("cluster_instance_id", AttributeType.STRING));
payloadData.add(new Attribute("network_partition_id", AttributeType.STRING));
payloadData.add(new Attribute("member_id", AttributeType.STRING));
payloadData.add(new Attribute("partition_id", AttributeType.STRING));
@@ -65,13 +66,14 @@ public class HealthStatisticsPublisher extends WSO2CEPStatisticsPublisher {
/**
* Publish health statistics to cep.
* @param clusterId
+ * @param clusterInstanceId
* @param networkPartitionId
* @param memberId
* @param partitionId
* @param health
* @param value
*/
- public void publish(String clusterId, String networkPartitionId, String memberId, String partitionId, String health, double value) {
+ public void publish(String clusterId, String clusterInstanceId, String networkPartitionId, String memberId, String partitionId, String health, double value) {
if(log.isDebugEnabled()) {
log.debug(String.format("Publishing health statistics: [cluster] %s [network-partition] %s [partition] %s [member] %s [health] %s [value] %f",
clusterId, networkPartitionId, partitionId, memberId, health, value));
@@ -79,6 +81,7 @@ public class HealthStatisticsPublisher extends WSO2CEPStatisticsPublisher {
List<Object> payload = new ArrayList<Object>();
// Payload values
payload.add(clusterId);
+ payload.add(clusterInstanceId);
payload.add(networkPartitionId);
payload.add(memberId);
payload.add(partitionId);
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/mock/MockMemberEventPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/mock/MockMemberEventPublisher.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/mock/MockMemberEventPublisher.java
index 54d4c58..1499e00 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/mock/MockMemberEventPublisher.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/mock/MockMemberEventPublisher.java
@@ -44,7 +44,6 @@ public class MockMemberEventPublisher {
mockMemberContext.getServiceName(),
mockMemberContext.getClusterId(),
mockMemberContext.getMemberId(),
- mockMemberContext.getInstanceId(),
mockMemberContext.getClusterInstanceId(),
mockMemberContext.getNetworkPartitionId(),
mockMemberContext.getPartitionId());
@@ -88,7 +87,6 @@ public class MockMemberEventPublisher {
mockMemberContext.getServiceName(),
mockMemberContext.getClusterId(),
mockMemberContext.getMemberId(),
- mockMemberContext.getInstanceId(),
mockMemberContext.getClusterInstanceId(),
mockMemberContext.getNetworkPartitionId(),
mockMemberContext.getPartitionId());
@@ -111,7 +109,6 @@ public class MockMemberEventPublisher {
mockMemberContext.getServiceName(),
mockMemberContext.getClusterId(),
mockMemberContext.getMemberId(),
- mockMemberContext.getInstanceId(),
mockMemberContext.getClusterInstanceId(),
mockMemberContext.getNetworkPartitionId(),
mockMemberContext.getPartitionId());
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/publisher/TopologyEventPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/publisher/TopologyEventPublisher.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/publisher/TopologyEventPublisher.java
index c8b0bbb..4a56d77 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/publisher/TopologyEventPublisher.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/publisher/TopologyEventPublisher.java
@@ -141,9 +141,13 @@ public class TopologyEventPublisher {
public static void sendInstanceSpawnedEvent(MemberContext memberContext) {
InstanceSpawnedEvent instanceSpawnedEvent = new InstanceSpawnedEvent(
- memberContext.getCartridgeType(), memberContext.getClusterId(), memberContext.getClusterInstanceId(), memberContext.getMemberId(),
- memberContext.getInstanceId(),
- memberContext.getNetworkPartitionId(), memberContext.getPartition().getId(), memberContext.getInitTime());
+ memberContext.getCartridgeType(),
+ memberContext.getClusterId(),
+ memberContext.getClusterInstanceId(),
+ memberContext.getMemberId(),
+ memberContext.getNetworkPartitionId(),
+ memberContext.getPartition().getId(),
+ memberContext.getInitTime());
instanceSpawnedEvent.setLbClusterId(memberContext.getLbClusterId());
instanceSpawnedEvent.setDefaultPrivateIP(memberContext.getDefaultPrivateIP());
@@ -169,17 +173,16 @@ public class TopologyEventPublisher {
public static void sendMemberStartedEvent(InstanceStartedEvent instanceStartedEvent) {
MemberStartedEvent memberStartedEventTopology = new MemberStartedEvent(instanceStartedEvent.getServiceName(),
instanceStartedEvent.getClusterId(), instanceStartedEvent.getClusterInstanceId(),
- instanceStartedEvent.getMemberId(), instanceStartedEvent.getInstanceId(), instanceStartedEvent.getNetworkPartitionId(), instanceStartedEvent.getPartitionId()
+ instanceStartedEvent.getMemberId(), instanceStartedEvent.getNetworkPartitionId(), instanceStartedEvent.getPartitionId()
);
if (log.isInfoEnabled()) {
log.info(String
.format("Publishing member started event: [service-name] %s [cluster-id] %s [cluster-instance-id] %s " +
- "[member-id] %s [instance-id] %s [network-partition-id] %s [partition-id] %s",
+ "[member-id] %s [network-partition-id] %s [partition-id] %s",
instanceStartedEvent.getServiceName(),
instanceStartedEvent.getClusterId(),
instanceStartedEvent.getClusterInstanceId(),
instanceStartedEvent.getMemberId(),
- instanceStartedEvent.getInstanceId(),
instanceStartedEvent.getNetworkPartitionId(),
instanceStartedEvent.getPartitionId()));
}
@@ -191,12 +194,11 @@ public class TopologyEventPublisher {
if (log.isInfoEnabled()) {
log.info(String
.format("Publishing member activated event: [service-name] %s [cluster-id] %s [cluster-instance-id] %s " +
- "[member-id] %s [instance-id] %s [network-partition-id] %s [partition-id] %s",
+ "[member-id] %s [network-partition-id] %s [partition-id] %s",
memberActivatedEvent.getServiceName(),
memberActivatedEvent.getClusterId(),
memberActivatedEvent.getClusterInstanceId(),
memberActivatedEvent.getMemberId(),
- memberActivatedEvent.getInstanceId(),
memberActivatedEvent.getNetworkPartitionId(),
memberActivatedEvent.getPartitionId()));
}
@@ -206,13 +208,12 @@ public class TopologyEventPublisher {
public static void sendMemberReadyToShutdownEvent(MemberReadyToShutdownEvent memberReadyToShutdownEvent) {
if (log.isInfoEnabled()) {
log.info(String.format("Publishing member ready to shut down event: [service-name] %s [cluster-id] %s " +
- "[cluster-instance-id] %s [member-id] %s [instance-id] %s [network-partition-id] %s " +
+ "[cluster-instance-id] %s [member-id] %s [network-partition-id] %s " +
"[partition-id] %s",
memberReadyToShutdownEvent.getServiceName(),
memberReadyToShutdownEvent.getClusterId(),
memberReadyToShutdownEvent.getClusterInstanceId(),
memberReadyToShutdownEvent.getMemberId(),
- memberReadyToShutdownEvent.getInstanceId(),
memberReadyToShutdownEvent.getNetworkPartitionId(),
memberReadyToShutdownEvent.getPartitionId()));
}
@@ -224,12 +225,11 @@ public class TopologyEventPublisher {
public static void sendMemberMaintenanceModeEvent(MemberMaintenanceModeEvent memberMaintenanceModeEvent) {
if (log.isInfoEnabled()) {
log.info(String.format("Publishing member in maintenance mode event: [service-name] %s [cluster-id] %s [cluster-instance-id] %s " +
- "[member-id] %s [instance-id] %s [network-partition-id] %s [partition-id] %s",
+ "[member-id] %s [network-partition-id] %s [partition-id] %s",
memberMaintenanceModeEvent.getServiceName(),
memberMaintenanceModeEvent.getClusterId(),
memberMaintenanceModeEvent.getClusterInstanceId(),
memberMaintenanceModeEvent.getMemberId(),
- memberMaintenanceModeEvent.getInstanceId(),
memberMaintenanceModeEvent.getNetworkPartitionId(),
memberMaintenanceModeEvent.getPartitionId()));
}
@@ -272,19 +272,19 @@ public class TopologyEventPublisher {
public static void sendMemberTerminatedEvent(String serviceName, String clusterId, String memberId,
- String instanceId, String clusterInstanceId,
+ String clusterInstanceId,
String networkPartitionId, String partitionId, Properties properties,
String groupId) {
MemberTerminatedEvent memberTerminatedEvent = new MemberTerminatedEvent(serviceName, clusterId,
- memberId, instanceId, clusterInstanceId, networkPartitionId, partitionId);
+ memberId, clusterInstanceId, networkPartitionId, partitionId);
memberTerminatedEvent.setProperties(properties);
memberTerminatedEvent.setGroupId(groupId);
if (log.isInfoEnabled()) {
log.info(String.format("Publishing member terminated event: [service-name] %s [cluster-id] %s " +
- "[cluster-instance-id] %s [member-id] %s [instance-id] %s [network-partition-id] %s " +
+ "[cluster-instance-id] %s [member-id] %s [network-partition-id] %s " +
"[partition-id] %s [group-id] %s", serviceName, clusterId, clusterInstanceId, memberId,
- instanceId, networkPartitionId, partitionId, groupId));
+ networkPartitionId, partitionId, groupId));
}
publishEvent(memberTerminatedEvent);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
index 96bb5ba..b42f67b 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
@@ -414,7 +414,7 @@ public class TopologyBuilder {
try {
TopologyManager.acquireWriteLock();
- Member member = new Member(service.getServiceName(), clusterId, memberId, instanceId, clusterInstanceId,
+ Member member = new Member(service.getServiceName(), clusterId, memberId, clusterInstanceId,
networkPartitionId, partitionId, initTime);
member.setStatus(MemberStatus.Created);
member.setDefaultPrivateIP(memberContext.getDefaultPrivateIP());
@@ -568,8 +568,8 @@ public class TopologyBuilder {
MemberActivatedEvent memberActivatedEvent = new MemberActivatedEvent(
instanceActivatedEvent.getServiceName(),
instanceActivatedEvent.getClusterId(),
- instanceActivatedEvent.getClusterInstanceId(), instanceActivatedEvent.getMemberId(),
- instanceActivatedEvent.getInstanceId(),
+ instanceActivatedEvent.getClusterInstanceId(),
+ instanceActivatedEvent.getMemberId(),
instanceActivatedEvent.getNetworkPartitionId(),
instanceActivatedEvent.getPartitionId());
@@ -650,8 +650,8 @@ public class TopologyBuilder {
MemberReadyToShutdownEvent memberReadyToShutdownEvent = new MemberReadyToShutdownEvent(
instanceReadyToShutdownEvent.getServiceName(),
instanceReadyToShutdownEvent.getClusterId(),
- instanceReadyToShutdownEvent.getClusterInstanceId(), instanceReadyToShutdownEvent.getMemberId(),
- instanceReadyToShutdownEvent.getInstanceId(),
+ instanceReadyToShutdownEvent.getClusterInstanceId(),
+ instanceReadyToShutdownEvent.getMemberId(),
instanceReadyToShutdownEvent.getNetworkPartitionId(),
instanceReadyToShutdownEvent.getPartitionId());
try {
@@ -710,8 +710,8 @@ public class TopologyBuilder {
MemberMaintenanceModeEvent memberMaintenanceModeEvent = new MemberMaintenanceModeEvent(
instanceMaintenanceModeEvent.getServiceName(),
instanceMaintenanceModeEvent.getClusterId(),
- instanceMaintenanceModeEvent.getClusterInstanceId(), instanceMaintenanceModeEvent.getMemberId(),
- instanceMaintenanceModeEvent.getInstanceId(),
+ instanceMaintenanceModeEvent.getClusterInstanceId(),
+ instanceMaintenanceModeEvent.getMemberId(),
instanceMaintenanceModeEvent.getNetworkPartitionId(),
instanceMaintenanceModeEvent.getPartitionId());
try {
@@ -766,7 +766,7 @@ public class TopologyBuilder {
memberId));
return;
}
- String instanceId = member.getInstanceId();
+
String clusterInstanceId = member.getClusterInstanceId();
try {
@@ -779,7 +779,7 @@ public class TopologyBuilder {
}
/* @TODO leftover from grouping_poc*/
String groupAlias = null;
- TopologyEventPublisher.sendMemberTerminatedEvent(serviceName, clusterId, memberId, instanceId,
+ TopologyEventPublisher.sendMemberTerminatedEvent(serviceName, clusterId, memberId,
clusterInstanceId, networkPartitionId,
partitionId, properties, groupAlias);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
index 260cc34..8608fc8 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
@@ -72,7 +72,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
handleNullObject(cartridgeConfig, "Cartridge definition is null");
if(log.isInfoEnabled()) {
- log.info("Starting to add cartridge: [type] " + cartridgeConfig.getType());
+ log.info("Starting to add cartridge: [cartridge-type] " + cartridgeConfig.getType());
}
if (log.isDebugEnabled()) {
log.debug("Cartridge definition: " + cartridgeConfig.toString());
@@ -126,7 +126,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
// transaction ends
if(log.isInfoEnabled()) {
- log.info("Successfully added cartridge: [type] " + cartridgeType);
+ log.info("Successfully added cartridge: [cartridge-type] " + cartridgeType);
}
}
@@ -141,13 +141,13 @@ public class CloudControllerServiceImpl implements CloudControllerService {
continue;
}
String partitionId = entry.getKey();
- IaasProvider oldIaasProvider = entry.getValue();
- if (newIaasProviders.contains(oldIaasProvider)) {
+ IaasProvider iaasProvider = entry.getValue();
+ if (newIaasProviders.contains(iaasProvider)) {
if (log.isDebugEnabled()) {
- log.debug("Copying a partition from the Cartridge that is undeployed, to the new Cartridge. "
- + "[partition id] : " + partitionId + " [cartridge type] " + destCartridge.getType());
+ log.debug("Copying partition from the cartridge that is undeployed, to the new cartridge: "
+ + "[partition-id] " + partitionId + " [cartridge-type] " + destCartridge.getType());
}
- destCartridge.addIaasProvider(partitionId, newIaasProviders.get(newIaasProviders.indexOf(oldIaasProvider)));
+ destCartridge.addIaasProvider(partitionId, newIaasProviders.get(newIaasProviders.indexOf(iaasProvider)));
}
}
}
@@ -355,8 +355,8 @@ public class CloudControllerServiceImpl implements CloudControllerService {
IaasProvider iaasProvider = cartridge.getIaasProviderOfPartition(partitionId);
if (iaasProvider == null) {
String msg = String.format("Could not start instance, " +
- "IaaS provider not found in cartridge %s for partition %s." +
- "Only following partitions are found: %s ", cartridgeType, partitionId,
+ "IaaS provider not found in cartridge %s for partition %s, " +
+ "partitions found: %s ", cartridgeType, partitionId,
cartridge.getPartitionToIaasProvider().keySet().toString());
log.error(msg);
throw new InvalidIaasProviderException(msg);
@@ -600,7 +600,6 @@ public class CloudControllerServiceImpl implements CloudControllerService {
member.getServiceName(),
member.getClusterId(),
member.getClusterInstanceId(), member.getMemberId(),
- member.getInstanceId(),
member.getNetworkPartitionId(),
member.getPartitionId());
@@ -716,7 +715,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
return CloudControllerUtil.toCartridgeInfo(cartridge);
}
- String msg = "Could not find cartridge: [type] " + cartridgeType;
+ String msg = "Could not find cartridge: [cartridge-type] " + cartridgeType;
log.error(msg);
throw new CartridgeNotFoundException(msg);
}
@@ -733,7 +732,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
if (cartridge == null) {
String msg =
- "Service unregistration failed. No matching cartridge found: [type] " + cartridgeType;
+ "Service unregistration failed. No matching cartridge found: [cartridge-type] " + cartridgeType;
log.error(msg);
throw new UnregisteredClusterException(msg);
}
@@ -921,11 +920,13 @@ public class CloudControllerServiceImpl implements CloudControllerService {
CloudControllerContext.getInstance().addToCartridgeTypeToPartitionIdMap(cartridgeType, partitionId);
if (log.isDebugEnabled()) {
- log.debug("Partition " + partitionId + " added to the cache against cartridge type: " + cartridgeType);
+ log.debug("Partition " + partitionId + " added to the cache against cartridge: " +
+ "[cartridge-type]" + cartridgeType);
}
} catch (Exception e) {
- log.error(e.getMessage(), e);
- throw new InvalidPartitionException(e.getMessage(), e);
+ String message = "Could not cache partitions against the cartridge: [cartridge-type] " + cartridgeType;
+ log.error(message, e);
+ throw new InvalidPartitionException(message, e);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/Member.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/Member.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/Member.java
index fcad561..d0b9dae 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/Member.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/Member.java
@@ -27,7 +27,6 @@ public class Member {
private String serviceName;
private String clusterId;
- private String instanceId;
private String clusterInstanceId;
private String networkPartitionId;
private String partitionId;
@@ -136,14 +135,6 @@ public class Member {
this.property = property;
}
- public String getInstanceId() {
- return instanceId;
- }
-
- public void setInstanceId(String instanceId) {
- this.instanceId = instanceId;
- }
-
public String getClusterInstanceId() {
return clusterInstanceId;
}
@@ -157,7 +148,6 @@ public class Member {
return "Member [serviceName=" + getServiceName()
+ ", clusterId=" + getClusterId()
+ ", memberId=" + getMemberId()
- + ", instanceId=" + getInstanceId()
+ ", clusterInstanceId=" + getClusterInstanceId()
+ ", networkPartitionId=" + getNetworkPartitionId()
+ ", partitionId=" + getPartitionId()
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
index bf68815..0979e82 100644
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
@@ -474,7 +474,7 @@ public class LoadBalancerConfiguration {
// we are making it as 1 because we are not using this for static loadbalancer configuration
long initTime = -1;
Member member = new Member(cluster.getServiceName(), cluster.getClusterId(), memberId,
- memberId, "1", Constants.STATIC_NETWORK_PARTITION, Constants.STATIC_PARTITION, initTime);
+ memberId, Constants.STATIC_NETWORK_PARTITION, Constants.STATIC_PARTITION, initTime);
String ip = memberNode.getProperty(Constants.CONF_PROPERTY_IP);
validateRequiredPropertyInNode(Constants.CONF_PROPERTY_IP, ip, String.format("member %s", memberId));
List<String> memberPrivateIPs = new ArrayList<String>();
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java
index 4b6f095..ae25888 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java
@@ -38,7 +38,6 @@ public class Member implements Serializable, LifeCycleStateTransitionBehavior<Me
private final String serviceName;
private final String clusterId;
private final String memberId;
- private final String instanceId;
private final String clusterInstanceId;
private final String networkPartitionId;
private final String partitionId;
@@ -59,11 +58,10 @@ public class Member implements Serializable, LifeCycleStateTransitionBehavior<Me
// instance id to use if snapshot wise group scaling is enabled
private LifeCycleStateManager<MemberStatus> memberStateManager;
- public Member(String serviceName, String clusterId, String memberId, String instanceId, String clusterInstanceId,
+ public Member(String serviceName, String clusterId, String memberId, String clusterInstanceId,
String networkPartitionId, String partitionId, long initTime) {
this.serviceName = serviceName;
this.clusterId = clusterId;
- this.instanceId = instanceId;
this.clusterInstanceId = clusterInstanceId;
this.networkPartitionId = networkPartitionId;
this.partitionId = partitionId;
@@ -198,10 +196,6 @@ public class Member implements Serializable, LifeCycleStateTransitionBehavior<Me
this.memberPublicIPs = memberPublicIPs;
}
- public String getInstanceId() {
- return instanceId;
- }
-
public String getClusterInstanceId() {
return clusterInstanceId;
}
@@ -211,7 +205,6 @@ public class Member implements Serializable, LifeCycleStateTransitionBehavior<Me
return "Member [serviceName=" + getServiceName()
+ ", clusterId=" + getClusterId()
+ ", memberId=" + getMemberId()
- + ", instanceId=" + getInstanceId()
+ ", clusterInstanceId=" + getClusterInstanceId()
+ ", networkPartitionId=" + getNetworkPartitionId()
+ ", partitionId=" + getPartitionId()
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberFaultEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberFaultEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberFaultEvent.java
index 87eaa0c..cb6698c 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberFaultEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberFaultEvent.java
@@ -28,16 +28,14 @@ public class MemberFaultEvent extends Event {
private final String clusterId;
private final String clusterInstanceId;
private final String memberId;
- private final String instanceId;
private final String partitionId;
private final String networkPartitionId;
private final float value;
- public MemberFaultEvent(String clusterId, String clusterInstanceId, String memberId, String instanceId,
+ public MemberFaultEvent(String clusterId, String clusterInstanceId, String memberId,
String partitionId, String networkPartitionId, float value) {
this.clusterId = clusterId;
this.clusterInstanceId = clusterInstanceId;
- this.instanceId = instanceId;
this.memberId = memberId;
this.partitionId = partitionId;
this.networkPartitionId = networkPartitionId;
@@ -61,10 +59,6 @@ public class MemberFaultEvent extends Event {
return memberId;
}
- public String getInstanceId() {
- return instanceId;
- }
-
public String getNetworkPartitionId() {
return networkPartitionId;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceMaintenanceModeEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceMaintenanceModeEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceMaintenanceModeEvent.java
index ee605f3..7e0d2e3 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceMaintenanceModeEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceMaintenanceModeEvent.java
@@ -24,18 +24,16 @@ public class InstanceMaintenanceModeEvent extends InstanceStatusEvent implements
private final String serviceName;
private final String clusterId;
private final String memberId;
- private final String instanceId;
private final String clusterInstanceId;
private final String networkPartitionId;
private final String partitionId;
private String groupId;
- public InstanceMaintenanceModeEvent(String serviceName, String clusterId, String memberId, String instanceId,
+ public InstanceMaintenanceModeEvent(String serviceName, String clusterId, String memberId,
String clusterInstanceId, String networkPartitionId, String partitionId) {
this.serviceName = serviceName;
this.clusterId = clusterId;
this.memberId = memberId;
- this.instanceId = instanceId;
this.clusterInstanceId = clusterInstanceId;
this.networkPartitionId = networkPartitionId;
this.partitionId = partitionId;
@@ -69,11 +67,6 @@ public class InstanceMaintenanceModeEvent extends InstanceStatusEvent implements
this.groupId = groupId;
}
- public String getInstanceId() {
- return instanceId;
-}
-
-
public String getClusterInstanceId() {
return clusterInstanceId;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceReadyToShutdownEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceReadyToShutdownEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceReadyToShutdownEvent.java
index 0049547..cd89796 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceReadyToShutdownEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceReadyToShutdownEvent.java
@@ -28,18 +28,16 @@ public class InstanceReadyToShutdownEvent extends InstanceStatusEvent implements
private final String serviceName;
private final String clusterId;
private final String memberId;
- private final String instanceId;
private final String clusterInstanceId;
private final String networkPartitionId;
private final String partitionId;
private String groupId;
- public InstanceReadyToShutdownEvent(String serviceName, String clusterId, String memberId, String instanceId,
+ public InstanceReadyToShutdownEvent(String serviceName, String clusterId, String memberId,
String clusterInstanceId, String networkPartitionId, String partitionId) {
this.serviceName = serviceName;
this.clusterId = clusterId;
this.memberId = memberId;
- this.instanceId = instanceId;
this.clusterInstanceId = clusterInstanceId;
this.networkPartitionId = networkPartitionId;
this.partitionId = partitionId;
@@ -73,11 +71,6 @@ public class InstanceReadyToShutdownEvent extends InstanceStatusEvent implements
this.groupId = groupId;
}
- public String getInstanceId() {
- return instanceId;
- }
-
-
public String getClusterInstanceId() {
return clusterInstanceId;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceStartedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceStartedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceStartedEvent.java
index f78e322..ca62688 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceStartedEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceStartedEvent.java
@@ -30,18 +30,16 @@ public class InstanceStartedEvent extends InstanceStatusEvent implements Seriali
private final String serviceName;
private final String clusterId;
private final String memberId;
- private final String instanceId;
private final String clusterInstanceId;
private final String networkPartitionId;
private final String partitionId;
private String groupId;
- public InstanceStartedEvent(String serviceName, String clusterId, String memberId, String instanceId,
+ public InstanceStartedEvent(String serviceName, String clusterId, String memberId,
String clusterInstanceId, String networkPartitionId, String partitionId) {
this.serviceName = serviceName;
this.clusterId = clusterId;
this.memberId = memberId;
- this.instanceId = instanceId;
this.clusterInstanceId = clusterInstanceId;
this.networkPartitionId = networkPartitionId;
this.partitionId = partitionId;
@@ -75,10 +73,6 @@ public class InstanceStartedEvent extends InstanceStatusEvent implements Seriali
this.groupId = groupId;
}
- public String getInstanceId() {
- return instanceId;
- }
-
public String getClusterInstanceId() {
return clusterInstanceId;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/ping/PingEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/ping/PingEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/ping/PingEvent.java
deleted file mode 100644
index 0fcb6a5..0000000
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/ping/PingEvent.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-package org.apache.stratos.messaging.event.ping;
-
-import org.apache.stratos.messaging.event.instance.notifier.InstanceNotifierEvent;
-
-import java.io.Serializable;
-
-/**
- * Ping event.
- */
-public class PingEvent extends InstanceNotifierEvent implements Serializable {
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/InstanceSpawnedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/InstanceSpawnedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/InstanceSpawnedEvent.java
index 05d30ff..f8c70ac 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/InstanceSpawnedEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/InstanceSpawnedEvent.java
@@ -36,7 +36,6 @@ public class InstanceSpawnedEvent extends TopologyEvent implements Serializable
private final String networkPartitionId;
private final String partitionId;
private final String memberId;
- private final String instanceId;
private final long initTime;
private String lbClusterId;
@@ -48,21 +47,16 @@ public class InstanceSpawnedEvent extends TopologyEvent implements Serializable
public InstanceSpawnedEvent(String serviceName, String clusterId, String clusterInstanceId, String memberId,
- String instanceId, String networkPartitionId, String partitionId, long initTime) {
+ String networkPartitionId, String partitionId, long initTime) {
this.serviceName = serviceName;
this.clusterId = clusterId;
this.clusterInstanceId = clusterInstanceId;
this.memberId = memberId;
- this.instanceId = instanceId;
this.networkPartitionId = networkPartitionId;
this.partitionId = partitionId;
this.initTime = initTime;
}
- public String getInstanceId() {
- return instanceId;
- }
-
public String getServiceName() {
return serviceName;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java
index 3c22780..129a717 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java
@@ -38,7 +38,6 @@ public class MemberActivatedEvent extends TopologyEvent implements Serializable
private final String clusterId;
private final String clusterInstanceId;
private final String memberId;
- private final String instanceId;
private final String networkPartitionId;
private final String partitionId;
@@ -52,12 +51,11 @@ public class MemberActivatedEvent extends TopologyEvent implements Serializable
private String defaultPublicIP;
public MemberActivatedEvent(String serviceName, String clusterId, String clusterInstanceId, String memberId,
- String instanceId, String networkPartitionId, String partitionId) {
+ String networkPartitionId, String partitionId) {
this.serviceName = serviceName;
this.clusterId = clusterId;
this.clusterInstanceId = clusterInstanceId;
this.memberId = memberId;
- this.instanceId = instanceId;
this.networkPartitionId = networkPartitionId;
this.partitionId = partitionId;
this.portMap = new HashMap<Integer, Port>();
@@ -160,10 +158,6 @@ public class MemberActivatedEvent extends TopologyEvent implements Serializable
this.defaultPublicIP = defaultPublicIP;
}
- public String getInstanceId() {
- return instanceId;
- }
-
public String getClusterInstanceId() {
return clusterInstanceId;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberMaintenanceModeEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberMaintenanceModeEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberMaintenanceModeEvent.java
index b2a783b..b1ae389 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberMaintenanceModeEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberMaintenanceModeEvent.java
@@ -29,7 +29,6 @@ public class MemberMaintenanceModeEvent extends TopologyEvent implements Seriali
private final String clusterId;
private final String clusterInstanceId;
private final String memberId;
- private final String instanceId;
private final String networkPartitionId;
private final String partitionId;
private MemberStatus status;
@@ -37,20 +36,15 @@ public class MemberMaintenanceModeEvent extends TopologyEvent implements Seriali
private String groupId;
public MemberMaintenanceModeEvent(String serviceName, String clusterId, String clusterInstanceId, String memberId,
- String instanceId, String networkPartitionId, String partitionId) {
+ String networkPartitionId, String partitionId) {
this.serviceName = serviceName;
this.clusterId = clusterId;
this.clusterInstanceId = clusterInstanceId;
this.memberId = memberId;
- this.instanceId = instanceId;
this.networkPartitionId = networkPartitionId;
this.partitionId = partitionId;
}
- public String getInstanceId() {
- return instanceId;
- }
-
public String getServiceName() {
return serviceName;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberReadyToShutdownEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberReadyToShutdownEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberReadyToShutdownEvent.java
index a03eac3..cd47c08 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberReadyToShutdownEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberReadyToShutdownEvent.java
@@ -28,7 +28,6 @@ public class MemberReadyToShutdownEvent extends TopologyEvent implements Seriali
private final String clusterId;
private final String clusterInstanceId;
private final String memberId;
- private final String instanceId;
private final String networkPartitionId;
private final String partitionId;
private MemberStatus status;
@@ -36,21 +35,16 @@ public class MemberReadyToShutdownEvent extends TopologyEvent implements Seriali
private String groupId;
public MemberReadyToShutdownEvent(String serviceName, String clusterId, String clusterInstanceId, String memberId,
- String instanceId, String networkPartitionId, String partitionId) {
+ String networkPartitionId, String partitionId) {
this.serviceName = serviceName;
this.clusterId = clusterId;
this.clusterInstanceId = clusterInstanceId;
this.memberId = memberId;
- this.instanceId = instanceId;
this.networkPartitionId = networkPartitionId;
this.partitionId = partitionId;
}
- public String getInstanceId() {
- return instanceId;
- }
-
- public String getServiceName() {
+ public String getServiceName() {
return serviceName;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberStartedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberStartedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberStartedEvent.java
index 0de0143..49709f7 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberStartedEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberStartedEvent.java
@@ -38,24 +38,17 @@ public class MemberStartedEvent extends TopologyEvent implements Serializable {
private MemberStatus status;
private Properties properties;
private String groupId;
- private String instanceId;
-
- public MemberStartedEvent(String serviceName, String clusterId, String clusterInstanceId, String memberId, String instanceId, String networkPartitionId,
- String partitionId) {
+ public MemberStartedEvent(String serviceName, String clusterId, String clusterInstanceId, String memberId,
+ String networkPartitionId, String partitionId) {
this.serviceName = serviceName;
this.clusterId = clusterId;
this.clusterInstanceId = clusterInstanceId;
this.memberId = memberId;
- this.instanceId = instanceId;
this.networkPartitionId = networkPartitionId;
this.partitionId = partitionId;
}
- public String getInstanceId() {
- return instanceId;
- }
-
public String getServiceName() {
return serviceName;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberSuspendedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberSuspendedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberSuspendedEvent.java
index ecb6617..ab82370 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberSuspendedEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberSuspendedEvent.java
@@ -33,16 +33,14 @@ public class MemberSuspendedEvent extends TopologyEvent implements Serializable
private final String partitionId;
private final String memberId;
private String groupId;
- private String instanceId;
public MemberSuspendedEvent(String serviceName, String clusterId, String networkPartitionId,
- String partitionId, String memberId, String instanceId) {
+ String partitionId, String memberId) {
this.serviceName = serviceName;
this.clusterId = clusterId;
this.networkPartitionId = networkPartitionId;
this.partitionId = partitionId;
this.memberId = memberId;
- this.instanceId = instanceId;
}
public String getServiceName() {
@@ -72,8 +70,4 @@ public class MemberSuspendedEvent extends TopologyEvent implements Serializable
public void setGroupId(String groupId) {
this.groupId = groupId;
}
-
- public String getInstanceId() {
- return instanceId;
- }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberTerminatedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberTerminatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberTerminatedEvent.java
index 58be1ef..f2575e7 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberTerminatedEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberTerminatedEvent.java
@@ -32,7 +32,6 @@ public class MemberTerminatedEvent extends TopologyEvent implements Serializable
private final String serviceName;
private final String clusterId;
private final String memberId;
- private final String instanceId;
private final String clusterInstanceId;
private final String networkPartitionId;
private final String partitionId;
@@ -40,12 +39,11 @@ public class MemberTerminatedEvent extends TopologyEvent implements Serializable
private Properties properties;
- public MemberTerminatedEvent(String serviceName, String clusterId, String memberId, String instanceId,
+ public MemberTerminatedEvent(String serviceName, String clusterId, String memberId,
String clusterInstanceId, String networkPartitionId, String partitionId) {
this.serviceName = serviceName;
this.clusterId = clusterId;
this.memberId = memberId;
- this.instanceId = instanceId;
this.clusterInstanceId = clusterInstanceId;
this.networkPartitionId = networkPartitionId;
this.partitionId = partitionId;
@@ -86,10 +84,6 @@ public class MemberTerminatedEvent extends TopologyEvent implements Serializable
this.properties = properties;
}
- public String getInstanceId() {
- return instanceId;
- }
-
public String getClusterInstanceId() {
return clusterInstanceId;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/InstanceSpawnedMessageProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/InstanceSpawnedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/InstanceSpawnedMessageProcessor.java
index f3fca4c..2bf210b 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/InstanceSpawnedMessageProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/InstanceSpawnedMessageProcessor.java
@@ -131,7 +131,7 @@ public class InstanceSpawnedMessageProcessor extends MessageProcessor {
// Apply changes to the topology
Member member = new Member(event.getServiceName(), event.getClusterId(), event.getMemberId(),
- event.getInstanceId(), event.getClusterInstanceId(), event.getNetworkPartitionId(),
+ event.getClusterInstanceId(), event.getNetworkPartitionId(),
event.getPartitionId(), event.getInitTime());
member.setDefaultPublicIP(event.getDefaultPublicIP());
member.setMemberPublicIPs(event.getMemberPublicIPs());
@@ -147,7 +147,6 @@ public class InstanceSpawnedMessageProcessor extends MessageProcessor {
event.getServiceName(),
event.getClusterId(),
event.getMemberId(),
- event.getInstanceId(),
event.getClusterInstanceId()));
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
index e4e756b..9bc5114 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
@@ -386,7 +386,9 @@ public class ObjectConverter {
&& deploymentPolicyBean.getApplicationPolicy().getNetworkPartition() != null
&& !deploymentPolicyBean.getApplicationPolicy().getNetworkPartition().isEmpty()) {
deploymentPolicy
- .setApplicationLevelNetworkPartitions(convertApplicationLevelNetworkPartitionToStubApplicationLevelNetworkPartition(deploymentPolicyBean.getApplicationPolicy().getNetworkPartition()));
+ .setApplicationLevelNetworkPartitions(
+ convertApplicationLevelNetworkPartitionToStubApplicationLevelNetworkPartition(
+ deploymentPolicyBean.getApplicationPolicy().getNetworkPartition()));
}
if (deploymentPolicyBean.getChildPolicies() != null && !deploymentPolicyBean.getChildPolicies().isEmpty()) {
@@ -630,7 +632,6 @@ public class ObjectConverter {
memberBean.setServiceName(member.getServiceName());
memberBean.setClusterId(member.getClusterId());
memberBean.setMemberId(member.getMemberId());
- memberBean.setInstanceId(member.getInstanceId());
memberBean.setClusterInstanceId(member.getClusterInstanceId());
memberBean.setLbClusterId(member.getLbClusterId());
http://git-wip-us.apache.org/repos/asf/stratos/blob/0626501e/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java
----------------------------------------------------------------------
diff --git a/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java b/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java
index 3817577..c567824 100644
--- a/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java
+++ b/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java
@@ -45,7 +45,9 @@ import org.wso2.siddhi.query.api.expression.constant.IntConstant;
import org.wso2.siddhi.query.api.expression.constant.LongConstant;
import org.wso2.siddhi.query.api.extension.annotation.SiddhiExtension;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.ScheduledExecutorService;
@@ -210,7 +212,7 @@ public class FaultHandlingWindowProcessor extends WindowProcessor implements Run
log.info("Publishing member fault event for [member-id] " + memberId);
MemberFaultEvent memberFaultEvent = new MemberFaultEvent(member.getClusterId(), member.getClusterInstanceId(),
- member.getMemberId(), member.getPartitionId(), member.getInstanceId(),
+ member.getMemberId(), member.getPartitionId(),
member.getNetworkPartitionId(), 0);
memberFaultEventMessageMap.put("message", memberFaultEvent);
[3/4] stratos git commit: Updating object conversion:
autoscaler.partition -> cloud.controller.partition
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/c7feb35f/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl b/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
index ef701fd..02a72c3 100644
--- a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
+++ b/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
@@ -1,26 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns="http://impl.services.controller.cloud.stratos.apache.org" xmlns:ax27="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd" xmlns:ax23="http://domain.controller.cloud.stratos.apache.org/xsd" xmlns:ax24="http://common.stratos.apache.org/xsd" xmlns:ax21="http://exception.controller.cloud.stratos.apache.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:ax210="http://topology.domain.messaging.stratos.apache.org/xsd" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://impl.services.controller.cloud.stratos.apache.org">
+<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ax29="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd" xmlns:ns="http://impl.services.controller.cloud.stratos.apache.org" xmlns:ax27="http://topology.domain.messaging.stratos.apache.org/xsd" xmlns:ax23="http://domain.controller.cloud.stratos.apache.org/xsd" xmlns:ax24="http://common.stratos.apache.org/xsd" xmlns:ax21="http://exception.controller.cloud.stratos.apache.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://impl.services.controller.cloud.stratos.apache.org">
<wsdl:types>
- <xs:schema xmlns:ax29="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd" xmlns:ax26="http://domain.controller.cloud.stratos.apache.org/xsd" xmlns:ax211="http://topology.domain.messaging.stratos.apache.org/xsd" xmlns:ax22="http://exception.controller.cloud.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.controller.cloud.stratos.apache.org">
+ <xs:schema xmlns:ax28="http://topology.domain.messaging.stratos.apache.org/xsd" xmlns:ax26="http://domain.controller.cloud.stratos.apache.org/xsd" xmlns:ax211="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd" xmlns:ax22="http://exception.controller.cloud.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.controller.cloud.stratos.apache.org">
<xs:import namespace="http://exception.controller.cloud.stratos.apache.org/xsd"/>
<xs:import namespace="http://domain.controller.cloud.stratos.apache.org/xsd"/>
- <xs:import namespace="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd"/>
<xs:import namespace="http://topology.domain.messaging.stratos.apache.org/xsd"/>
- <xs:element name="getCartridges">
- <xs:complexType>
- <xs:sequence/>
- </xs:complexType>
- </xs:element>
- <xs:element name="getCartridgesResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="CloudControllerServiceInvalidCartridgeDefinitionException">
+ <xs:import namespace="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd"/>
+ <xs:element name="CloudControllerServiceCartridgeNotFoundException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidCartridgeDefinitionException" nillable="true" type="ax21:InvalidCartridgeDefinitionException"/>
+ <xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true" type="ax21:CartridgeNotFoundException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -31,211 +19,45 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addCartridge">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="cartridgeConfig" nillable="true" type="ax26:CartridgeConfig"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="CloudControllerServiceInvalidCartridgeTypeException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="InvalidCartridgeTypeException" nillable="true" type="ax21:InvalidCartridgeTypeException"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="removeCartridge">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="CloudControllerServiceInvalidServiceGroupException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax21:InvalidServiceGroupException"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getServiceGroup">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getServiceGroupResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax26:ServiceGroup"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="addServiceGroup">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax26:ServiceGroup"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="removeServiceGroup">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getClusterContext">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getClusterContextResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax26:ClusterContext"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="CloudControllerServiceNonExistingKubernetesClusterException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="NonExistingKubernetesClusterException" nillable="true" type="ax21:NonExistingKubernetesClusterException"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="removeKubernetesCluster">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="removeKubernetesClusterResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="CloudControllerServiceNonExistingKubernetesHostException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="NonExistingKubernetesHostException" nillable="true" type="ax21:NonExistingKubernetesHostException"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="removeKubernetesHost">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="kubernetesHostId" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="removeKubernetesHostResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="CloudControllerServiceInvalidKubernetesClusterException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="InvalidKubernetesClusterException" nillable="true" type="ax21:InvalidKubernetesClusterException"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="addKubernetesCluster">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="kubernetesCluster" nillable="true" type="ax29:KubernetesCluster"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="addKubernetesClusterResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getKubernetesCluster">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getKubernetesClusterResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax29:KubernetesCluster"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getKubernetesClusters">
- <xs:complexType>
- <xs:sequence/>
- </xs:complexType>
- </xs:element>
- <xs:element name="getKubernetesClustersResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax29:KubernetesCluster"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="CloudControllerServiceCartridgeNotFoundException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="CartridgeNotFoundException" nillable="true" type="ax21:CartridgeNotFoundException"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="registerService">
+ <xs:element name="startInstance">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="registrant" nillable="true" type="ax26:Registrant"/>
+ <xs:element minOccurs="0" name="instanceContext" nillable="true" type="ax26:InstanceContext"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="registerServiceResponse">
+ <xs:element name="startInstanceResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax26:MemberContext"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="startInstance">
+ <xs:element name="CloudControllerServiceInvalidMemberException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="instanceContext" nillable="true" type="ax26:InstanceContext"/>
+ <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax21:InvalidMemberException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="startInstanceResponse">
+ <xs:element name="CloudControllerServiceInvalidCartridgeTypeException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax26:MemberContext"/>
+ <xs:element minOccurs="0" name="InvalidCartridgeTypeException" nillable="true" type="ax21:InvalidCartridgeTypeException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="CloudControllerServiceInvalidMemberException">
+ <xs:element name="terminateInstance">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax21:InvalidMemberException"/>
+ <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="terminateInstance">
+ <xs:element name="CloudControllerServiceInvalidServiceGroupException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax21:InvalidServiceGroupException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -351,7 +173,7 @@
<xs:element minOccurs="0" name="serviceName" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="instanceId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="status" nillable="true" type="ax210:ClusterStatus"/>
+ <xs:element minOccurs="0" name="status" nillable="true" type="ax27:ClusterStatus"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -417,6 +239,13 @@
</xs:sequence>
</xs:complexType>
</xs:element>
+ <xs:element name="CloudControllerServiceNonExistingKubernetesClusterException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="NonExistingKubernetesClusterException" nillable="true" type="ax21:NonExistingKubernetesClusterException"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
<xs:element name="getMasterForKubernetesCluster">
<xs:complexType>
<xs:sequence>
@@ -467,6 +296,13 @@
</xs:sequence>
</xs:complexType>
</xs:element>
+ <xs:element name="CloudControllerServiceNonExistingKubernetesHostException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="NonExistingKubernetesHostException" nillable="true" type="ax21:NonExistingKubernetesHostException"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
<xs:element name="updateKubernetesHost">
<xs:complexType>
<xs:sequence>
@@ -509,73 +345,217 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- </xs:schema>
- <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://topology.domain.messaging.stratos.apache.org/xsd">
- <xs:complexType abstract="true" name="ClusterStatus">
- <xs:complexContent>
- <xs:extension base="xs:Enum">
- <xs:sequence>
- <xs:element minOccurs="0" name="code" type="xs:int"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:schema>
- <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://common.stratos.apache.org/xsd">
- <xs:complexType name="Properties">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax24:Property"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="Property">
- <xs:sequence>
- <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="value" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:schema>
- <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://exception.controller.cloud.stratos.apache.org/xsd">
- <xs:complexType name="InvalidCartridgeDefinitionException">
- <xs:sequence>
- <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="InvalidIaasProviderException">
- <xs:sequence>
- <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
- </xs:sequence>
+ <xs:element name="registerService">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="registrant" nillable="true" type="ax26:Registrant"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="registerServiceResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getCartridges">
+ <xs:complexType>
+ <xs:sequence/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getCartridgesResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="CloudControllerServiceInvalidCartridgeDefinitionException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="InvalidCartridgeDefinitionException" nillable="true" type="ax21:InvalidCartridgeDefinitionException"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="addCartridge">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="cartridgeConfig" nillable="true" type="ax26:CartridgeConfig"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="removeCartridge">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getServiceGroup">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getServiceGroupResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax26:ServiceGroup"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="addServiceGroup">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax26:ServiceGroup"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="removeServiceGroup">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getClusterContext">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getClusterContextResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax26:ClusterContext"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="removeKubernetesCluster">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="removeKubernetesClusterResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="removeKubernetesHost">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="kubernetesHostId" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="removeKubernetesHostResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="CloudControllerServiceInvalidKubernetesClusterException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="InvalidKubernetesClusterException" nillable="true" type="ax21:InvalidKubernetesClusterException"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="addKubernetesCluster">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="kubernetesCluster" nillable="true" type="ax29:KubernetesCluster"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="addKubernetesClusterResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getKubernetesCluster">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getKubernetesClusterResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax29:KubernetesCluster"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getKubernetesClusters">
+ <xs:complexType>
+ <xs:sequence/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="getKubernetesClustersResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax29:KubernetesCluster"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:schema>
+ <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://topology.domain.messaging.stratos.apache.org/xsd">
+ <xs:complexType abstract="true" name="ClusterStatus">
+ <xs:complexContent>
+ <xs:extension base="xs:Enum">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="code" type="xs:int"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
</xs:complexType>
- <xs:complexType name="InvalidCartridgeTypeException">
+ </xs:schema>
+ <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://common.stratos.apache.org/xsd">
+ <xs:complexType name="Properties">
<xs:sequence>
- <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax24:Property"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="InvalidServiceGroupException">
+ <xs:complexType name="Property">
<xs:sequence>
- <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="value" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="NonExistingKubernetesClusterException">
+ </xs:schema>
+ <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://exception.controller.cloud.stratos.apache.org/xsd">
+ <xs:complexType name="CartridgeNotFoundException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="NonExistingKubernetesHostException">
+ <xs:complexType name="InvalidIaasProviderException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="InvalidKubernetesClusterException">
+ <xs:complexType name="InvalidMemberException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="CartridgeNotFoundException">
+ <xs:complexType name="InvalidCartridgeTypeException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="InvalidMemberException">
+ <xs:complexType name="InvalidServiceGroupException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
@@ -605,11 +585,21 @@
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
+ <xs:complexType name="NonExistingKubernetesClusterException">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
<xs:complexType name="InvalidKubernetesHostException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
+ <xs:complexType name="NonExistingKubernetesHostException">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
<xs:complexType name="InvalidKubernetesMasterException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
@@ -620,36 +610,46 @@
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- </xs:schema>
- <xs:schema xmlns:ax28="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd">
- <xs:import namespace="http://common.stratos.apache.org/xsd"/>
- <xs:complexType name="KubernetesCluster">
+ <xs:complexType name="InvalidCartridgeDefinitionException">
<xs:sequence>
- <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="kubernetesHosts" nillable="true" type="ax27:KubernetesHost"/>
- <xs:element minOccurs="0" name="kubernetesMaster" nillable="true" type="ax27:KubernetesMaster"/>
- <xs:element minOccurs="0" name="portRange" nillable="true" type="ax27:PortRange"/>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax28:Properties"/>
+ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="InvalidKubernetesClusterException">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
+ </xs:schema>
+ <xs:schema xmlns:ax210="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://kubernetes.domain.controller.cloud.stratos.apache.org/xsd">
+ <xs:import namespace="http://common.stratos.apache.org/xsd"/>
<xs:complexType name="KubernetesHost">
<xs:sequence>
<xs:element minOccurs="0" name="hostId" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="hostIpAddress" 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="ax28:Properties"/>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax210:Properties"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="KubernetesMaster">
<xs:complexContent>
- <xs:extension base="ax27:KubernetesHost">
+ <xs:extension base="ax29:KubernetesHost">
<xs:sequence>
<xs:element minOccurs="0" name="endpoint" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
+ <xs:complexType name="KubernetesCluster">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="kubernetesHosts" nillable="true" type="ax29:KubernetesHost"/>
+ <xs:element minOccurs="0" name="kubernetesMaster" nillable="true" type="ax29:KubernetesMaster"/>
+ <xs:element minOccurs="0" name="portRange" nillable="true" type="ax29:PortRange"/>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax210:Properties"/>
+ </xs:sequence>
+ </xs:complexType>
<xs:complexType name="PortRange">
<xs:sequence>
<xs:element minOccurs="0" name="lower" type="xs:int"/>
@@ -659,76 +659,99 @@
</xs:schema>
<xs:schema xmlns:ax25="http://common.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://domain.controller.cloud.stratos.apache.org/xsd">
<xs:import namespace="http://common.stratos.apache.org/xsd"/>
- <xs:complexType name="CartridgeConfig">
+ <xs:complexType name="InstanceContext">
<xs:sequence>
- <xs:element minOccurs="0" name="baseDir" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="category" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="container" nillable="true" type="ax23:Container"/>
- <xs:element minOccurs="0" name="defaultAutoscalingPolicy" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="defaultDeploymentPolicy" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="deployerType" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="deploymentDirs" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="displayName" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="exportingProperties" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="iaasConfigs" nillable="true" type="ax23:IaasConfig"/>
- <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/>
- <xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax23:LoadbalancerConfig"/>
- <xs:element minOccurs="0" name="multiTenant" type="xs:boolean"/>
- <xs:element minOccurs="0" name="persistence" nillable="true" type="ax23:Persistence"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax23:PortMapping"/>
+ <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="clusterInstanceId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="initTime" type="xs:long"/>
+ <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="obsoleteExpiryTime" type="xs:long"/>
+ <xs:element minOccurs="0" name="partition" nillable="true" type="ax23:Partition"/>
<xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/>
- <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="serviceGroup" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="version" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="Container">
+ <xs:complexType name="Partition">
<xs:sequence>
- <xs:element minOccurs="0" name="dockerFileRepo" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="imageName" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="partitionMax" type="xs:int"/>
+ <xs:element minOccurs="0" name="partitionMin" type="xs:int"/>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/>
+ <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="IaasConfig">
+ <xs:complexType name="MemberContext">
<xs:sequence>
- <xs:element minOccurs="0" name="className" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="credential" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="identity" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="imageId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="networkInterfaces" nillable="true" type="ax23:NetworkInterfaces"/>
- <xs:element minOccurs="0" name="payload" nillable="true" type="xs:base64Binary"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="allocatedIPs" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="clusterInstanceId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="defaultPrivateIP" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="defaultPublicIP" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="dynamicPayload" nillable="true" type="xs:anyType"/>
+ <xs:element minOccurs="0" name="initTime" type="xs:long"/>
+ <xs:element minOccurs="0" name="instanceId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="instanceMetadata" nillable="true" type="ax23:InstanceMetadata"/>
+ <xs:element minOccurs="0" name="lbClusterId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="obsoleteExpiryTime" type="xs:long"/>
+ <xs:element minOccurs="0" name="obsoleteInitTime" type="xs:long"/>
+ <xs:element minOccurs="0" name="partition" nillable="true" type="ax23:Partition"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="privateIPs" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/>
- <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="publicIPs" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="NetworkInterfaces">
+ <xs:complexType name="InstanceMetadata">
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="networkInterfaces" nillable="true" type="ax23:NetworkInterface"/>
+ <xs:element minOccurs="0" name="hostname" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="hypervisor" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="imageId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="loginPort" type="xs:int"/>
+ <xs:element minOccurs="0" name="operatingSystem64bit" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="operatingSystemArchitecture" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="operatingSystemName" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="operatingSystemVersion" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="ram" type="xs:int"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="NetworkInterface">
+ <xs:complexType name="Dependencies">
<xs:sequence>
- <xs:element minOccurs="0" name="fixedIp" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="floatingNetworks" nillable="true" type="ax23:FloatingNetworks"/>
- <xs:element minOccurs="0" name="networkUuid" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="portUuid" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="killBehaviour" nillable="true" type="xs:string"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="startupOrders" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="FloatingNetworks">
+ <xs:complexType name="CartridgeInfo">
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="floatingNetworks" nillable="true" type="ax23:FloatingNetwork"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="appTypes" nillable="true" type="ax23:AppType"/>
+ <xs:element minOccurs="0" name="baseDir" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="category" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="defaultAutoscalingPolicy" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="defaultDeploymentPolicy" nillable="true" type="xs:string"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="deploymentDirs" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="displayName" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax23:LoadbalancerConfig"/>
+ <xs:element minOccurs="0" name="multiTenant" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="persistence" nillable="true" type="ax23:Persistence"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax23:PortMapping"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax25:Property"/>
+ <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="serviceGroup" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="version" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="FloatingNetwork">
+ <xs:complexType name="AppType">
<xs:sequence>
- <xs:element minOccurs="0" name="floatingIP" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="appSpecificMapping" type="xs:boolean"/>
<xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="networkUuid" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="LoadbalancerConfig">
@@ -762,147 +785,124 @@
<xs:element minOccurs="0" name="proxyPort" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="ServiceGroup">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridges" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax23:Dependencies"/>
- <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="subGroups" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="Dependencies">
- <xs:sequence>
- <xs:element minOccurs="0" name="killBehaviour" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="startupOrders" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="ClusterContext">
- <xs:sequence>
- <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="kubernetesServices" nillable="true" type="xs:anyType"/>
- <xs:element minOccurs="0" name="lbCluster" type="xs:boolean"/>
- <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/>
- <xs:element minOccurs="0" name="timeoutInMillis" type="xs:long"/>
- <xs:element minOccurs="0" name="volumeRequired" type="xs:boolean"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax23:Volume"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="Registrant">
- <xs:sequence>
- <xs:element minOccurs="0" name="autoScalerPolicyName" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="persistence" nillable="true" type="ax23:Persistence"/>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/>
- <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="InstanceContext">
- <xs:sequence>
- <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="clusterInstanceId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="initTime" type="xs:long"/>
- <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="obsoleteExpiryTime" type="xs:long"/>
- <xs:element minOccurs="0" name="partition" nillable="true" type="ax23:Partition"/>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="Partition">
- <xs:sequence>
- <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/>
- <xs:element minOccurs="0" name="kubernetesClusterId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="partitionMax" type="xs:int"/>
- <xs:element minOccurs="0" name="partitionMin" type="xs:int"/>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/>
- <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="MemberContext">
+ <xs:complexType name="ApplicationClusterContext">
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="allocatedIPs" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="clusterInstanceId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="defaultPrivateIP" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="defaultPublicIP" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="dynamicPayload" nillable="true" type="xs:anyType"/>
- <xs:element minOccurs="0" name="initTime" type="xs:long"/>
- <xs:element minOccurs="0" name="instanceId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="instanceMetadata" nillable="true" type="ax23:InstanceMetadata"/>
- <xs:element minOccurs="0" name="lbClusterId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="obsoleteExpiryTime" type="xs:long"/>
- <xs:element minOccurs="0" name="obsoleteInitTime" type="xs:long"/>
- <xs:element minOccurs="0" name="partition" nillable="true" type="ax23:Partition"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="privateIPs" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="autoscalePolicyName" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="lbCluster" type="xs:boolean"/>
<xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="publicIPs" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="textPayload" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="InstanceMetadata">
+ <xs:complexType name="Registrant">
<xs:sequence>
- <xs:element minOccurs="0" name="hostname" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="hypervisor" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="imageId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="loginPort" type="xs:int"/>
- <xs:element minOccurs="0" name="operatingSystem64bit" type="xs:boolean"/>
- <xs:element minOccurs="0" name="operatingSystemArchitecture" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="operatingSystemName" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="operatingSystemVersion" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="ram" type="xs:int"/>
+ <xs:element minOccurs="0" name="autoScalerPolicyName" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="persistence" nillable="true" type="ax23:Persistence"/>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/>
+ <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="CartridgeInfo">
+ <xs:complexType name="CartridgeConfig">
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="appTypes" nillable="true" type="ax23:AppType"/>
<xs:element minOccurs="0" name="baseDir" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="category" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="container" nillable="true" type="ax23:Container"/>
<xs:element minOccurs="0" name="defaultAutoscalingPolicy" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="defaultDeploymentPolicy" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="deployerType" nillable="true" type="xs:string"/>
<xs:element maxOccurs="unbounded" minOccurs="0" name="deploymentDirs" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="displayName" nillable="true" type="xs:string"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="exportingProperties" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="iaasConfigs" nillable="true" type="ax23:IaasConfig"/>
<xs:element minOccurs="0" name="isPublic" type="xs:boolean"/>
<xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax23:LoadbalancerConfig"/>
<xs:element minOccurs="0" name="multiTenant" type="xs:boolean"/>
<xs:element minOccurs="0" name="persistence" nillable="true" type="ax23:Persistence"/>
<xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax23:PortMapping"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax25:Property"/>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/>
<xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="serviceGroup" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="type" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="version" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="AppType">
+ <xs:complexType name="Container">
<xs:sequence>
- <xs:element minOccurs="0" name="appSpecificMapping" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="dockerFileRepo" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="imageName" nillable="true" type="xs:string"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="IaasConfig">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="className" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="credential" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="identity" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="imageId" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="networkInterfaces" nillable="true" type="ax23:NetworkInterfaces"/>
+ <xs:element minOccurs="0" name="payload" nillable="true" type="xs:base64Binary"/>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/>
+ <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="ApplicationClusterContext">
+ <xs:complexType name="NetworkInterfaces">
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="networkInterfaces" nillable="true" type="ax23:NetworkInterface"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="NetworkInterface">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="fixedIp" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="floatingNetworks" nillable="true" type="ax23:FloatingNetworks"/>
+ <xs:element minOccurs="0" name="networkUuid" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="portUuid" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="FloatingNetworks">
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="floatingNetworks" nillable="true" type="ax23:FloatingNetwork"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="FloatingNetwork">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="floatingIP" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="networkUuid" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="ServiceGroup">
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridges" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax23:Dependencies"/>
+ <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="subGroups" nillable="true" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="ClusterContext">
<xs:sequence>
- <xs:element minOccurs="0" name="autoscalePolicyName" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="kubernetesServices" nillable="true" type="xs:anyType"/>
<xs:element minOccurs="0" name="lbCluster" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/>
- <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="textPayload" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="timeoutInMillis" type="xs:long"/>
+ <xs:element minOccurs="0" name="volumeRequired" type="xs:boolean"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax23:Volume"/>
</xs:sequence>
</xs:complexType>
</xs:schema>
@@ -976,6 +976,9 @@
<wsdl:message name="CloudControllerServiceInvalidKubernetesClusterException">
<wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidKubernetesClusterException"/>
</wsdl:message>
+ <wsdl:message name="addServiceGroupRequest">
+ <wsdl:part name="parameters" element="ns:addServiceGroup"/>
+ </wsdl:message>
<wsdl:message name="registerServiceRequest">
<wsdl:part name="parameters" element="ns:registerService"/>
</wsdl:message>
@@ -985,27 +988,24 @@
<wsdl:message name="CloudControllerServiceCartridgeNotFoundException">
<wsdl:part name="parameters" element="ns:CloudControllerServiceCartridgeNotFoundException"/>
</wsdl:message>
- <wsdl:message name="addServiceGroupRequest">
- <wsdl:part name="parameters" element="ns:addServiceGroup"/>
- </wsdl:message>
<wsdl:message name="terminateInstanceRequest">
<wsdl:part name="parameters" element="ns:terminateInstance"/>
</wsdl:message>
<wsdl:message name="CloudControllerServiceInvalidMemberException">
<wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidMemberException"/>
</wsdl:message>
- <wsdl:message name="getServiceGroupDependenciesRequest">
- <wsdl:part name="parameters" element="ns:getServiceGroupDependencies"/>
- </wsdl:message>
- <wsdl:message name="getServiceGroupDependenciesResponse">
- <wsdl:part name="parameters" element="ns:getServiceGroupDependenciesResponse"/>
- </wsdl:message>
<wsdl:message name="getServiceGroupRequest">
<wsdl:part name="parameters" element="ns:getServiceGroup"/>
</wsdl:message>
<wsdl:message name="getServiceGroupResponse">
<wsdl:part name="parameters" element="ns:getServiceGroupResponse"/>
</wsdl:message>
+ <wsdl:message name="getServiceGroupDependenciesRequest">
+ <wsdl:part name="parameters" element="ns:getServiceGroupDependencies"/>
+ </wsdl:message>
+ <wsdl:message name="getServiceGroupDependenciesResponse">
+ <wsdl:part name="parameters" element="ns:getServiceGroupDependenciesResponse"/>
+ </wsdl:message>
<wsdl:message name="getServiceGroupSubGroupsRequest">
<wsdl:part name="parameters" element="ns:getServiceGroupSubGroups"/>
</wsdl:message>
@@ -1087,15 +1087,15 @@
<wsdl:message name="CloudControllerServiceInvalidClusterException">
<wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidClusterException"/>
</wsdl:message>
- <wsdl:message name="updateClusterStatusRequest">
- <wsdl:part name="parameters" element="ns:updateClusterStatus"/>
- </wsdl:message>
<wsdl:message name="getClusterContextRequest">
<wsdl:part name="parameters" element="ns:getClusterContext"/>
</wsdl:message>
<wsdl:message name="getClusterContextResponse">
<wsdl:part name="parameters" element="ns:getClusterContextResponse"/>
</wsdl:message>
+ <wsdl:message name="updateClusterStatusRequest">
+ <wsdl:part name="parameters" element="ns:updateClusterStatus"/>
+ </wsdl:message>
<wsdl:message name="updateKubernetesHostRequest">
<wsdl:part name="parameters" element="ns:updateKubernetesHost"/>
</wsdl:message>
@@ -1161,30 +1161,30 @@
<wsdl:output message="ns:addKubernetesClusterResponse" wsaw:Action="urn:addKubernetesClusterResponse"/>
<wsdl:fault message="ns:CloudControllerServiceInvalidKubernetesClusterException" name="CloudControllerServiceInvalidKubernetesClusterException" wsaw:Action="urn:addKubernetesClusterCloudControllerServiceInvalidKubernetesClusterException"/>
</wsdl:operation>
+ <wsdl:operation name="addServiceGroup">
+ <wsdl:input message="ns:addServiceGroupRequest" wsaw:Action="urn:addServiceGroup"/>
+ <wsdl:fault message="ns:CloudControllerServiceInvalidServiceGroupException" name="CloudControllerServiceInvalidServiceGroupException" wsaw:Action="urn:addServiceGroupCloudControllerServiceInvalidServiceGroupException"/>
+ </wsdl:operation>
<wsdl:operation name="registerService">
<wsdl:input message="ns:registerServiceRequest" wsaw:Action="urn:registerService"/>
<wsdl:output message="ns:registerServiceResponse" wsaw:Action="urn:registerServiceResponse"/>
<wsdl:fault message="ns:CloudControllerServiceCartridgeNotFoundException" name="CloudControllerServiceCartridgeNotFoundException" wsaw:Action="urn:registerServiceCloudControllerServiceCartridgeNotFoundException"/>
</wsdl:operation>
- <wsdl:operation name="addServiceGroup">
- <wsdl:input message="ns:addServiceGroupRequest" wsaw:Action="urn:addServiceGroup"/>
- <wsdl:fault message="ns:CloudControllerServiceInvalidServiceGroupException" name="CloudControllerServiceInvalidServiceGroupException" wsaw:Action="urn:addServiceGroupCloudControllerServiceInvalidServiceGroupException"/>
- </wsdl:operation>
<wsdl:operation name="terminateInstance">
<wsdl:input message="ns:terminateInstanceRequest" wsaw:Action="urn:terminateInstance"/>
<wsdl:fault message="ns:CloudControllerServiceInvalidMemberException" name="CloudControllerServiceInvalidMemberException" wsaw:Action="urn:terminateInstanceCloudControllerServiceInvalidMemberException"/>
<wsdl:fault message="ns:CloudControllerServiceInvalidCartridgeTypeException" name="CloudControllerServiceInvalidCartridgeTypeException" wsaw:Action="urn:terminateInstanceCloudControllerServiceInvalidCartridgeTypeException"/>
</wsdl:operation>
- <wsdl:operation name="getServiceGroupDependencies">
- <wsdl:input message="ns:getServiceGroupDependenciesRequest" wsaw:Action="urn:getServiceGroupDependencies"/>
- <wsdl:output message="ns:getServiceGroupDependenciesResponse" wsaw:Action="urn:getServiceGroupDependenciesResponse"/>
- <wsdl:fault message="ns:CloudControllerServiceInvalidServiceGroupException" name="CloudControllerServiceInvalidServiceGroupException" wsaw:Action="urn:getServiceGroupDependenciesCloudControllerServiceInvalidServiceGroupException"/>
- </wsdl:operation>
<wsdl:operation name="getServiceGroup">
<wsdl:input message="ns:getServiceGroupRequest" wsaw:Action="urn:getServiceGroup"/>
<wsdl:output message="ns:getServiceGroupResponse" wsaw:Action="urn:getServiceGroupResponse"/>
<wsdl:fault message="ns:CloudControllerServiceInvalidServiceGroupException" name="CloudControllerServiceInvalidServiceGroupException" wsaw:Action="urn:getServiceGroupCloudControllerServiceInvalidServiceGroupException"/>
</wsdl:operation>
+ <wsdl:operation name="getServiceGroupDependencies">
+ <wsdl:input message="ns:getServiceGroupDependenciesRequest" wsaw:Action="urn:getServiceGroupDependencies"/>
+ <wsdl:output message="ns:getServiceGroupDependenciesResponse" wsaw:Action="urn:getServiceGroupDependenciesResponse"/>
+ <wsdl:fault message="ns:CloudControllerServiceInvalidServiceGroupException" name="CloudControllerServiceInvalidServiceGroupException" wsaw:Action="urn:getServiceGroupDependenciesCloudControllerServiceInvalidServiceGroupException"/>
+ </wsdl:operation>
<wsdl:operation name="getServiceGroupSubGroups">
<wsdl:input message="ns:getServiceGroupSubGroupsRequest" wsaw:Action="urn:getServiceGroupSubGroups"/>
<wsdl:output message="ns:getServiceGroupSubGroupsResponse" wsaw:Action="urn:getServiceGroupSubGroupsResponse"/>
@@ -1244,13 +1244,13 @@
<wsdl:input message="ns:terminateInstancesRequest" wsaw:Action="urn:terminateInstances"/>
<wsdl:fault message="ns:CloudControllerServiceInvalidClusterException" name="CloudControllerServiceInvalidClusterException" wsaw:Action="urn:terminateInstancesCloudControllerServiceInvalidClusterException"/>
</wsdl:operation>
- <wsdl:operation name="updateClusterStatus">
- <wsdl:input message="ns:updateClusterStatusRequest" wsaw:Action="urn:updateClusterStatus"/>
- </wsdl:operation>
<wsdl:operation name="getClusterContext">
<wsdl:input message="ns:getClusterContextRequest" wsaw:Action="urn:getClusterContext"/>
<wsdl:output message="ns:getClusterContextResponse" wsaw:Action="urn:getClusterContextResponse"/>
</wsdl:operation>
+ <wsdl:operation name="updateClusterStatus">
+ <wsdl:input message="ns:updateClusterStatusRequest" wsaw:Action="urn:updateClusterStatus"/>
+ </wsdl:operation>
<wsdl:operation name="updateKubernetesHost">
<wsdl:input message="ns:updateKubernetesHostRequest" wsaw:Action="urn:updateKubernetesHost"/>
<wsdl:output message="ns:updateKubernetesHostResponse" wsaw:Action="urn:updateKubernetesHostResponse"/>
@@ -1374,15 +1374,6 @@
<soap:fault use="literal" name="CloudControllerServiceInvalidKubernetesClusterException"/>
</wsdl:fault>
</wsdl:operation>
- <wsdl:operation name="addServiceGroup">
- <soap:operation soapAction="urn:addServiceGroup" style="document"/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:fault name="CloudControllerServiceInvalidServiceGroupException">
- <soap:fault use="literal" name="CloudControllerServiceInvalidServiceGroupException"/>
- </wsdl:fault>
- </wsdl:operation>
<wsdl:operation name="registerService">
<soap:operation soapAction="urn:registerService" style="document"/>
<wsdl:input>
@@ -1395,6 +1386,15 @@
<soap:fault use="literal" name="CloudControllerServiceCartridgeNotFoundException"/>
</wsdl:fault>
</wsdl:operation>
+ <wsdl:operation name="addServiceGroup">
+ <soap:operation soapAction="urn:addServiceGroup" style="document"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:fault name="CloudControllerServiceInvalidServiceGroupException">
+ <soap:fault use="literal" name="CloudControllerServiceInvalidServiceGroupException"/>
+ </wsdl:fault>
+ </wsdl:operation>
<wsdl:operation name="terminateInstance">
<soap:operation soapAction="urn:terminateInstance" style="document"/>
<wsdl:input>
@@ -1407,8 +1407,8 @@
<soap:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"/>
</wsdl:fault>
</wsdl:operation>
- <wsdl:operation name="getServiceGroup">
- <soap:operation soapAction="urn:getServiceGroup" style="document"/>
+ <wsdl:operation name="getServiceGroupDependencies">
+ <soap:operation soapAction="urn:getServiceGroupDependencies" style="document"/>
<wsdl:input>
<soap:body use="literal"/>
</wsdl:input>
@@ -1419,8 +1419,8 @@
<soap:fault use="literal" name="CloudControllerServiceInvalidServiceGroupException"/>
</wsdl:fault>
</wsdl:operation>
- <wsdl:operation name="getServiceGroupDependencies">
- <soap:operation soapAction="urn:getServiceGroupDependencies" style="document"/>
+ <wsdl:operation name="getServiceGroup">
+ <soap:operation soapAction="urn:getServiceGroup" style="document"/>
<wsdl:input>
<soap:body use="literal"/>
</wsdl:input>
@@ -1572,6 +1572,12 @@
<soap:fault use="literal" name="CloudControllerServiceInvalidClusterException"/>
</wsdl:fault>
</wsdl:operation>
+ <wsdl:operation name="updateClusterStatus">
+ <soap:operation soapAction="urn:updateClusterStatus" style="document"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ </wsdl:operation>
<wsdl:operation name="getClusterContext">
<soap:operation soapAction="urn:getClusterContext" style="document"/>
<wsdl:input>
@@ -1581,12 +1587,6 @@
<soap:body use="literal"/>
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="updateClusterStatus">
- <soap:operation soapAction="urn:updateClusterStatus" style="document"/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- </wsdl:operation>
<wsdl:operation name="updateKubernetesHost">
<soap:operation soapAction="urn:updateKubernetesHost" style="document"/>
<wsdl:input>
@@ -1743,15 +1743,6 @@
<soap12:fault use="literal" name="CloudControllerServiceInvalidKubernetesClusterException"/>
</wsdl:fault>
</wsdl:operation>
- <wsdl:operation name="addServiceGroup">
- <soap12:operation soapAction="urn:addServiceGroup" style="document"/>
- <wsdl:input>
- <soap12:body use="literal"/>
- </wsdl:input>
- <wsdl:fault name="CloudControllerServiceInvalidServiceGroupException">
- <soap12:fault use="literal" name="CloudControllerServiceInvalidServiceGroupException"/>
- </wsdl:fault>
- </wsdl:operation>
<wsdl:operation name="registerService">
<soap12:operation soapAction="urn:registerService" style="document"/>
<wsdl:input>
@@ -1764,6 +1755,15 @@
<soap12:fault use="literal" name="CloudControllerServiceCartridgeNotFoundException"/>
</wsdl:fault>
</wsdl:operation>
+ <wsdl:operation name="addServiceGroup">
+ <soap12:operation soapAction="urn:addServiceGroup" style="document"/>
+ <wsdl:input>
+ <soap12:body use="literal"/>
+ </wsdl:input>
+ <wsdl:fault name="CloudControllerServiceInvalidServiceGroupException">
+ <soap12:fault use="literal" name="CloudControllerServiceInvalidServiceGroupException"/>
+ </wsdl:fault>
+ </wsdl:operation>
<wsdl:operation name="terminateInstance">
<soap12:operation soapAction="urn:terminateInstance" style="document"/>
<wsdl:input>
@@ -1776,8 +1776,8 @@
<soap12:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"/>
</wsdl:fault>
</wsdl:operation>
- <wsdl:operation name="getServiceGroup">
- <soap12:operation soapAction="urn:getServiceGroup" style="document"/>
+ <wsdl:operation name="getServiceGroupDependencies">
+ <soap12:operation soapAction="urn:getServiceGroupDependencies" style="document"/>
<wsdl:input>
<soap12:body use="literal"/>
</wsdl:input>
@@ -1788,8 +1788,8 @@
<soap12:fault use="literal" name="CloudControllerServiceInvalidServiceGroupException"/>
</wsdl:fault>
</wsdl:operation>
- <wsdl:operation name="getServiceGroupDependencies">
- <soap12:operation soapAction="urn:getServiceGroupDependencies" style="document"/>
+ <wsdl:operation name="getServiceGroup">
+ <soap12:operation soapAction="urn:getServiceGroup" style="document"/>
<wsdl:input>
<soap12:body use="literal"/>
</wsdl:input>
@@ -1941,6 +1941,12 @@
<soap12:fault use="literal" name="CloudControllerServiceInvalidClusterException"/>
</wsdl:fault>
</wsdl:operation>
+ <wsdl:operation name="updateClusterStatus">
+ <soap12:operation soapAction="urn:updateClusterStatus" style="document"/>
+ <wsdl:input>
+ <soap12:body use="literal"/>
+ </wsdl:input>
+ </wsdl:operation>
<wsdl:operation name="getClusterContext">
<soap12:operation soapAction="urn:getClusterContext" style="document"/>
<wsdl:input>
@@ -1950,12 +1956,6 @@
<soap12:body use="literal"/>
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="updateClusterStatus">
- <soap12:operation soapAction="urn:updateClusterStatus" style="document"/>
- <wsdl:input>
- <soap12:body use="literal"/>
- </wsdl:input>
- </wsdl:operation>
<wsdl:operation name="updateKubernetesHost">
<soap12:operation soapAction="urn:updateKubernetesHost" style="document"/>
<wsdl:input>
@@ -2085,12 +2085,6 @@
<mime:content type="text/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="addServiceGroup">
- <http:operation location="addServiceGroup"/>
- <wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
- </wsdl:input>
- </wsdl:operation>
<wsdl:operation name="registerService">
<http:operation location="registerService"/>
<wsdl:input>
@@ -2100,14 +2094,20 @@
<mime:content type="text/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="addServiceGroup">
+ <http:operation location="addServiceGroup"/>
+ <wsdl:input>
+ <mime:content type="text/xml" part="parameters"/>
+ </wsdl:input>
+ </wsdl:operation>
<wsdl:operation name="terminateInstance">
<http:operation location="terminateInstance"/>
<wsdl:input>
<mime:content type="text/xml" part="parameters"/>
</wsdl:input>
</wsdl:operation>
- <wsdl:operation name="getServiceGroup">
- <http:operation location="getServiceGroup"/>
+ <wsdl:operation name="getServiceGroupDependencies">
+ <http:operation location="getServiceGroupDependencies"/>
<wsdl:input>
<mime:content type="text/xml" part="parameters"/>
</wsdl:input>
@@ -2115,8 +2115,8 @@
<mime:content type="text/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="getServiceGroupDependencies">
- <http:operation location="getServiceGroupDependencies"/>
+ <wsdl:operation name="getServiceGroup">
+ <http:operation location="getServiceGroup"/>
<wsdl:input>
<mime:content type="text/xml" part="parameters"/>
</wsdl:input>
@@ -2223,6 +2223,12 @@
<mime:content type="text/xml" part="parameters"/>
</wsdl:input>
</wsdl:operation>
+ <wsdl:operation name="updateClusterStatus">
+ <http:operation location="updateClusterStatus"/>
+ <wsdl:input>
+ <mime:content type="text/xml" part="parameters"/>
+ </wsdl:input>
+ </wsdl:operation>
<wsdl:operation name="getClusterContext">
<http:operation location="getClusterContext"/>
<wsdl:input>
@@ -2232,12 +2238,6 @@
<mime:content type="text/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="updateClusterStatus">
- <http:operation location="updateClusterStatus"/>
- <wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
- </wsdl:input>
- </wsdl:operation>
<wsdl:operation name="updateKubernetesHost">
<http:operation location="updateKubernetesHost"/>
<wsdl:input>
[2/4] stratos git commit: Adding amazon ec2 configuration sample to
cloud-controller.xml
Posted by im...@apache.org.
Adding amazon ec2 configuration sample to cloud-controller.xml
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/120c5731
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/120c5731
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/120c5731
Branch: refs/heads/master
Commit: 120c57318d1d91267f916910046d5c5d6afe4aaa
Parents: fbc20b0
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon Dec 22 11:22:35 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Dec 22 13:11:51 2014 +0530
----------------------------------------------------------------------
.../src/main/resources/conf/cloud-controller.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/120c5731/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
index 6c2967a..5a0737a 100644
--- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
@@ -53,6 +53,17 @@
<property name="X" value="x" />
<property name="Y" value="y" />
</iaasProvider -->
+ <!-- iaasProvider type="ec2" name="Amazon EC2">
+ <className>org.apache.stratos.cloud.controller.iaases.JcloudsEC2Iaas</className>
+ <provider>aws-ec2</provider>
+ <identity svns:secretAlias="cloud.controller.ec2.identity">identity</identity>
+ <credential svns:secretAlias="cloud.controller.ec2.credential">credential</credential>
+ <property name="jclouds.ec2.ami-query" value="owner-id=owner-id;state=available;image-type=machine"/>
+ <property name="availabilityZone" value="ap-southeast-1b"/>
+ <property name="securityGroups" value="security-group"/>
+ <property name="autoAssignIp" value="true" />
+ <property name="keyPair" value="keypair-name"/>
+ </iaasProvider -->
<iaasProvider type="kubernetes" name="Kubernetes">
<className>org.apache.stratos.cloud.controller.iaases.KubernetesIaas</className>
<provider>kubernetes</provider>
[4/4] stratos git commit: Updating object conversion:
autoscaler.partition -> cloud.controller.partition
Posted by im...@apache.org.
Updating object conversion: autoscaler.partition -> cloud.controller.partition
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c7feb35f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c7feb35f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c7feb35f
Branch: refs/heads/master
Commit: c7feb35fac9fc4774b8befd211c54e97086c9f67
Parents: 0626501
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon Dec 22 13:11:36 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Dec 22 13:11:52 2014 +0530
----------------------------------------------------------------------
.../client/CloudControllerClient.java | 19 +-
.../concurrent/PartitionValidatorCallable.java | 1 -
.../impl/CloudControllerServiceUtil.java | 14 +-
.../util/CloudControllerConstants.java | 2 +-
.../main/resources/CloudControllerService.wsdl | 964 +++++++++----------
5 files changed, 502 insertions(+), 498 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c7feb35f/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java
index 8bcbde6..caac260 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java
@@ -116,20 +116,25 @@ public class CloudControllerClient {
new org.apache.stratos.cloud.controller.stub.domain.Partition[partitions.length];
for(int i = 0; i < partitions.length; i++) {
- partitions1[i] = convertTOCCPartition(partitions[i]);
+ partitions1[i] = convertASPartitionTOCCPartition(partitions[i]);
}
return partitions1;
}
- private org.apache.stratos.cloud.controller.stub.domain.Partition convertTOCCPartition(org.apache.stratos.autoscaler.pojo.policy.deployment.partition.network.Partition partition) {
- org.apache.stratos.cloud.controller.stub.domain.Partition partition1 = new
+ private org.apache.stratos.cloud.controller.stub.domain.Partition
+ convertASPartitionTOCCPartition(org.apache.stratos.autoscaler.pojo.policy.deployment.partition.network.Partition partition) {
+
+ org.apache.stratos.cloud.controller.stub.domain.Partition ccPartition = new
org.apache.stratos.cloud.controller.stub.domain.Partition();
- partition1.setId(partition.getId());
- partition1.setProvider(partition.getProvider());
- partition1.setProperties(AutoscalerUtil.toStubProperties(partition.getProperties()));
+ ccPartition.setId(partition.getId());
+ ccPartition.setProvider(partition.getProvider());
+ ccPartition.setDescription(partition.getDescription());
+ ccPartition.setKubernetesClusterId(partition.getKubernetesClusterId());
+ ccPartition.setIsPublic(partition.getIsPublic());
+ ccPartition.setProperties(AutoscalerUtil.toStubProperties(partition.getProperties()));
- return partition1;
+ return ccPartition;
}
/*
http://git-wip-us.apache.org/repos/asf/stratos/blob/c7feb35f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/concurrent/PartitionValidatorCallable.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/concurrent/PartitionValidatorCallable.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/concurrent/PartitionValidatorCallable.java
index cdb10cb..7d4b7ea 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/concurrent/PartitionValidatorCallable.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/concurrent/PartitionValidatorCallable.java
@@ -57,5 +57,4 @@ public class PartitionValidatorCallable implements Callable<IaasProvider> {
return updatedIaasProvider;
}
-
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/c7feb35f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceUtil.java
index 3b703d1..23db8db 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceUtil.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceUtil.java
@@ -93,7 +93,13 @@ public class CloudControllerServiceUtil {
String provider = partition.getProvider();
Properties partitionProperties = CloudControllerUtil.toJavaUtilProperties(partition.getProperties());
- if (iaasProvider != null) {
+ if (CloudControllerConstants.KUBERNETES_PARTITION_PROVIDER.equals(provider)) {
+ // if this is a kubernetes based Partition
+ KubernetesPartitionValidator validator = new KubernetesPartitionValidator();
+ validator.validate(partition, partitionProperties);
+ return iaasProvider;
+
+ } else if (iaasProvider != null) {
// if this is a IaaS based partition
Iaas iaas = iaasProvider.getIaas();
PartitionValidator validator = iaas.getPartitionValidator();
@@ -101,12 +107,6 @@ public class CloudControllerServiceUtil {
iaasProvider = validator.validate(partition, partitionProperties);
return iaasProvider;
- } else if (CloudControllerConstants.DOCKER_PARTITION_PROVIDER.equals(provider)) {
- // if this is a docker based Partition
- KubernetesPartitionValidator validator = new KubernetesPartitionValidator();
- validator.validate(partition, partitionProperties);
- return null;
-
} else {
String msg = "Invalid partition found: [partition-id] " + partition.getId();
log.error(msg);
http://git-wip-us.apache.org/repos/asf/stratos/blob/c7feb35f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
index f15e450..43e9b30 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
@@ -295,5 +295,5 @@ public final class CloudControllerConstants {
public static final int PORT_RANGE_MAX = 65535;
public static final int PORT_RANGE_MIN = 1;
- public static final String DOCKER_PARTITION_PROVIDER = "docker";
+ public static final String KUBERNETES_PARTITION_PROVIDER = "kubernetes";
}