cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahu...@apache.org
Subject [1/2] git commit: updated refs/heads/vmsync to 3dd26e8
Date Tue, 14 May 2013 18:41:04 GMT
Updated Branches:
  refs/heads/vmsync a790f55a6 -> 3dd26e85d


Merge problems fixed


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

Branch: refs/heads/vmsync
Commit: f38e8893c38b4a0b22fecc51dc5f88d27f39ec24
Parents: d403974
Author: Alex Huang <alex.huang@gmail.com>
Authored: Tue May 14 11:42:37 2013 -0700
Committer: Alex Huang <alex.huang@gmail.com>
Committed: Tue May 14 11:42:37 2013 -0700

----------------------------------------------------------------------
 api/pom.xml                                        |    5 -
 engine/api/pom.xml                                 |    5 -
 engine/components-api/pom.xml                      |   10 +-
 engine/schema/pom.xml                              |   10 ---
 .../lb/InternalLoadBalancerVMManagerImpl.java      |   64 +++++++++------
 5 files changed, 44 insertions(+), 50 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f38e8893/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 8ca258f..e0ab822 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -37,9 +37,4 @@
       <version>${cs.gson.version}</version>
     </dependency>
   </dependencies>
-  <build>
-    <defaultGoal>install</defaultGoal>
-    <sourceDirectory>src</sourceDirectory>
-    <testSourceDirectory>test</testSourceDirectory>
-  </build>
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f38e8893/engine/api/pom.xml
----------------------------------------------------------------------
diff --git a/engine/api/pom.xml b/engine/api/pom.xml
index 1b8f26c..9803185 100644
--- a/engine/api/pom.xml
+++ b/engine/api/pom.xml
@@ -56,9 +56,4 @@
       <version>${project.version}</version>
     </dependency>
   </dependencies>
-  <build>
-    <defaultGoal>install</defaultGoal>
-    <sourceDirectory>src</sourceDirectory>
-    <testSourceDirectory>test</testSourceDirectory>
-  </build>
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f38e8893/engine/components-api/pom.xml
----------------------------------------------------------------------
diff --git a/engine/components-api/pom.xml b/engine/components-api/pom.xml
index 6d6ad4d..de4a54e 100644
--- a/engine/components-api/pom.xml
+++ b/engine/components-api/pom.xml
@@ -35,13 +35,13 @@
     </dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
+      <artifactId>cloud-engine-schema</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-framework-ipc</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>
-  <build>
-    <defaultGoal>install</defaultGoal>
-    <sourceDirectory>src</sourceDirectory>
-    <testSourceDirectory>test</testSourceDirectory>
-  </build>
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f38e8893/engine/schema/pom.xml
----------------------------------------------------------------------
diff --git a/engine/schema/pom.xml b/engine/schema/pom.xml
index da40d9c..431151a 100644
--- a/engine/schema/pom.xml
+++ b/engine/schema/pom.xml
@@ -33,16 +33,6 @@
       <artifactId>cloud-engine-api</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-framework-ipc</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-engine-components-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
   </dependencies>
   <build>
     <defaultGoal>install</defaultGoal>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f38e8893/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
index fe32a7b..419e3c0 100644
--- a/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
+++ b/plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
@@ -5,7 +5,7 @@
 // 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,
@@ -25,11 +25,12 @@ import javax.ejb.Local;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import org.apache.cloudstack.lb.ApplicationLoadBalancerRuleVO;
-import org.apache.cloudstack.lb.dao.ApplicationLoadBalancerRuleDao;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
+import org.apache.cloudstack.lb.ApplicationLoadBalancerRuleVO;
+import org.apache.cloudstack.lb.dao.ApplicationLoadBalancerRuleDao;
+
 import com.cloud.agent.AgentManager;
 import com.cloud.agent.AgentManager.OnError;
 import com.cloud.agent.api.Answer;
@@ -114,6 +115,7 @@ import com.cloud.vm.VirtualMachineManager;
 import com.cloud.vm.VirtualMachineName;
 import com.cloud.vm.VirtualMachineProfile;
 import com.cloud.vm.VirtualMachineProfile.Param;
+import com.cloud.vm.VmWork;
 import com.cloud.vm.dao.DomainRouterDao;
 import com.cloud.vm.dao.NicDao;
 
@@ -208,7 +210,7 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements
                 // Internal LB control command is sent over management server in VMware
                 if (dest.getHost().getHypervisorType() == HypervisorType.VMware) {
                     if (s_logger.isInfoEnabled()) {
-                        s_logger.info("Check if we need to add management server explicit
route to Internal LB. pod cidr: " 
+                        s_logger.info("Check if we need to add management server explicit
route to Internal LB. pod cidr: "
                                 + dest.getPod().getCidrAddress() + "/" + dest.getPod().getCidrSize()
                                 + ", pod gateway: " + dest.getPod().getGateway() + ", management
host: " + _mgmtHost);
                     }
@@ -325,7 +327,7 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements
 
         // restart network if restartNetwork = false is not specified in profile parameters
         boolean reprogramGuestNtwk = true;
-        if (profile.getParameter(Param.ReProgramGuestNetworks) != null 
+        if (profile.getParameter(Param.ReProgramGuestNetworks) != null
                 && (Boolean) profile.getParameter(Param.ReProgramGuestNetworks) ==
false) {
             reprogramGuestNtwk = false;
         }
@@ -367,7 +369,7 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements
 
     @Override
     public boolean plugNic(Network network, NicTO nic, VirtualMachineTO vm, ReservationContext
context, DeployDestination dest) throws ConcurrentOperationException, ResourceUnavailableException,
-            InsufficientCapacityException {        
+            InsufficientCapacityException {
         //not supported
         throw new UnsupportedOperationException("Plug nic is not supported for vm of type
" + vm.getType());
     }
@@ -481,13 +483,13 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements
         
         Network guestNetwork = _ntwkModel.getNetwork(guestNetworkId);
         Nic guestNic = _nicDao.findByNtwkIdAndInstanceId(guestNetwork.getId(), internalLbVm.getId());
-        NicProfile guestNicProfile = new NicProfile(guestNic, guestNetwork, guestNic.getBroadcastUri(),
guestNic.getIsolationUri(), 
-                _ntwkModel.getNetworkRate(guestNetwork.getId(), internalLbVm.getId()), 
-                _ntwkModel.isSecurityGroupSupportedInNetwork(guestNetwork), 
+        NicProfile guestNicProfile = new NicProfile(guestNic, guestNetwork, guestNic.getBroadcastUri(),
guestNic.getIsolationUri(),
+                _ntwkModel.getNetworkRate(guestNetwork.getId(), internalLbVm.getId()),
+                _ntwkModel.isSecurityGroupSupportedInNetwork(guestNetwork),
                 _ntwkModel.getNetworkTag(internalLbVm.getHypervisorType(), guestNetwork));
 
-        LoadBalancerConfigCommand cmd = new LoadBalancerConfigCommand(lbs, guestNic.getIp4Address(),

-                guestNic.getIp4Address(), internalLbVm.getPrivateIpAddress(), 
+        LoadBalancerConfigCommand cmd = new LoadBalancerConfigCommand(lbs, guestNic.getIp4Address(),
+                guestNic.getIp4Address(), internalLbVm.getPrivateIpAddress(),
                 _itMgr.toNicTO(guestNicProfile, internalLbVm.getHypervisorType()), internalLbVm.getVpcId());
 
         cmd.lbStatsVisibility = _configDao.getValue(Config.NetworkLBHaproxyStatsVisbility.key());
@@ -537,7 +539,7 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements
 
         _accountMgr.checkAccess(caller, null, true, internalLbVm);
 
-        return _itMgr.expunge(internalLbVm, _accountMgr.getActiveUser(callerUserId), caller);

+        return _itMgr.expunge(internalLbVm, _accountMgr.getActiveUser(callerUserId), caller);
     }
 
     
@@ -555,7 +557,7 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements
     protected VirtualRouter stopInternalLbVm(DomainRouterVO internalLbVm, boolean forced,
Account caller, long callerUserId) throws ResourceUnavailableException, ConcurrentOperationException
{
         s_logger.debug("Stopping internal lb vm " + internalLbVm);
         try {
-            if (_itMgr.advanceStop((DomainRouterVO) internalLbVm, forced, _accountMgr.getActiveUser(callerUserId),
caller)) {
+            if (_itMgr.advanceStop(internalLbVm, forced, _accountMgr.getActiveUser(callerUserId),
caller)) {
                 return _internalLbVmDao.findById(internalLbVm.getId());
             } else {
                 return null;
@@ -567,7 +569,7 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements
     
     
     @Override
-    public List<DomainRouterVO> deployInternalLbVm(Network guestNetwork, Ip requestedGuestIp,
DeployDestination dest, 
+    public List<DomainRouterVO> deployInternalLbVm(Network guestNetwork, Ip requestedGuestIp,
DeployDestination dest,
             Account owner, Map<Param, Object> params) throws InsufficientCapacityException,
             ConcurrentOperationException, ResourceUnavailableException {
 
@@ -576,7 +578,7 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements
         return startInternalLbVms(params, internalLbVms);
     }
     
-    protected List<DomainRouterVO> startInternalLbVms(Map<Param, Object> params,
List<DomainRouterVO> internalLbVms) 
+    protected List<DomainRouterVO> startInternalLbVms(Map<Param, Object> params,
List<DomainRouterVO> internalLbVms)
             throws StorageUnavailableException, InsufficientCapacityException, ConcurrentOperationException,
ResourceUnavailableException {
         List<DomainRouterVO> runningInternalLbVms = null;
 
@@ -602,8 +604,8 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements
     
     
     @DB
-    protected List<DomainRouterVO> findOrDeployInternalLbVm(Network guestNetwork, Ip
requestedGuestIp, DeployDestination dest, 
-            Account owner, Map<Param, Object> params) throws ConcurrentOperationException,

+    protected List<DomainRouterVO> findOrDeployInternalLbVm(Network guestNetwork, Ip
requestedGuestIp, DeployDestination dest,
+            Account owner, Map<Param, Object> params) throws ConcurrentOperationException,
             InsufficientCapacityException, ResourceUnavailableException {
 
         List<DomainRouterVO> internalLbVms = new ArrayList<DomainRouterVO>();
@@ -681,7 +683,7 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements
             s_logger.debug("Adding nic for Internal LB in Guest network " + guestNetwork);
             NicProfile guestNic = new NicProfile();
             if (guestIp != null) {
-                guestNic.setIp4Address(guestIp.addr());  
+                guestNic.setIp4Address(guestIp.addr());
             } else {
                 guestNic.setIp4Address(_ntwkMgr.acquireGuestIpAddress(guestNetwork, null));
             }
@@ -783,9 +785,9 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements
                     continue;
                 }
 
-                internalLbVm = new DomainRouterVO(id, routerOffering.getId(), internalLbProviderId,

+                internalLbVm = new DomainRouterVO(id, routerOffering.getId(), internalLbProviderId,
                 VirtualMachineName.getSystemVmName(id, _instance, _internalLbVmNamePrefix),
template.getId(), template.getHypervisorType(),
-                template.getGuestOSId(), owner.getDomainId(), owner.getId(), false, 0, false,

+                template.getGuestOSId(), owner.getDomainId(), owner.getId(), false, 0, false,
                 RedundantState.UNKNOWN, false, false, VirtualMachine.Type.InternalLoadBalancerVm,
vpcId);
                 internalLbVm.setRole(Role.INTERNAL_LB_VM);
                 internalLbVm = _itMgr.allocate(internalLbVm, template, routerOffering, networks,
plan, null, owner);
@@ -827,7 +829,7 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements
     
     
 
-    protected DomainRouterVO startInternalLbVm(DomainRouterVO internalLbVm, Account caller,
long callerUserId, Map<Param, Object> params) 
+    protected DomainRouterVO startInternalLbVm(DomainRouterVO internalLbVm, Account caller,
long callerUserId, Map<Param, Object> params)
             throws StorageUnavailableException, InsufficientCapacityException,
             ConcurrentOperationException, ResourceUnavailableException {
         s_logger.debug("Starting Internal LB VM " + internalLbVm);
@@ -844,7 +846,7 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements
     }
     
     
-    protected List<HypervisorType> getHypervisors(DeployDestination dest, DeploymentPlan
plan, 
+    protected List<HypervisorType> getHypervisors(DeployDestination dest, DeploymentPlan
plan,
             List<HypervisorType> supportedHypervisors) throws InsufficientServerCapacityException
{
         List<HypervisorType> hypervisors = new ArrayList<HypervisorType>();
 
@@ -874,7 +876,7 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements
     }
     
     @Override
-    public boolean applyLoadBalancingRules(Network network, final List<LoadBalancingRule>
rules, List<? extends VirtualRouter> internalLbVms) 
+    public boolean applyLoadBalancingRules(Network network, final List<LoadBalancingRule>
rules, List<? extends VirtualRouter> internalLbVms)
             throws ResourceUnavailableException {
         if (rules == null || rules.isEmpty()) {
             s_logger.debug("No lb rules to be applied for network " + network);
@@ -890,7 +892,7 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements
         if (lbVm.getState() == State.Running) {
             return sendLBRules(lbVm, rules, network.getId());
         } else if (lbVm.getState() == State.Stopped || lbVm.getState() == State.Stopping)
{
-            s_logger.debug("Internal LB VM " + lbVm.getInstanceName() + " is in " + lbVm.getState()
+ 
+            s_logger.debug("Internal LB VM " + lbVm.getInstanceName() + " is in " + lbVm.getState()
+
                     ", so not sending apply lb rules commands to the backend");
             return true;
         } else {
@@ -937,7 +939,7 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements
     
     
     @Override
-    public VirtualRouter startInternalLbVm(long internalLbVmId, Account caller, long callerUserId)

+    public VirtualRouter startInternalLbVm(long internalLbVmId, Account caller, long callerUserId)
             throws StorageUnavailableException, InsufficientCapacityException,
             ConcurrentOperationException, ResourceUnavailableException {
         
@@ -948,4 +950,16 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements
         
         return startInternalLbVm(internalLbVm, caller, callerUserId, null);
     }
+
+    @Override
+    public void vmWorkStart(VmWork work) {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void vmWorkStop(VmWork work) {
+        // TODO Auto-generated method stub
+
+    }
 }


Mime
View raw message