cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [2/2] git commit: updated refs/heads/4.5 to fd0eb6c
Date Sun, 18 Jan 2015 12:53:56 GMT
CLOUDSTACK-3439. [VMWARE] While preparing for migration, include dynamically created nics in
case of VMware too.

(cherry picked from commit 4b67a48144402a3a43d51c869456d9268873b1b1)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


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

Branch: refs/heads/4.5
Commit: fd0eb6c29e09164da08039e686601b9d5a773287
Parents: 1e87f3b
Author: Likitha Shetty <likitha.shetty@citrix.com>
Authored: Mon Jan 5 11:35:43 2015 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Sun Jan 18 18:19:30 2015 +0530

----------------------------------------------------------------------
 .../cloudstack/engine/orchestration/NetworkOrchestrator.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fd0eb6c2/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index c84fb8d..244ce47 100755
--- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -1377,7 +1377,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
 
     @Override
     public void prepareNicForMigration(VirtualMachineProfile vm, DeployDestination dest)
{
-        if(vm.getType().equals(VirtualMachine.Type.DomainRouter) && vm.getHypervisorType().equals(HypervisorType.KVM)){
+        if(vm.getType().equals(VirtualMachine.Type.DomainRouter) && (vm.getHypervisorType().equals(HypervisorType.KVM)
|| vm.getHypervisorType().equals(HypervisorType.VMware))) {
             //Include nics hot plugged and not stored in DB
             prepareAllNicsForMigration(vm, dest);
             return;


Mime
View raw message