cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahu...@apache.org
Subject [50/50] [abbrv] git commit: updated refs/heads/vmsync to 3c2aa18
Date Thu, 27 Jun 2013 20:57:52 GMT
Fixed the problem with buildapidocs.  There are now too many jars but with 1.6 JRE, you can
just specify the directory rather than each jar individually.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3c2aa185
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3c2aa185
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3c2aa185

Branch: refs/heads/vmsync
Commit: 3c2aa1850075a0ae53207cc766c8419b6b814993
Parents: 262352a
Author: Alex Huang <alex.huang@gmail.com>
Authored: Thu Jun 27 13:57:37 2013 -0700
Committer: Alex Huang <alex.huang@gmail.com>
Committed: Thu Jun 27 13:57:37 2013 -0700

----------------------------------------------------------------------
 .../hypervisor/vmware/resource/VmwareResource.java |  2 +-
 .../src/com/cloud/api/commands/AddSspCmd.java      | 13 +++++++------
 .../src/com/cloud/api/commands/DeleteSspCmd.java   | 13 +++++++------
 .../src/com/cloud/network/element/SspElement.java  | 17 ++++++++++-------
 .../cloud/network/guru/SspGuestNetworkGuru.java    | 11 +++++------
 tools/apidoc/build-apidoc.sh                       | 10 +---------
 6 files changed, 31 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3c2aa185/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 7fa9c5d..0e5997e 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -2777,7 +2777,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource,
Vmwa
             for (NicTO nicTo : sortNicsByDeviceId(nics)) {
                 newVal = new OptionValue();
                 newVal.setKey("nvp.iface-id" + nicNum);
-                newVal.setValue(nicTo.getUuid());
+                newVal.setValue(nicTo.getNicUuid());
                 extraOptions.add(newVal);
                 nicNum++;
             }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3c2aa185/plugins/network-elements/stratosphere-ssp/src/com/cloud/api/commands/AddSspCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/stratosphere-ssp/src/com/cloud/api/commands/AddSspCmd.java
b/plugins/network-elements/stratosphere-ssp/src/com/cloud/api/commands/AddSspCmd.java
index 3034f9b..5639292 100644
--- a/plugins/network-elements/stratosphere-ssp/src/com/cloud/api/commands/AddSspCmd.java
+++ b/plugins/network-elements/stratosphere-ssp/src/com/cloud/api/commands/AddSspCmd.java
@@ -17,12 +17,14 @@
 package com.cloud.api.commands;
 import javax.inject.Inject;
 
+import org.apache.log4j.Logger;
+
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.response.ZoneResponse;
 import org.apache.cloudstack.api.Parameter;
-import org.apache.log4j.Logger;
+import org.apache.cloudstack.api.response.ZoneResponse;
+import org.apache.cloudstack.context.CallContext;
 
 import com.cloud.api.response.SspResponse;
 import com.cloud.dc.dao.DataCenterDao;
@@ -33,7 +35,6 @@ import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.host.Host;
 import com.cloud.network.element.SspService;
-import com.cloud.user.UserContext;
 
 
 @APICommand(name="addStratosphereSsp", responseObject=SspResponse.class, description="Adds
stratosphere ssp server")
@@ -70,7 +71,7 @@ public class AddSspCmd extends BaseCmd {
 
     @Override
     public long getEntityOwnerId() {
-        return UserContext.current().getCaller().getId();
+        return CallContext.current().getCallingAccountId();
     }
 
     @Override
@@ -82,10 +83,10 @@ public class AddSspCmd extends BaseCmd {
         SspResponse response = new SspResponse();
         response.setResponseName(getCommandName());
         response.setObjectName("ssphost");
-        response.setUrl(this.getUrl());
+        response.setUrl(getUrl());
         response.setZoneId(_dcDao.findById(getZoneId()).getUuid());
         response.setHostId(host.getUuid());
-        this.setResponseObject(response);
+        setResponseObject(response);
     }
 
     public Long getZoneId() {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3c2aa185/plugins/network-elements/stratosphere-ssp/src/com/cloud/api/commands/DeleteSspCmd.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/stratosphere-ssp/src/com/cloud/api/commands/DeleteSspCmd.java
b/plugins/network-elements/stratosphere-ssp/src/com/cloud/api/commands/DeleteSspCmd.java
index 1f3bba6..8ba0355 100644
--- a/plugins/network-elements/stratosphere-ssp/src/com/cloud/api/commands/DeleteSspCmd.java
+++ b/plugins/network-elements/stratosphere-ssp/src/com/cloud/api/commands/DeleteSspCmd.java
@@ -18,13 +18,15 @@ package com.cloud.api.commands;
 
 import javax.inject.Inject;
 
-import org.apache.cloudstack.api.response.SuccessResponse;
-import org.apache.cloudstack.api.response.HostResponse;
+import org.apache.log4j.Logger;
+
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
-import org.apache.log4j.Logger;
+import org.apache.cloudstack.api.response.HostResponse;
+import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.context.CallContext;
 
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientCapacityException;
@@ -32,7 +34,6 @@ import com.cloud.exception.NetworkRuleConflictException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.network.element.SspService;
-import com.cloud.user.UserContext;
 
 @APICommand(name="deleteStratosphereSsp", responseObject=SuccessResponse.class, description="Removes
stratosphere ssp server")
 public class DeleteSspCmd extends BaseCmd {
@@ -51,7 +52,7 @@ public class DeleteSspCmd extends BaseCmd {
 
     @Override
     public long getEntityOwnerId() {
-        return UserContext.current().getCaller().getId();
+        return CallContext.current().getCallingAccountId();
     }
 
     @Override
@@ -61,7 +62,7 @@ public class DeleteSspCmd extends BaseCmd {
         s_logger.trace("execute");
         SuccessResponse resp = new SuccessResponse();
         resp.setSuccess(_service.deleteSspHost(this));
-        this.setResponseObject(resp);
+        setResponseObject(resp);
     }
 
     public Long getHostId() {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3c2aa185/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/element/SspElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/element/SspElement.java
b/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/element/SspElement.java
index 016ae14..72add30 100644
--- a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/element/SspElement.java
+++ b/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/element/SspElement.java
@@ -66,15 +66,14 @@ import com.cloud.network.dao.SspTenantVO;
 import com.cloud.network.dao.SspUuidDao;
 import com.cloud.network.dao.SspUuidVO;
 import com.cloud.offering.NetworkOffering;
+import com.cloud.resource.ResourceManager;
 import com.cloud.utils.component.AdapterBase;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.NicProfile;
 import com.cloud.vm.NicVO;
 import com.cloud.vm.ReservationContext;
-import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachineProfile;
 import com.cloud.vm.dao.NicDao;
-import com.cloud.resource.ResourceManager;
 
 /**
  * Stratosphere sdn platform network element
@@ -306,6 +305,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider,
Ssp
         return _hostDao.remove(cmd.getHostId());
     }
 
+    @Override
     public boolean createNetwork(Network network, NetworkOffering offering,
             DeployDestination dest, ReservationContext context){
         if(_sspUuidDao.findUuidByNetwork(network) != null){
@@ -343,6 +343,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider,
Ssp
         }
     }
 
+    @Override
     public boolean deleteNetwork(Network network){
         String tenantNetworkUuid = _sspUuidDao.findUuidByNetwork(network);
         if(tenantNetworkUuid != null){
@@ -364,6 +365,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider,
Ssp
     }
 
     // we use context.reservationId for dedup of guru & element operations.
+    @Override
     public boolean createNicEnv(Network network, NicProfile nic, DeployDestination dest,
ReservationContext context){
         String tenantNetworkUuid = _sspUuidDao.findUuidByNetwork(network);
         if(tenantNetworkUuid == null){
@@ -415,6 +417,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider,
Ssp
         return false;
     }
 
+    @Override
     public boolean deleteNicEnv(Network network, NicProfile nic, ReservationContext context){
         if(context==null){
             s_logger.error("ReservationContext was null for "+nic+" "+network);
@@ -507,7 +510,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider,
Ssp
      */
     @Override
     public boolean prepare(Network network, NicProfile nic,
-            VirtualMachineProfile<? extends VirtualMachine> vm,
+            VirtualMachineProfile vm,
             DeployDestination dest, ReservationContext context)
                     throws ConcurrentOperationException, ResourceUnavailableException,
                     InsufficientCapacityException {
@@ -524,7 +527,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider,
Ssp
      */
     @Override
     public boolean release(Network network, NicProfile nic,
-            VirtualMachineProfile<? extends VirtualMachine> vm,
+            VirtualMachineProfile vm,
             ReservationContext context) throws ConcurrentOperationException,
             ResourceUnavailableException {
         s_logger.trace("release");
@@ -567,7 +570,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider,
Ssp
 
     @Override
     public boolean prepareMigration(NicProfile nic, Network network,
-            VirtualMachineProfile<? extends VirtualMachine> vm,
+            VirtualMachineProfile vm,
             DeployDestination dest, ReservationContext context) {
         try {
             prepare(network, nic, vm, dest, context);
@@ -586,7 +589,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider,
Ssp
 
     @Override
     public void rollbackMigration(NicProfile nic, Network network,
-            VirtualMachineProfile<? extends VirtualMachine> vm,
+            VirtualMachineProfile vm,
             ReservationContext src, ReservationContext dst) {
         try {
             release(network, nic, vm, dst);
@@ -599,7 +602,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider,
Ssp
 
     @Override
     public void commitMigration(NicProfile nic, Network network,
-            VirtualMachineProfile<? extends VirtualMachine> vm,
+            VirtualMachineProfile vm,
             ReservationContext src, ReservationContext dst) {
         try {
             release(network, nic, vm, src);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3c2aa185/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/guru/SspGuestNetworkGuru.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/guru/SspGuestNetworkGuru.java
b/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/guru/SspGuestNetworkGuru.java
index b504a4b..af67326 100644
--- a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/guru/SspGuestNetworkGuru.java
+++ b/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/guru/SspGuestNetworkGuru.java
@@ -38,7 +38,6 @@ import com.cloud.offerings.dao.NetworkOfferingServiceMapDao;
 import com.cloud.vm.NicProfile;
 import com.cloud.vm.ReservationContext;
 import com.cloud.vm.ReservationContextImpl;
-import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachineProfile;
 
 /**
@@ -117,7 +116,7 @@ public class SspGuestNetworkGuru extends GuestNetworkGuru implements NetworkMigr
 
     @Override
     public void reserve(NicProfile nic, Network network,
-            VirtualMachineProfile<? extends VirtualMachine> vm,
+            VirtualMachineProfile vm,
             DeployDestination dest, ReservationContext context)
                     throws InsufficientVirtualNetworkCapcityException,
                     InsufficientAddressCapacityException {
@@ -127,7 +126,7 @@ public class SspGuestNetworkGuru extends GuestNetworkGuru implements NetworkMigr
 
     @Override
     public boolean release(NicProfile nic,
-            VirtualMachineProfile<? extends VirtualMachine> vm,
+            VirtualMachineProfile vm,
             String reservationId) {
         Network network = _networkDao.findById(nic.getNetworkId());
         _sspMgr.deleteNicEnv(network, nic, new ReservationContextImpl(reservationId, null,
null));
@@ -141,7 +140,7 @@ public class SspGuestNetworkGuru extends GuestNetworkGuru implements NetworkMigr
 
     @Override
     public boolean prepareMigration(NicProfile nic, Network network,
-            VirtualMachineProfile<? extends VirtualMachine> vm,
+            VirtualMachineProfile vm,
             DeployDestination dest, ReservationContext context) {
         try {
             reserve(nic, network, vm, dest, context);
@@ -157,14 +156,14 @@ public class SspGuestNetworkGuru extends GuestNetworkGuru implements
NetworkMigr
 
     @Override
     public void rollbackMigration(NicProfile nic, Network network,
-            VirtualMachineProfile<? extends VirtualMachine> vm,
+            VirtualMachineProfile vm,
             ReservationContext src, ReservationContext dst) {
         release(nic, vm, dst.getReservationId());
     }
 
     @Override
     public void commitMigration(NicProfile nic, Network network,
-            VirtualMachineProfile<? extends VirtualMachine> vm,
+            VirtualMachineProfile vm,
             ReservationContext src, ReservationContext dst) {
         release(nic, vm, src.getReservationId());
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3c2aa185/tools/apidoc/build-apidoc.sh
----------------------------------------------------------------------
diff --git a/tools/apidoc/build-apidoc.sh b/tools/apidoc/build-apidoc.sh
index d048a1b..541c032 100755
--- a/tools/apidoc/build-apidoc.sh
+++ b/tools/apidoc/build-apidoc.sh
@@ -47,16 +47,8 @@ fi
 
 CP=$PATHSEP/
 
-for file in $TARGETJARDIR/*.jar
-do
-  CP=${CP}$PATHSEP$file
-done
 
-for file in $DEPSDIR/*.jar; do
-  CP=${CP}$PATHSEP$file
-done
-
-java -cp $CP com.cloud.api.doc.ApiXmlDocWriter -d "$DISTDIR" $*
+java -cp $CP$PATHSEP$TARGETJARDIR/*$PATHSEP$DEPSDIR/* com.cloud.api.doc.ApiXmlDocWriter -d
"$DISTDIR" $*
 
 if [ $? -ne 0 ]
 then


Mime
View raw message