apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

more changes

Browse Source
This commit is contained in:
Alex Huang 2012-09-11 17:27:48 -07:00
parent 2307117a24
commit 87b3378cdc
6 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/com/cloud/network/element/NetworkElement.java
View File

@ -16,7 +16,6 @@
// under the License. // under the License.
package com.cloud.network.element; package com.cloud.network.element;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -57,6 +56,7 @@ public interface NetworkElement extends Adapter {
* @return true if network configuration is now usable; false if not; null if not handled by this element. * @return true if network configuration is now usable; false if not; null if not handled by this element.
* @throws InsufficientNetworkCapacityException TODO * @throws InsufficientNetworkCapacityException TODO
*/ */
@Ipc(topic="implement")
boolean implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) boolean implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context)
throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException; throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException;

2
api/src/com/cloud/vm/VirtualMachine.java
View File

@ -243,6 +243,8 @@ public interface VirtualMachine extends RunningOn, ControlledEntity, Identity, S
*/ */
public long getTemplateId(); public long getTemplateId();
/** /**
* returns the guest OS ID * returns the guest OS ID
* *

2
parent/pom.xml
View File

@ -19,7 +19,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<groupId>com.cloud</groupId> <groupId>org.apache</groupId>
<artifactId>cloudstack</artifactId> <artifactId>cloudstack</artifactId>
<version>4.0.0-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>

6
platform/api/pom.xml
View File

@ -4,14 +4,14 @@
<artifactId>cloud-platform-api</artifactId> <artifactId>cloud-platform-api</artifactId>
<name>Apache CloudStack platform API</name> <name>Apache CloudStack platform API</name>
<parent> <parent>
<groupId>com.cloud</groupId> <groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-parent</artifactId> <artifactId>cloud-parent</artifactId>
<version>4.0.0-SNAPSHOT</version> <version>${project.version}</version>
<relativePath>../../parent/pom.xml</relativePath> <relativePath>../../parent/pom.xml</relativePath>
</parent> </parent>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.cloud</groupId> <groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-api</artifactId> <artifactId>cloud-api</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>

9
platform/api/src/org/apache/cloudstack/platform/cloud/entity/api/VirtualMachineEntity.java
View File

@ -31,7 +31,14 @@ import com.cloud.vm.VirtualMachine;
* Platform. * Platform.
* *
*/ */
public interface VirtualMachineEntity extends CloudEntity, VirtualMachine { public interface VirtualMachineEntity extends VirtualMachine, CloudEntity {
List<VolumeEntity> getVolumes();
List<NicEntity> getNics();
TemplateEntity getTemplate();
/** /**
* @return the list of tags associated with the virtual machine * @return the list of tags associated with the virtual machine

6
platform/compute/src/org/apache/cloudstack/compute/ComputeOrchestrator.java
View File

@ -18,8 +18,7 @@
*/ */
package org.apache.cloudstack.compute; package org.apache.cloudstack.compute;
import org.apache.cloudstack.framework.ipc.Ipc; import java.util.logging.Handler;
import org.apache.cloudstack.framework.ipc.IpcParam;
public interface ComputeOrchestrator { public interface ComputeOrchestrator {
/** /**
@ -27,7 +26,8 @@ public interface ComputeOrchestrator {
* @param vm vm * @param vm vm
* @param reservationId * @param reservationId
*/ */
void start(@IpcParam String vm, @IpcParam String reservationId); @Ipc(topic="cs.compute.start", response="cs.compute.start.response")
void start(@IpcParam String vm, @IpcParam String reservationId, Handler handler);
@Ipc(topic="cs.compute.cancel") @Ipc(topic="cs.compute.cancel")
void cancel(@IpcParam String reservationId); void cancel(@IpcParam String reservationId);