You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by me...@apache.org on 2014/09/10 04:17:36 UTC
[1/2] git commit: initial changes for service group APIs in CC
Repository: stratos
Updated Branches:
refs/heads/4.0.0-grouping 6dc7a58a9 -> bb45a5fc1
initial changes for service group APIs in CC
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e1b83c9f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e1b83c9f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e1b83c9f
Branch: refs/heads/4.0.0-grouping
Commit: e1b83c9ff631875c2155fafb91841b49772b1ffa
Parents: 6dc7a58
Author: Martin Eppel <me...@cisco..com>
Authored: Tue Sep 9 18:02:59 2014 -0700
Committer: Martin Eppel <me...@cisco..com>
Committed: Tue Sep 9 18:06:40 2014 -0700
----------------------------------------------------------------------
.../exception/InvalidServiceGroupException.java | 46 ++++++
.../impl/CloudControllerServiceImpl.java | 58 ++++++++
.../interfaces/CloudControllerService.java | 5 +
.../cloud/controller/pojo/Dependencies.java | 48 +++++++
.../cloud/controller/pojo/ServiceGroup.java | 69 +++++++++
.../cloud/controller/pojo/StartupOrder.java | 47 +++++++
.../runtime/FasterLookUpDataHolder.java | 34 +++++
.../client/CloudControllerServiceClient.java | 9 ++
.../deployer/DefaultServiceGroupDeployer.java | 140 +++++++++++++++----
.../bean/util/converter/PojoConverter.java | 9 ++
.../webapp/stratos/WEB-INF/schemas/schema.xsd | 25 ++++
.../main/resources/CloudControllerService.wsdl | 99 ++++++++++++-
12 files changed, 556 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/e1b83c9f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidServiceGroupException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidServiceGroupException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidServiceGroupException.java
new file mode 100644
index 0000000..10b65dc
--- /dev/null
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidServiceGroupException.java
@@ -0,0 +1,46 @@
+/*
+ * 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.cloud.controller.exception;
+
+public class InvalidServiceGroupException extends Exception {
+
+
+ private static final long serialVersionUID = 2651280146514042590L;
+
+ private String message;
+
+ public InvalidServiceGroupException(String msg) {
+ super(msg);
+ this.setMessage(msg);
+ }
+
+ public InvalidServiceGroupException(String msg, Exception ex) {
+ super(msg, ex);
+ this.setMessage(msg);
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e1b83c9f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
index 8471d87..530e99f 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
@@ -272,6 +272,64 @@ public class CloudControllerServiceImpl implements CloudControllerService {
log.error(msg);
throw new InvalidCartridgeTypeException(msg);
}
+
+ public void deployServiceGroup(ServiceGroup servicegroup) throws InvalidServiceGroupException {
+
+ if (servicegroup == null) {
+ String msg = "Invalid ServiceGroup Definition: Definition is null.";
+ log.error(msg);
+ throw new IllegalArgumentException(msg);
+
+ }
+
+ if(log.isDebugEnabled()) {
+ log.debug("CloudControllerServiceImpl:deployServiceGroup:" + servicegroup.getName());
+ }
+
+ Dependencies dependencies = servicegroup.getDependencies();
+
+ if(log.isDebugEnabled()) {
+ log.debug("CloudControllerServiceImpl:deployServiceGroup:dependencies" + dependencies);
+ }
+
+ StartupOrder [] startupOrder = dependencies.getStartupOrder();
+
+ if(log.isDebugEnabled()) {
+ log.debug("CloudControllerServiceImpl:deployServiceGroup:startupOrder" + startupOrder);
+
+ if (startupOrder != null) {
+ log.debug("CloudControllerServiceImpl:deployServiceGroup:startupOrder:size" + startupOrder.length);
+ } else {
+ log.debug("CloudControllerServiceImpl:deployServiceGroup:startupOrder: is null");
+ }
+ }
+
+ dataHolder.addServiceGroup(servicegroup);
+
+ this.persist();
+
+ }
+
+ public void undeployServiceGroup(String name) throws InvalidServiceGroupException {
+ if(log.isDebugEnabled()) {
+ log.debug("CloudControllerServiceImpl:undeployServiceGroup: " + name);
+ }
+
+ ServiceGroup serviceGroup = null;
+ if((serviceGroup = dataHolder.getServiceGroup(name)) != null) {
+ if (dataHolder.getServiceGroups().remove(name)) {
+ persist();
+ if(log.isInfoEnabled()) {
+ log.info("Successfully undeployed the Service Group definition: " + serviceGroup);
+ }
+ return;
+ }
+ }
+ String msg = "ServiceGroup " + name + " is not a deployed Service Group definition";
+ log.error(msg);
+ throw new InvalidServiceGroupException(msg);
+
+ }
@Override
public MemberContext startInstance(MemberContext memberContext) throws
http://git-wip-us.apache.org/repos/asf/stratos/blob/e1b83c9f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java
index 1ebcf23..9aa1fce 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java
@@ -20,6 +20,7 @@ package org.apache.stratos.cloud.controller.interfaces;
import org.apache.stratos.cloud.controller.deployment.partition.Partition;
import org.apache.stratos.cloud.controller.exception.*;
+import org.apache.stratos.cloud.controller.exception.InvalidServiceGroupException;
import org.apache.stratos.cloud.controller.pojo.*;
import org.apache.stratos.cloud.controller.pojo.application.ApplicationContext;
@@ -46,6 +47,10 @@ public interface CloudControllerService {
* @throws InvalidCartridgeTypeException if the cartridge type specified is not a deployed cartridge.
*/
public void undeployCartridgeDefinition(String cartridgeType) throws InvalidCartridgeTypeException;
+
+ public void deployServiceGroup(ServiceGroup servicegroup) throws InvalidServiceGroupException;
+
+ public void undeployServiceGroup(String name) throws InvalidServiceGroupException;
/**
* Validate a given {@link Partition} for basic property existence.
http://git-wip-us.apache.org/repos/asf/stratos/blob/e1b83c9f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Dependencies.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Dependencies.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Dependencies.java
new file mode 100644
index 0000000..0177341
--- /dev/null
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Dependencies.java
@@ -0,0 +1,48 @@
+/*
+ * 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.cloud.controller.pojo;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class Dependencies implements Serializable {
+
+ private static final long serialVersionUID = 4187267350546153680L;
+
+ private StartupOrder [] startupOrder;
+
+ private String killBehaviour;
+
+ public StartupOrder [] getStartupOrder() {
+ return startupOrder;
+ }
+
+ public void setStartupOrder(StartupOrder [] startupOrder) {
+ this.startupOrder = startupOrder;
+ }
+
+ public String getKillBehaviour() {
+ return killBehaviour;
+ }
+
+ public void setKillBehaviour(String killBehaviour) {
+ this.killBehaviour = killBehaviour;
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e1b83c9f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ServiceGroup.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ServiceGroup.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ServiceGroup.java
new file mode 100644
index 0000000..45957f5
--- /dev/null
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ServiceGroup.java
@@ -0,0 +1,69 @@
+/*
+ * 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.cloud.controller.pojo;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class ServiceGroup implements Serializable {
+
+
+ private static final long serialVersionUID = -7413745300105885793L;
+
+ private String name;
+
+ private String [] subGroups;
+
+ private String [] cartridges;
+
+ private Dependencies dependencies;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String [] getSubGroups() {
+ return subGroups;
+ }
+
+ public void setSubGroups(String [] subGroups) {
+ this.subGroups = subGroups;
+ }
+
+ public String [] getCartridges() {
+ return cartridges;
+ }
+
+ public void setCartridges(String [] cartridges) {
+ this.cartridges = cartridges;
+ }
+
+ public Dependencies getDependencies() {
+ return dependencies;
+ }
+
+ public void setDependencies(Dependencies dependencies) {
+ this.dependencies = dependencies;
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e1b83c9f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/StartupOrder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/StartupOrder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/StartupOrder.java
new file mode 100644
index 0000000..0f1c647
--- /dev/null
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/StartupOrder.java
@@ -0,0 +1,47 @@
+/*
+ * 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.cloud.controller.pojo;
+
+import java.io.Serializable;
+
+public class StartupOrder implements Serializable {
+
+ private static final long serialVersionUID = 280860334002791396L;
+
+ private String start;
+
+ private String after;
+
+ public String getStart() {
+ return start;
+ }
+
+ public void setStart(String start) {
+ this.start = start;
+ }
+
+ public String getAfter() {
+ return after;
+ }
+
+ public void setAfter(String after) {
+ this.after = after;
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e1b83c9f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/runtime/FasterLookUpDataHolder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/runtime/FasterLookUpDataHolder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/runtime/FasterLookUpDataHolder.java
index 6024606..e9e550a 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/runtime/FasterLookUpDataHolder.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/runtime/FasterLookUpDataHolder.java
@@ -83,6 +83,11 @@ public class FasterLookUpDataHolder implements Serializable{
*/
private List<Cartridge> cartridges;
+ /**
+ * List of deployed service groups
+ */
+ private List<ServiceGroup> serviceGroups;
+
private List<ConfigCompositeApplication> configCompositeApplication;
/**
@@ -128,6 +133,7 @@ public class FasterLookUpDataHolder implements Serializable{
private FasterLookUpDataHolder() {
cartridges = new ArrayList<Cartridge>();
+ serviceGroups = new ArrayList<ServiceGroup>();
configCompositeApplication = new ArrayList<ConfigCompositeApplication>();
}
@@ -139,6 +145,14 @@ public class FasterLookUpDataHolder implements Serializable{
public void setCartridges(List<Cartridge> cartridges) {
this.cartridges = cartridges;
}
+
+ public void setServiceGroups(List<ServiceGroup> serviceGroups) {
+ this.serviceGroups = serviceGroups;
+ }
+
+ public List<ServiceGroup> getServiceGroups() {
+ return this.serviceGroups;
+ }
public List<ConfigCompositeApplication> getConfigCompositeApplication() {
return configCompositeApplication;
@@ -178,6 +192,26 @@ public class FasterLookUpDataHolder implements Serializable{
}
+ public ServiceGroup getServiceGroup(String name) {
+ for (ServiceGroup serviceGroup : serviceGroups) {
+ if (serviceGroup.getName().equals(name)) {
+ return serviceGroup;
+ }
+ }
+
+ return null;
+ }
+
+ public void addServiceGroup(ServiceGroup newServiceGroup) {
+ this.serviceGroups.add(newServiceGroup);
+ }
+
+ public void removeServiceGroup(List<ServiceGroup> serviceGroup) {
+ if (this.serviceGroups != null) {
+ this.serviceGroups.removeAll(serviceGroup);
+ }
+ }
+
public IaasProvider getIaasProvider(String type) {
if(type == null) {
return null;
http://git-wip-us.apache.org/repos/asf/stratos/blob/e1b83c9f/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java
index 1729d20..d08fca6 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java
@@ -35,6 +35,7 @@ import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidIaa
import org.apache.stratos.cloud.controller.stub.CloudControllerServiceStub;
import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException;
import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredClusterExceptionException;
+import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidServiceGroupExceptionException;
import java.rmi.RemoteException;
import java.util.Iterator;
@@ -92,6 +93,14 @@ public class CloudControllerServiceClient {
stub.undeployCartridgeDefinition(cartridgeType);
}
+
+ public void deployServiceGroup (ServiceGroup serviceGroup) throws RemoteException, CloudControllerServiceInvalidServiceGroupExceptionException {
+ stub.deployServiceGroup(serviceGroup);
+ }
+
+ public void undeployServiceGroup (String name)throws RemoteException, CloudControllerServiceInvalidServiceGroupExceptionException {
+ stub.undeployServiceGroup(name);
+ }
public boolean register(String clusterId, String cartridgeType,
String payload, String tenantRange,
http://git-wip-us.apache.org/repos/asf/stratos/blob/e1b83c9f/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java
index 2fd3eee..0ed749a 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java
@@ -22,45 +22,65 @@ package org.apache.stratos.manager.grouping.deployer;
import org.apache.axis2.AxisFault;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException;
+//import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException;
import org.apache.stratos.manager.client.CloudControllerServiceClient;
import org.apache.stratos.manager.exception.ADCException;
import org.apache.stratos.manager.exception.InvalidServiceGroupException;
-import org.apache.stratos.manager.exception.PersistenceManagerException;
import org.apache.stratos.manager.exception.ServiceGroupDefinitioException;
import org.apache.stratos.manager.grouping.definitions.ServiceGroupDefinition;
-import org.apache.stratos.manager.retriever.DataInsertionAndRetrievalManager;
+import org.apache.stratos.manager.grouping.definitions.DependencyDefinitions;
+import org.apache.stratos.manager.grouping.definitions.StartupOrderDefinition;
+import org.apache.stratos.cloud.controller.stub.pojo.ServiceGroup;
+import org.apache.stratos.cloud.controller.stub.pojo.Dependencies;
+import org.apache.stratos.cloud.controller.stub.pojo.StartupOrder;
+import org.apache.stratos.cloud.controller.stub.*;
import java.rmi.RemoteException;
+import java.util.ArrayList;
import java.util.List;
public class DefaultServiceGroupDeployer implements ServiceGroupDeployer {
private static Log log = LogFactory.getLog(DefaultServiceGroupDeployer.class);
- private DataInsertionAndRetrievalManager dataInsertionAndRetrievalMgr;
public DefaultServiceGroupDeployer () {
- dataInsertionAndRetrievalMgr = new DataInsertionAndRetrievalManager();
}
- public void deployServiceGroupDefinition (Object serviceGroupDefinitionObj) throws InvalidServiceGroupException,
- CloudControllerServiceUnregisteredCartridgeExceptionException, ServiceGroupDefinitioException, ADCException {
+ public void deployServiceGroupDefinition (Object serviceGroupDefinitionObj) throws InvalidServiceGroupException, ServiceGroupDefinitioException, ADCException {
- ServiceGroupDefinition serviceGroupDefinition = null;
+ ServiceGroupDefinition serviceGroupDefinition = null;
+ ServiceGroup serviceGroup = null;
+
+ if (serviceGroupDefinitionObj == null) {
+ if (log.isDebugEnabled()) {
+ log.debug("deploying service group is null ");
+ }
+ throw new InvalidServiceGroupException("Service Group definition not found");
+ }
if (serviceGroupDefinitionObj instanceof ServiceGroupDefinition) {
serviceGroupDefinition = (ServiceGroupDefinition) serviceGroupDefinitionObj;
+
+ if (log.isDebugEnabled()) {
+ log.debug("deploying service group with name " + serviceGroupDefinition.getName());
+ }
+
+ // convert serviceGroupDefinition to serviceGroup
+ serviceGroup = this.populateServiceGroupPojo(serviceGroupDefinition);
} else {
+ log.error("trying to deploy invalid service group ");
throw new InvalidServiceGroupException("Invalid Service Group definition");
}
+
- if (serviceGroupDefinition == null) {
- throw new InvalidServiceGroupException("Service Group definition not found");
- }
-
-// if any cartridges are specified in the group, they should be already deployed
+ // if any cartridges are specified in the group, they should be already deployed
if (serviceGroupDefinition.getCartridges() != null) {
+
+ if (log.isDebugEnabled()) {
+ log.debug("checking cartridges in service group " + serviceGroupDefinition.getName());
+ }
+
List<String> cartridgeTypes = serviceGroupDefinition.getCartridges();
CloudControllerServiceClient ccServiceClient = null;
@@ -76,50 +96,110 @@ public class DefaultServiceGroupDeployer implements ServiceGroupDeployer {
try {
if(ccServiceClient.getCartridgeInfo(cartridgeType) == null) {
// cartridge is not deployed, can't continue
+ log.error("invalid cartridge found in service group " + cartridgeType);
throw new InvalidServiceGroupException("No Cartridge Definition found with type " + cartridgeType);
}
} catch (RemoteException e) {
throw new ADCException(e);
+ } catch (CloudControllerServiceUnregisteredCartridgeExceptionException e) {
+ throw new ADCException(e);
}
}
}
// if any sub groups are specified in the group, they should be already deployed
if (serviceGroupDefinition.getSubGroups() != null) {
+
+ if (log.isDebugEnabled()) {
+ log.debug("checking subGroups in service group " + serviceGroupDefinition.getName());
+ }
+
List<String> subGroupNames = serviceGroupDefinition.getSubGroups();
+
for (String subGroupName : subGroupNames) {
if (getServiceGroupDefinition(subGroupName) == null) {
// sub group not deployed, can't continue
- throw new InvalidServiceGroupException("No Service Group Definition found with name " + subGroupName);
+ log.error("invalid sub group found in service group " + subGroupName);
+ //throw new InvalidServiceGroupException("No Service Group Definition found with name " + subGroupName);
}
}
}
- try {
- dataInsertionAndRetrievalMgr.peristServiceGroupDefinition(serviceGroupDefinition);
+
+ CloudControllerServiceClient ccServiceClient = null;
- } catch (PersistenceManagerException e) {
- throw new InvalidServiceGroupException(e);
+ try {
+ ccServiceClient = CloudControllerServiceClient.getServiceClient();
+
+ if (log.isDebugEnabled()) {
+ log.debug("deplying to cloud controller service group " + serviceGroupDefinition.getName());
+ }
+
+ ccServiceClient.deployServiceGroup(serviceGroup);
+
+ } catch (AxisFault axisFault) {
+ throw new ADCException(axisFault);
+ }catch (RemoteException e) {
+ throw new ADCException(e);
+ } catch (CloudControllerServiceInvalidServiceGroupExceptionException e) {
+ throw new ADCException(e);
}
}
- public ServiceGroupDefinition getServiceGroupDefinition (String serviceGroupDefinitionName) throws ServiceGroupDefinitioException {
-
- try {
- return dataInsertionAndRetrievalMgr.getServiceGroupDefinition(serviceGroupDefinitionName);
+ public ServiceGroupDefinition getServiceGroupDefinition (String serviceGroupDefinitionName) /*throws ServiceGroupDefinitioException */{
- } catch (PersistenceManagerException e) {
- throw new ServiceGroupDefinitioException(e);
+ if (log.isDebugEnabled()) {
+ log.debug("getting service group from cloud controller " + serviceGroupDefinitionName);
}
+ //throw new ServiceGroupDefinitioException("method not supported");
+ return null;
}
public void undeployServiceGroupDefinition (String serviceGroupDefinitionName) throws ServiceGroupDefinitioException {
- try {
- dataInsertionAndRetrievalMgr.removeServiceGroupDefinition(serviceGroupDefinitionName);
-
- } catch (PersistenceManagerException e) {
- throw new ServiceGroupDefinitioException(e);
- }
+ throw new ServiceGroupDefinitioException("method not supported");
+ }
+
+ private ServiceGroup populateServiceGroupPojo (ServiceGroupDefinition serviceGroupDefinition ) {
+ ServiceGroup servicegroup = new ServiceGroup();
+
+ // implement conversion (mostly List -> Array)
+ servicegroup.setName(serviceGroupDefinition.getName());
+ List<String> subGroupsDef = serviceGroupDefinition.getSubGroups();
+ List<String> cartridgesDef = serviceGroupDefinition.getCartridges();
+
+ if (subGroupsDef == null) {
+ subGroupsDef = new ArrayList<String>(0);
+ }
+
+ if (cartridgesDef == null) {
+ cartridgesDef = new ArrayList<String>(0);
+ }
+
+ String [] subGroups = new String[subGroupsDef.size()];
+ String [] cartridges = new String[cartridgesDef.size()];
+
+ subGroups = subGroupsDef.toArray(subGroups);
+ cartridges = cartridgesDef.toArray(cartridges);
+
+ servicegroup.setSubGroups(subGroups);
+ servicegroup.setCartridges(cartridges);
+
+ DependencyDefinitions depDefs = serviceGroupDefinition.getDependencies();
+ List<StartupOrderDefinition> startDefs = depDefs.getStartupOrder();
+
+ Dependencies deps = new Dependencies();
+ StartupOrder [] startups = new StartupOrder [startDefs.size()];
+ for (int i = 0; i < startDefs.size(); i++) {
+ StartupOrderDefinition stDef = startDefs.get(i);
+ StartupOrder st = new StartupOrder();
+ st.setStart(stDef.getStart());
+ st.setAfter(stDef.getAfter());
+ startups[i] = st;
+ }
+ deps.setStartupOrder(startups);
+ servicegroup.setDependencies(deps);
+
+ return servicegroup;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e1b83c9f/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
index 974c34d..354e9c9 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
@@ -23,6 +23,7 @@ import org.apache.commons.logging.LogFactory;
import org.apache.commons.lang.StringUtils;
import org.apache.stratos.cloud.controller.stub.pojo.*;
import org.apache.stratos.manager.deploy.service.Service;
+import org.apache.stratos.manager.grouping.definitions.ServiceGroupDefinition;
import org.apache.stratos.manager.subscription.SubscriptionDomain;
import org.apache.stratos.messaging.domain.topology.Cluster;
import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.Partition;
@@ -90,6 +91,14 @@ public class PojoConverter {
return cartridgeConfig;
}
+
+ public static ServiceGroup populateServiceGroupPojo (ServiceGroupDefinition serviceGroupDefinition ) {
+ ServiceGroup servicegroup = new ServiceGroup();
+
+ // implement conversion (mostly List -> Array)
+
+ return servicegroup;
+ }
private static LoadbalancerConfig getLBConfig(LoadBalancerBean loadBalancer) {
LoadbalancerConfig lbConfig = new LoadbalancerConfig();
http://git-wip-us.apache.org/repos/asf/stratos/blob/e1b83c9f/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd
index 0de935f..c384bae 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd
+++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd
@@ -201,6 +201,31 @@
</xs:all>
</xs:complexType>
</xs:element>
+
+ <xs:element name="serviceGroup">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="subGroups" type="xs:string" minOccurs="0" maxOccurs="unbounded" nillable="false"/>
+ <xs:element name="cartridges" type="xs:string" minOccurs="1" maxOccurs="unbounded" nillable="false"/>
+ <xs:element name="dependencies" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="killBehaviour" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="startupOrder" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:all>
+ <xs:element name="start" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="after" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+ </xs:all>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
<xs:element name="subscriptionDomainRequest">
<xs:complexType>
http://git-wip-us.apache.org/repos/asf/stratos/blob/e1b83c9f/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 b24f895..929016b 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
@@ -60,6 +60,10 @@
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
<xs:complexType name="UnregisteredCartridgeException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
@@ -190,6 +194,26 @@
<xs:element name="terminateAllInstances">
<xs:complexType>
<xs:sequence>
+ <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax219:InvalidServiceGroupException"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="deployServiceGroup">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax220:ServiceGroup"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="undeployServiceGroup">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:complexType>
+ <xs:sequence>
<xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
@@ -406,7 +430,6 @@
</xs:sequence>
</xs:complexType>
<xs:complexType name="LoadbalancerConfig">
- <xs:sequence>
<xs:element minOccurs="0" name="properties" nillable="true" type="ax221:Properties"></xs:element>
<xs:element minOccurs="0" name="type" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
@@ -416,8 +439,6 @@
<xs:element minOccurs="0" name="port" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="protocol" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="proxyPort" nillable="true" type="xs:string"></xs:element>
- </xs:sequence>
- </xs:complexType>
<xs:complexType name="CompositeApplicationDefinition">
<xs:sequence>
<xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"></xs:element>
@@ -452,6 +473,37 @@
</xs:complexType>
<xs:complexType name="CartridgeConfig">
<xs:sequence>
+ <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="lbCluster" type="xs:boolean"></xs:element>
+ <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="timeoutInMillis" type="xs:long"></xs:element>
+ <xs:element minOccurs="0" name="volumeRequired" type="xs:boolean"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax220:Volume"></xs:element>
+ </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>
+ <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax220:Dependencies"></xs:element>
+ <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="subGroups" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="Dependencies">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="killBehaviour" nillable="true" type="xs:string"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="startupOrder" nillable="true" type="ax220:StartupOrder"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="StartupOrder">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="after" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="start" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:sequence>
<xs:element minOccurs="0" name="baseDir" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="defaultAutoscalingPolicy" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="defaultDeploymentPolicy" nillable="true" type="xs:string"></xs:element>
@@ -554,6 +606,12 @@
<wsdl:message name="CloudControllerServiceInvalidIaasProviderException">
<wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidIaasProviderException"></wsdl:part>
</wsdl:message>
+ <wsdl:message name="undeployServiceGroupRequest">
+ <wsdl:part name="parameters" element="ns:undeployServiceGroup"></wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="CloudControllerServiceInvalidServiceGroupException">
+ <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidServiceGroupException"></wsdl:part>
+ </wsdl:message>
<wsdl:message name="getCartridgeInfoRequest">
<wsdl:part name="parameters" element="ns:getCartridgeInfo"></wsdl:part>
</wsdl:message>
@@ -605,6 +663,9 @@
<wsdl:message name="getClusterContextResponse">
<wsdl:part name="parameters" element="ns:getClusterContextResponse"></wsdl:part>
</wsdl:message>
+ <wsdl:message name="deployServiceGroupRequest">
+ <wsdl:part name="parameters" element="ns:deployServiceGroup"></wsdl:part>
+ </wsdl:message>
<wsdl:message name="unDeployCompositeApplicationDefinitionRequest">
<wsdl:part name="parameters" element="ns:unDeployCompositeApplicationDefinition"></wsdl:part>
</wsdl:message>
@@ -635,6 +696,10 @@
<wsdl:fault message="ns:CloudControllerServiceInvalidCartridgeDefinitionException" name="CloudControllerServiceInvalidCartridgeDefinitionException" wsaw:Action="urn:deployCartridgeDefinitionCloudControllerServiceInvalidCartridgeDefinitionException"></wsdl:fault>
<wsdl:fault message="ns:CloudControllerServiceInvalidIaasProviderException" name="CloudControllerServiceInvalidIaasProviderException" wsaw:Action="urn:deployCartridgeDefinitionCloudControllerServiceInvalidIaasProviderException"></wsdl:fault>
</wsdl:operation>
+ <wsdl:operation name="undeployServiceGroup">
+ <wsdl:input message="ns:undeployServiceGroupRequest" wsaw:Action="urn:undeployServiceGroup"></wsdl:input>
+ <wsdl:fault message="ns:CloudControllerServiceInvalidServiceGroupException" name="CloudControllerServiceInvalidServiceGroupException" wsaw:Action="urn:undeployServiceGroupCloudControllerServiceInvalidServiceGroupException"></wsdl:fault>
+ </wsdl:operation>
<wsdl:operation name="getCartridgeInfo">
<wsdl:input message="ns:getCartridgeInfoRequest" wsaw:Action="urn:getCartridgeInfo"></wsdl:input>
<wsdl:output message="ns:getCartridgeInfoResponse" wsaw:Action="urn:getCartridgeInfoResponse"></wsdl:output>
@@ -675,6 +740,10 @@
<wsdl:input message="ns:getClusterContextRequest" wsaw:Action="urn:getClusterContext"></wsdl:input>
<wsdl:output message="ns:getClusterContextResponse" wsaw:Action="urn:getClusterContextResponse"></wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="deployServiceGroup">
+ <wsdl:input message="ns:deployServiceGroupRequest" wsaw:Action="urn:deployServiceGroup"></wsdl:input>
+ <wsdl:fault message="ns:CloudControllerServiceInvalidServiceGroupException" name="CloudControllerServiceInvalidServiceGroupException" wsaw:Action="urn:deployServiceGroupCloudControllerServiceInvalidServiceGroupException"></wsdl:fault>
+ </wsdl:operation>
<wsdl:operation name="unDeployCompositeApplicationDefinition">
<wsdl:input message="ns:unDeployCompositeApplicationDefinitionRequest" wsaw:Action="urn:unDeployCompositeApplicationDefinition"></wsdl:input>
<wsdl:fault message="ns:CloudControllerServiceInvalidCompositeApplicationDefinitionException" name="CloudControllerServiceInvalidCompositeApplicationDefinitionException" wsaw:Action="urn:unDeployCompositeApplicationDefinitionCloudControllerServiceInvalidCompositeApplicationDefinitionException"></wsdl:fault>
@@ -839,6 +908,15 @@
<soap:body use="literal"></soap:body>
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="deployServiceGroup">
+ <soap:operation soapAction="urn:deployServiceGroup" style="document"></soap:operation>
+ <wsdl:input>
+ <soap:body use="literal"></soap:body>
+ </wsdl:input>
+ <wsdl:fault name="CloudControllerServiceInvalidServiceGroupException">
+ <soap:fault use="literal" name="CloudControllerServiceInvalidServiceGroupException"></soap:fault>
+ </wsdl:fault>
+ </wsdl:operation>
<wsdl:operation name="unDeployCompositeApplicationDefinition">
<soap:operation soapAction="urn:unDeployCompositeApplicationDefinition" style="document"></soap:operation>
<wsdl:input>
@@ -1010,6 +1088,15 @@
<soap12:body use="literal"></soap12:body>
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="deployServiceGroup">
+ <soap12:operation soapAction="urn:deployServiceGroup" style="document"></soap12:operation>
+ <wsdl:input>
+ <soap12:body use="literal"></soap12:body>
+ </wsdl:input>
+ <wsdl:fault name="CloudControllerServiceInvalidServiceGroupException">
+ <soap12:fault use="literal" name="CloudControllerServiceInvalidServiceGroupException"></soap12:fault>
+ </wsdl:fault>
+ </wsdl:operation>
<wsdl:operation name="unDeployCompositeApplicationDefinition">
<soap12:operation soapAction="urn:unDeployCompositeApplicationDefinition" style="document"></soap12:operation>
<wsdl:input>
@@ -1130,6 +1217,12 @@
<mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="deployServiceGroup">
+ <http:operation location="deployServiceGroup"></http:operation>
+ <wsdl:input>
+ <mime:content type="text/xml" part="parameters"></mime:content>
+ </wsdl:input>
+ </wsdl:operation>
<wsdl:operation name="unDeployCompositeApplicationDefinition">
<http:operation location="unDeployCompositeApplicationDefinition"></http:operation>
<wsdl:input>
[2/2] git commit: regenerated CloudControllerService.wsdl
Posted by me...@apache.org.
regenerated CloudControllerService.wsdl
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bb45a5fc
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bb45a5fc
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bb45a5fc
Branch: refs/heads/4.0.0-grouping
Commit: bb45a5fc1d7a831e128b7231020b8effe05b9488
Parents: e1b83c9
Author: Martin Eppel <me...@cisco..com>
Authored: Tue Sep 9 19:16:40 2014 -0700
Committer: Martin Eppel <me...@cisco..com>
Committed: Tue Sep 9 19:16:40 2014 -0700
----------------------------------------------------------------------
.../main/resources/CloudControllerService.wsdl | 472 ++++++++++---------
1 file changed, 245 insertions(+), 227 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/bb45a5fc/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 929016b..6d40328 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,4 +1,4 @@
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns="http://impl.controller.cloud.stratos.apache.org" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ax218="http://exception.controller.cloud.stratos.apache.org/xsd" xmlns:ax220="http://partition.deployment.controller.cloud.stratos.apache.org/xsd" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ax221="http://pojo.controller.cloud.stratos.apache.org/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:ax226="http://application.pojo.controller.cloud.stratos.apache.org/xsd" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://impl.controller.cloud.stratos.apache.org">
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ax220="http://partition.deployment.controller.cloud.stratos.apache.org/xsd" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ax221="http://pojo.controller.cloud.stratos.apache.org/xsd" xmlns:ns="http://impl.controller.cloud.stratos.apache.org" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:ax226="http://application.pojo.controller.cloud.stratos.apache.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ax218="http://exception.controller.cloud.stratos.apache.org/xsd" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://impl.controller.cloud.stratos.apache.org">
<wsdl:documentation>CloudControllerService</wsdl:documentation>
<wsdl:types>
<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://application.pojo.controller.cloud.stratos.apache.org/xsd">
@@ -35,36 +35,37 @@
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="UnregisteredClusterException">
+ <xs:complexType name="InvalidCompositeApplicationDefinitionException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="InvalidCompositeApplicationDefinitionException">
+ <xs:complexType name="InvalidIaasProviderException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="InvalidIaasProviderException">
+ <xs:complexType name="InvalidServiceGroupException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="InvalidMemberException">
+ <xs:complexType name="UnregisteredCartridgeException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="InvalidClusterException">
+ <xs:complexType name="InvalidMemberException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
+ <xs:complexType name="InvalidClusterException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="UnregisteredCartridgeException">
+ <xs:complexType name="ApplicationDefinitionException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
@@ -74,13 +75,13 @@
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="ApplicationDefinitionException">
+ <xs:complexType name="UnregisteredClusterException">
<xs:sequence>
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:schema>
- <xs:schema xmlns:ax219="http://exception.controller.cloud.stratos.apache.org/xsd" xmlns:ax227="http://application.pojo.controller.cloud.stratos.apache.org/xsd" xmlns:ax223="http://partition.deployment.controller.cloud.stratos.apache.org/xsd" xmlns:ax225="http://pojo.controller.cloud.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.controller.cloud.stratos.apache.org">
+ <xs:schema xmlns:ax219="http://exception.controller.cloud.stratos.apache.org/xsd" xmlns:ax227="http://application.pojo.controller.cloud.stratos.apache.org/xsd" xmlns:ax223="http://partition.deployment.controller.cloud.stratos.apache.org/xsd" xmlns:ax224="http://pojo.controller.cloud.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.controller.cloud.stratos.apache.org">
<xs:import namespace="http://exception.controller.cloud.stratos.apache.org/xsd"></xs:import>
<xs:import namespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"></xs:import>
<xs:import namespace="http://pojo.controller.cloud.stratos.apache.org/xsd"></xs:import>
@@ -92,53 +93,53 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="validatePartition">
+ <xs:element name="CloudControllerServiceInvalidCartridgeTypeException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="partition" nillable="true" type="ax220:Partition"></xs:element>
+ <xs:element minOccurs="0" name="InvalidCartridgeTypeException" nillable="true" type="ax219:InvalidCartridgeTypeException"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="validatePartitionResponse">
+ <xs:element name="validateDeploymentPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
+ <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax220:Partition"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="CloudControllerServiceInvalidCartridgeTypeException">
+ <xs:element name="validateDeploymentPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidCartridgeTypeException" nillable="true" type="ax219:InvalidCartridgeTypeException"></xs:element>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="validateDeploymentPolicy">
+ <xs:element name="CloudControllerServiceInvalidCompositeApplicationDefinitionException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax220:Partition"></xs:element>
+ <xs:element minOccurs="0" name="InvalidCompositeApplicationDefinitionException" nillable="true" type="ax219:InvalidCompositeApplicationDefinitionException"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="validateDeploymentPolicyResponse">
+ <xs:element name="CloudControllerServiceInvalidIaasProviderException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
+ <xs:element minOccurs="0" name="InvalidIaasProviderException" nillable="true" type="ax219:InvalidIaasProviderException"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="CloudControllerServiceUnregisteredClusterException">
+ <xs:element name="deployCompositeApplicationDefinition">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="UnregisteredClusterException" nillable="true" type="ax219:UnregisteredClusterException"></xs:element>
+ <xs:element minOccurs="0" name="compositeApplicationDefinition" nillable="true" type="ax221:CompositeApplicationDefinition"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="unregisterService">
+ <xs:element name="unDeployCompositeApplicationDefinition">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="appAlias" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -149,133 +150,127 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="CloudControllerServiceInvalidCompositeApplicationDefinitionException">
+ <xs:element name="CloudControllerServiceInvalidServiceGroupException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidCompositeApplicationDefinitionException" nillable="true" type="ax219:InvalidCompositeApplicationDefinitionException"></xs:element>
+ <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax219:InvalidServiceGroupException"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="CloudControllerServiceInvalidIaasProviderException">
+ <xs:element name="deployServiceGroup">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidIaasProviderException" nillable="true" type="ax219:InvalidIaasProviderException"></xs:element>
+ <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax221:ServiceGroup"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="unDeployCompositeApplicationDefinition">
+ <xs:element name="undeployServiceGroup">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="appAlias" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="CloudControllerServiceInvalidMemberException">
+ <xs:element name="CloudControllerServiceUnregisteredCartridgeException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax219:InvalidMemberException"></xs:element>
+ <xs:element minOccurs="0" name="UnregisteredCartridgeException" nillable="true" type="ax219:UnregisteredCartridgeException"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="terminateInstance">
+ <xs:element name="startInstance">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="memberContext" nillable="true" type="ax221:MemberContext"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="CloudControllerServiceInvalidClusterException">
+ <xs:element name="startInstanceResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidClusterException" nillable="true" type="ax219:InvalidClusterException"></xs:element>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax221:MemberContext"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="terminateAllInstances">
+ <xs:element name="CloudControllerServiceInvalidMemberException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidServiceGroupException" nillable="true" type="ax219:InvalidServiceGroupException"></xs:element>
+ <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax219:InvalidMemberException"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="deployServiceGroup">
+ <xs:element name="terminateInstance">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="servicegroup" nillable="true" type="ax220:ServiceGroup"></xs:element>
+ <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="undeployServiceGroup">
+ <xs:element name="CloudControllerServiceInvalidClusterException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="InvalidClusterException" nillable="true" type="ax219:InvalidClusterException"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
+ <xs:element name="terminateAllInstances">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="CloudControllerServiceUnregisteredCartridgeException">
+ <xs:element name="getRegisteredCartridges">
<xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="UnregisteredCartridgeException" nillable="true" type="ax219:UnregisteredCartridgeException"></xs:element>
- </xs:sequence>
+ <xs:sequence></xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="startInstance">
+ <xs:element name="getRegisteredCartridgesResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="memberContext" nillable="true" type="ax221:MemberContext"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="startInstanceResponse">
+ <xs:element name="getClusterContext">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax221:MemberContext"></xs:element>
+ <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="registerService">
+ <xs:element name="getClusterContextResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="registrant" nillable="true" type="ax221:Registrant"></xs:element>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax221:ClusterContext"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="registerServiceResponse">
+ <xs:element name="CloudControllerServiceApplicationDefinitionException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
+ <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax219:ApplicationDefinitionException"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getRegisteredCartridges">
- <xs:complexType>
- <xs:sequence></xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getRegisteredCartridgesResponse">
+ <xs:element name="deployApplicationDefinition">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax226:ApplicationContext"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getClusterContext">
+ <xs:element name="CloudControllerServiceInvalidCartridgeDefinitionException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="InvalidCartridgeDefinitionException" nillable="true" type="ax219:InvalidCartridgeDefinitionException"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getClusterContextResponse">
+ <xs:element name="deployCartridgeDefinition">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax221:ClusterContext"></xs:element>
+ <xs:element minOccurs="0" name="cartridgeConfig" nillable="true" type="ax221:CartridgeConfig"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -293,43 +288,50 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="deployCompositeApplicationDefinition">
+ <xs:element name="CloudControllerServiceUnregisteredClusterException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="compositeApplicationDefinition" nillable="true" type="ax221:CompositeApplicationDefinition"></xs:element>
+ <xs:element minOccurs="0" name="UnregisteredClusterException" nillable="true" type="ax219:UnregisteredClusterException"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="CloudControllerServiceInvalidCartridgeDefinitionException">
+ <xs:element name="unregisterService">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidCartridgeDefinitionException" nillable="true" type="ax219:InvalidCartridgeDefinitionException"></xs:element>
+ <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="deployCartridgeDefinition">
+ <xs:element name="validatePartition">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="cartridgeConfig" nillable="true" type="ax221:CartridgeConfig"></xs:element>
+ <xs:element minOccurs="0" name="partition" nillable="true" type="ax220:Partition"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="CloudControllerServiceApplicationDefinitionException">
+ <xs:element name="validatePartitionResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="ApplicationDefinitionException" nillable="true" type="ax219:ApplicationDefinitionException"></xs:element>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="deployApplicationDefinition">
+ <xs:element name="registerService">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationContext" nillable="true" type="ax226:ApplicationContext"></xs:element>
+ <xs:element minOccurs="0" name="registrant" nillable="true" type="ax221:Registrant"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="registerServiceResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:schema>
- <xs:schema xmlns:ax224="http://partition.deployment.controller.cloud.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.controller.cloud.stratos.apache.org/xsd">
+ <xs:schema xmlns:ax225="http://partition.deployment.controller.cloud.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.controller.cloud.stratos.apache.org/xsd">
<xs:import namespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"></xs:import>
<xs:complexType name="Properties">
<xs:sequence>
@@ -342,6 +344,58 @@
<xs:element minOccurs="0" name="value" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
+ <xs:complexType name="CompositeApplicationDefinition">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridges" nillable="true" type="ax221:ConfigCartridge"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="components" nillable="true" type="ax221:ConfigGroup"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="ConfigCartridge">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="ConfigGroup">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax221:ConfigDependencies"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribables" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="ConfigDependencies">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="kill_behavior" nillable="true" type="xs:string"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="startup_order" nillable="true" type="ax221:ConfigDependencyPair"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="ConfigDependencyPair">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="key" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="value" nillable="true" type="xs:string"></xs:element>
+ </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>
+ <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax221:Dependencies"></xs:element>
+ <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="subGroups" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="Dependencies">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="killBehaviour" nillable="true" type="xs:string"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="startupOrder" nillable="true" type="ax221:StartupOrder"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="StartupOrder">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="after" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="start" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
<xs:complexType name="MemberContext">
<xs:sequence>
<xs:element minOccurs="0" name="allocatedIpAddress" nillable="true" type="xs:string"></xs:element>
@@ -359,22 +413,15 @@
<xs:element minOccurs="0" name="publicIpAddress" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="Registrant">
+ <xs:complexType name="ClusterContext">
<xs:sequence>
- <xs:element minOccurs="0" name="autoScalerPolicyName" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="lbCluster" type="xs:boolean"></xs:element>
<xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="persistence" nillable="true" type="ax221:Persistence"></xs:element>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax221:Properties"></xs:element>
- <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"></xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="Persistence">
- <xs:sequence>
- <xs:element minOccurs="0" name="persistanceRequired" type="xs:boolean"></xs:element>
+ <xs:element minOccurs="0" name="timeoutInMillis" type="xs:long"></xs:element>
+ <xs:element minOccurs="0" name="volumeRequired" type="xs:boolean"></xs:element>
<xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax221:Volume"></xs:element>
</xs:sequence>
</xs:complexType>
@@ -390,21 +437,8 @@
<xs:element minOccurs="0" name="volumeId" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="ClusterContext">
- <xs:sequence>
- <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="lbCluster" type="xs:boolean"></xs:element>
- <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="timeoutInMillis" type="xs:long"></xs:element>
- <xs:element minOccurs="0" name="volumeRequired" type="xs:boolean"></xs:element>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax221:Volume"></xs:element>
- </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="ax221:AppType"></xs:element>
<xs:element minOccurs="0" name="baseDir" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="defaultAutoscalingPolicy" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="defaultDeploymentPolicy" nillable="true" type="xs:string"></xs:element>
@@ -412,98 +446,67 @@
<xs:element minOccurs="0" name="description" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="displayName" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="iaasConfigs" nillable="true" type="ax221:IaasConfig"></xs:element>
<xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax221:LoadbalancerConfig"></xs:element>
<xs:element minOccurs="0" name="multiTenant" type="xs:boolean"></xs:element>
<xs:element minOccurs="0" name="persistence" nillable="true" type="ax221:Persistence"></xs:element>
<xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax221:PortMapping"></xs:element>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax221:Property"></xs:element>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax221:Properties"></xs:element>
<xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="serviceGroup" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="type" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="version" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="AppType">
+ <xs:complexType name="IaasConfig">
<xs:sequence>
- <xs:element minOccurs="0" name="appSpecificMapping" type="xs:boolean"></xs:element>
+ <xs:element minOccurs="0" name="className" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="credential" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="identity" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="imageId" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="maxInstanceLimit" type="xs:int"></xs:element>
<xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="LoadbalancerConfig">
+ <xs:element minOccurs="0" name="networkInterfaces" nillable="true" type="ax221:NetworkInterfaces"></xs:element>
+ <xs:element minOccurs="0" name="payload" nillable="true" type="xs:base64Binary"></xs:element>
<xs:element minOccurs="0" name="properties" nillable="true" type="ax221:Properties"></xs:element>
+ <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="type" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="PortMapping">
- <xs:sequence>
- <xs:element minOccurs="0" name="port" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="protocol" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="proxyPort" nillable="true" type="xs:string"></xs:element>
- <xs:complexType name="CompositeApplicationDefinition">
- <xs:sequence>
- <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"></xs:element>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridges" nillable="true" type="ax221:ConfigCartridge"></xs:element>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="components" nillable="true" type="ax221:ConfigGroup"></xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="ConfigCartridge">
- <xs:sequence>
- <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"></xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="ConfigGroup">
- <xs:sequence>
- <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax221:ConfigDependencies"></xs:element>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribables" nillable="true" type="xs:string"></xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="ConfigDependencies">
- <xs:sequence>
- <xs:element minOccurs="0" name="kill_behavior" nillable="true" type="xs:string"></xs:element>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="startup_order" nillable="true" type="ax221:ConfigDependencyPair"></xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="ConfigDependencyPair">
+ <xs:complexType name="NetworkInterfaces">
<xs:sequence>
- <xs:element minOccurs="0" name="key" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="value" nillable="true" type="xs:string"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="networkInterfaces" nillable="true" type="ax221:NetworkInterface"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="CartridgeConfig">
+ <xs:complexType name="NetworkInterface">
<xs:sequence>
- <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="lbCluster" type="xs:boolean"></xs:element>
- <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="timeoutInMillis" type="xs:long"></xs:element>
- <xs:element minOccurs="0" name="volumeRequired" type="xs:boolean"></xs:element>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax220:Volume"></xs:element>
+ <xs:element minOccurs="0" name="fixedIp" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="networkUuid" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="portUuid" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="ServiceGroup">
+ <xs:complexType name="LoadbalancerConfig">
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridges" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax220:Dependencies"></xs:element>
- <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="subGroups" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax221:Properties"></xs:element>
+ <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="Dependencies">
+ <xs:complexType name="Persistence">
<xs:sequence>
- <xs:element minOccurs="0" name="killBehaviour" nillable="true" type="xs:string"></xs:element>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="startupOrder" nillable="true" type="ax220:StartupOrder"></xs:element>
+ <xs:element minOccurs="0" name="persistanceRequired" type="xs:boolean"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax221:Volume"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="StartupOrder">
+ <xs:complexType name="PortMapping">
<xs:sequence>
- <xs:element minOccurs="0" name="after" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="start" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="port" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="protocol" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="proxyPort" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
+ <xs:complexType name="CartridgeInfo">
<xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="appTypes" nillable="true" type="ax221:AppType"></xs:element>
<xs:element minOccurs="0" name="baseDir" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="defaultAutoscalingPolicy" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="defaultDeploymentPolicy" nillable="true" type="xs:string"></xs:element>
@@ -511,43 +514,34 @@
<xs:element minOccurs="0" name="description" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="displayName" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="iaasConfigs" nillable="true" type="ax221:IaasConfig"></xs:element>
<xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax221:LoadbalancerConfig"></xs:element>
<xs:element minOccurs="0" name="multiTenant" type="xs:boolean"></xs:element>
<xs:element minOccurs="0" name="persistence" nillable="true" type="ax221:Persistence"></xs:element>
<xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax221:PortMapping"></xs:element>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax221:Properties"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax221:Property"></xs:element>
<xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="serviceGroup" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="type" nillable="true" type="xs:string"></xs:element>
<xs:element minOccurs="0" name="version" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="IaasConfig">
+ <xs:complexType name="AppType">
<xs:sequence>
- <xs:element minOccurs="0" name="className" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="credential" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="identity" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="imageId" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="maxInstanceLimit" type="xs:int"></xs:element>
+ <xs:element minOccurs="0" name="appSpecificMapping" type="xs:boolean"></xs:element>
<xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="networkInterfaces" nillable="true" type="ax221:NetworkInterfaces"></xs:element>
- <xs:element minOccurs="0" name="payload" nillable="true" type="xs:base64Binary"></xs:element>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax221:Properties"></xs:element>
- <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="NetworkInterfaces">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="networkInterfaces" nillable="true" type="ax221:NetworkInterface"></xs:element>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="NetworkInterface">
+ <xs:complexType name="Registrant">
<xs:sequence>
- <xs:element minOccurs="0" name="fixedIp" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="networkUuid" nillable="true" type="xs:string"></xs:element>
- <xs:element minOccurs="0" name="portUuid" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="autoScalerPolicyName" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="persistence" nillable="true" type="ax221:Persistence"></xs:element>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax221:Properties"></xs:element>
+ <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:schema>
@@ -606,18 +600,18 @@
<wsdl:message name="CloudControllerServiceInvalidIaasProviderException">
<wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidIaasProviderException"></wsdl:part>
</wsdl:message>
- <wsdl:message name="undeployServiceGroupRequest">
- <wsdl:part name="parameters" element="ns:undeployServiceGroup"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="CloudControllerServiceInvalidServiceGroupException">
- <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidServiceGroupException"></wsdl:part>
- </wsdl:message>
<wsdl:message name="getCartridgeInfoRequest">
<wsdl:part name="parameters" element="ns:getCartridgeInfo"></wsdl:part>
</wsdl:message>
<wsdl:message name="getCartridgeInfoResponse">
<wsdl:part name="parameters" element="ns:getCartridgeInfoResponse"></wsdl:part>
</wsdl:message>
+ <wsdl:message name="undeployServiceGroupRequest">
+ <wsdl:part name="parameters" element="ns:undeployServiceGroup"></wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="CloudControllerServiceInvalidServiceGroupException">
+ <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidServiceGroupException"></wsdl:part>
+ </wsdl:message>
<wsdl:message name="deployApplicationDefinitionRequest">
<wsdl:part name="parameters" element="ns:deployApplicationDefinition"></wsdl:part>
</wsdl:message>
@@ -696,15 +690,15 @@
<wsdl:fault message="ns:CloudControllerServiceInvalidCartridgeDefinitionException" name="CloudControllerServiceInvalidCartridgeDefinitionException" wsaw:Action="urn:deployCartridgeDefinitionCloudControllerServiceInvalidCartridgeDefinitionException"></wsdl:fault>
<wsdl:fault message="ns:CloudControllerServiceInvalidIaasProviderException" name="CloudControllerServiceInvalidIaasProviderException" wsaw:Action="urn:deployCartridgeDefinitionCloudControllerServiceInvalidIaasProviderException"></wsdl:fault>
</wsdl:operation>
- <wsdl:operation name="undeployServiceGroup">
- <wsdl:input message="ns:undeployServiceGroupRequest" wsaw:Action="urn:undeployServiceGroup"></wsdl:input>
- <wsdl:fault message="ns:CloudControllerServiceInvalidServiceGroupException" name="CloudControllerServiceInvalidServiceGroupException" wsaw:Action="urn:undeployServiceGroupCloudControllerServiceInvalidServiceGroupException"></wsdl:fault>
- </wsdl:operation>
<wsdl:operation name="getCartridgeInfo">
<wsdl:input message="ns:getCartridgeInfoRequest" wsaw:Action="urn:getCartridgeInfo"></wsdl:input>
<wsdl:output message="ns:getCartridgeInfoResponse" wsaw:Action="urn:getCartridgeInfoResponse"></wsdl:output>
<wsdl:fault message="ns:CloudControllerServiceUnregisteredCartridgeException" name="CloudControllerServiceUnregisteredCartridgeException" wsaw:Action="urn:getCartridgeInfoCloudControllerServiceUnregisteredCartridgeException"></wsdl:fault>
</wsdl:operation>
+ <wsdl:operation name="undeployServiceGroup">
+ <wsdl:input message="ns:undeployServiceGroupRequest" wsaw:Action="urn:undeployServiceGroup"></wsdl:input>
+ <wsdl:fault message="ns:CloudControllerServiceInvalidServiceGroupException" name="CloudControllerServiceInvalidServiceGroupException" wsaw:Action="urn:undeployServiceGroupCloudControllerServiceInvalidServiceGroupException"></wsdl:fault>
+ </wsdl:operation>
<wsdl:operation name="deployApplicationDefinition">
<wsdl:input message="ns:deployApplicationDefinitionRequest" wsaw:Action="urn:deployApplicationDefinition"></wsdl:input>
<wsdl:fault message="ns:CloudControllerServiceApplicationDefinitionException" name="CloudControllerServiceApplicationDefinitionException" wsaw:Action="urn:deployApplicationDefinitionCloudControllerServiceApplicationDefinitionException"></wsdl:fault>
@@ -779,18 +773,6 @@
<soap:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"></soap:fault>
</wsdl:fault>
</wsdl:operation>
- <wsdl:operation name="registerService">
- <soap:operation soapAction="urn:registerService" style="document"></soap:operation>
- <wsdl:input>
- <soap:body use="literal"></soap:body>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"></soap:body>
- </wsdl:output>
- <wsdl:fault name="CloudControllerServiceUnregisteredCartridgeException">
- <soap:fault use="literal" name="CloudControllerServiceUnregisteredCartridgeException"></soap:fault>
- </wsdl:fault>
- </wsdl:operation>
<wsdl:operation name="terminateInstance">
<soap:operation soapAction="urn:terminateInstance" style="document"></soap:operation>
<wsdl:input>
@@ -803,6 +785,18 @@
<soap:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"></soap:fault>
</wsdl:fault>
</wsdl:operation>
+ <wsdl:operation name="registerService">
+ <soap:operation soapAction="urn:registerService" style="document"></soap:operation>
+ <wsdl:input>
+ <soap:body use="literal"></soap:body>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"></soap:body>
+ </wsdl:output>
+ <wsdl:fault name="CloudControllerServiceUnregisteredCartridgeException">
+ <soap:fault use="literal" name="CloudControllerServiceUnregisteredCartridgeException"></soap:fault>
+ </wsdl:fault>
+ </wsdl:operation>
<wsdl:operation name="deployCartridgeDefinition">
<soap:operation soapAction="urn:deployCartridgeDefinition" style="document"></soap:operation>
<wsdl:input>
@@ -815,6 +809,15 @@
<soap:fault use="literal" name="CloudControllerServiceInvalidIaasProviderException"></soap:fault>
</wsdl:fault>
</wsdl:operation>
+ <wsdl:operation name="undeployServiceGroup">
+ <soap:operation soapAction="urn:undeployServiceGroup" style="document"></soap:operation>
+ <wsdl:input>
+ <soap:body use="literal"></soap:body>
+ </wsdl:input>
+ <wsdl:fault name="CloudControllerServiceInvalidServiceGroupException">
+ <soap:fault use="literal" name="CloudControllerServiceInvalidServiceGroupException"></soap:fault>
+ </wsdl:fault>
+ </wsdl:operation>
<wsdl:operation name="getCartridgeInfo">
<soap:operation soapAction="urn:getCartridgeInfo" style="document"></soap:operation>
<wsdl:input>
@@ -959,18 +962,6 @@
<soap12:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"></soap12:fault>
</wsdl:fault>
</wsdl:operation>
- <wsdl:operation name="registerService">
- <soap12:operation soapAction="urn:registerService" style="document"></soap12:operation>
- <wsdl:input>
- <soap12:body use="literal"></soap12:body>
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal"></soap12:body>
- </wsdl:output>
- <wsdl:fault name="CloudControllerServiceUnregisteredCartridgeException">
- <soap12:fault use="literal" name="CloudControllerServiceUnregisteredCartridgeException"></soap12:fault>
- </wsdl:fault>
- </wsdl:operation>
<wsdl:operation name="terminateInstance">
<soap12:operation soapAction="urn:terminateInstance" style="document"></soap12:operation>
<wsdl:input>
@@ -983,6 +974,18 @@
<soap12:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"></soap12:fault>
</wsdl:fault>
</wsdl:operation>
+ <wsdl:operation name="registerService">
+ <soap12:operation soapAction="urn:registerService" style="document"></soap12:operation>
+ <wsdl:input>
+ <soap12:body use="literal"></soap12:body>
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal"></soap12:body>
+ </wsdl:output>
+ <wsdl:fault name="CloudControllerServiceUnregisteredCartridgeException">
+ <soap12:fault use="literal" name="CloudControllerServiceUnregisteredCartridgeException"></soap12:fault>
+ </wsdl:fault>
+ </wsdl:operation>
<wsdl:operation name="deployCartridgeDefinition">
<soap12:operation soapAction="urn:deployCartridgeDefinition" style="document"></soap12:operation>
<wsdl:input>
@@ -995,6 +998,15 @@
<soap12:fault use="literal" name="CloudControllerServiceInvalidIaasProviderException"></soap12:fault>
</wsdl:fault>
</wsdl:operation>
+ <wsdl:operation name="undeployServiceGroup">
+ <soap12:operation soapAction="urn:undeployServiceGroup" style="document"></soap12:operation>
+ <wsdl:input>
+ <soap12:body use="literal"></soap12:body>
+ </wsdl:input>
+ <wsdl:fault name="CloudControllerServiceInvalidServiceGroupException">
+ <soap12:fault use="literal" name="CloudControllerServiceInvalidServiceGroupException"></soap12:fault>
+ </wsdl:fault>
+ </wsdl:operation>
<wsdl:operation name="getCartridgeInfo">
<soap12:operation soapAction="urn:getCartridgeInfo" style="document"></soap12:operation>
<wsdl:input>
@@ -1130,6 +1142,12 @@
<mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="terminateInstance">
+ <http:operation location="terminateInstance"></http:operation>
+ <wsdl:input>
+ <mime:content type="text/xml" part="parameters"></mime:content>
+ </wsdl:input>
+ </wsdl:operation>
<wsdl:operation name="registerService">
<http:operation location="registerService"></http:operation>
<wsdl:input>
@@ -1139,14 +1157,14 @@
<mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="terminateInstance">
- <http:operation location="terminateInstance"></http:operation>
+ <wsdl:operation name="deployCartridgeDefinition">
+ <http:operation location="deployCartridgeDefinition"></http:operation>
<wsdl:input>
<mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:input>
</wsdl:operation>
- <wsdl:operation name="deployCartridgeDefinition">
- <http:operation location="deployCartridgeDefinition"></http:operation>
+ <wsdl:operation name="undeployServiceGroup">
+ <http:operation location="undeployServiceGroup"></http:operation>
<wsdl:input>
<mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:input>
@@ -1232,22 +1250,22 @@
</wsdl:binding>
<wsdl:service name="CloudControllerService">
<wsdl:port name="CloudControllerServiceHttpSoap11Endpoint" binding="ns:CloudControllerServiceSoap11Binding">
- <soap:address location="http://10.100.0.168:9763/services/CloudControllerService.CloudControllerServiceHttpSoap11Endpoint/"></soap:address>
+ <soap:address location="http://172.16.2.207:9763/services/CloudControllerService.CloudControllerServiceHttpSoap11Endpoint/"></soap:address>
</wsdl:port>
<wsdl:port name="CloudControllerServiceHttpsSoap11Endpoint" binding="ns:CloudControllerServiceSoap11Binding">
- <soap:address location="https://10.100.0.168:9443/services/CloudControllerService.CloudControllerServiceHttpsSoap11Endpoint/"></soap:address>
+ <soap:address location="https://172.16.2.207:9443/services/CloudControllerService.CloudControllerServiceHttpsSoap11Endpoint/"></soap:address>
</wsdl:port>
<wsdl:port name="CloudControllerServiceHttpSoap12Endpoint" binding="ns:CloudControllerServiceSoap12Binding">
- <soap12:address location="http://10.100.0.168:9763/services/CloudControllerService.CloudControllerServiceHttpSoap12Endpoint/"></soap12:address>
+ <soap12:address location="http://172.16.2.207:9763/services/CloudControllerService.CloudControllerServiceHttpSoap12Endpoint/"></soap12:address>
</wsdl:port>
<wsdl:port name="CloudControllerServiceHttpsSoap12Endpoint" binding="ns:CloudControllerServiceSoap12Binding">
- <soap12:address location="https://10.100.0.168:9443/services/CloudControllerService.CloudControllerServiceHttpsSoap12Endpoint/"></soap12:address>
+ <soap12:address location="https://172.16.2.207:9443/services/CloudControllerService.CloudControllerServiceHttpsSoap12Endpoint/"></soap12:address>
</wsdl:port>
<wsdl:port name="CloudControllerServiceHttpEndpoint" binding="ns:CloudControllerServiceHttpBinding">
- <http:address location="http://10.100.0.168:9763/services/CloudControllerService.CloudControllerServiceHttpEndpoint/"></http:address>
+ <http:address location="http://172.16.2.207:9763/services/CloudControllerService.CloudControllerServiceHttpEndpoint/"></http:address>
</wsdl:port>
<wsdl:port name="CloudControllerServiceHttpsEndpoint" binding="ns:CloudControllerServiceHttpBinding">
- <http:address location="https://10.100.0.168:9443/services/CloudControllerService.CloudControllerServiceHttpsEndpoint/"></http:address>
+ <http:address location="https://172.16.2.207:9443/services/CloudControllerService.CloudControllerServiceHttpsEndpoint/"></http:address>
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
\ No newline at end of file