[cloudstack] branch 4.13 updated: server: Cannot migrate VM on PVLAN shared network (#4062)

[rohit]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.13
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.13 by this push:
     new 056e676  server: Cannot migrate VM on PVLAN shared network (#4062)
056e676 is described below

commit 056e6768a2a2c879a62f82ac4c2a39e8acf6bb6e
Author: Nicolas Vazquez <nicovazque...@gmail.com>
AuthorDate: Sun Jun 7 22:31:11 2020 -0300

    server: Cannot migrate VM on PVLAN shared network (#4062)
    
    Fix casting issue.
    
    Fixes #4061
---
 .../java/com/cloud/network/element/VirtualRouterElement.java     | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git 
a/server/src/main/java/com/cloud/network/element/VirtualRouterElement.java 
b/server/src/main/java/com/cloud/network/element/VirtualRouterElement.java
index da066f0..0b664a9 100644
--- a/server/src/main/java/com/cloud/network/element/VirtualRouterElement.java
+++ b/server/src/main/java/com/cloud/network/element/VirtualRouterElement.java
@@ -1223,8 +1223,7 @@ NetworkMigrationResponder, AggregatedCommandExecutor, 
RedundantResource, DnsServ
             }
         } else if (vm.getType() == VirtualMachine.Type.User) {
             assert vm instanceof UserVmVO;
-            final UserVmVO userVm = (UserVmVO) vm.getVirtualMachine();
-            _userVmMgr.setupVmForPvlan(false, userVm.getHostId(), nic);
+            _userVmMgr.setupVmForPvlan(false, 
vm.getVirtualMachine().getHostId(), nic);
         }
         return true;
     }
@@ -1248,8 +1247,7 @@ NetworkMigrationResponder, AggregatedCommandExecutor, 
RedundantResource, DnsServ
             }
         } else if (vm.getType() == VirtualMachine.Type.User) {
             assert vm instanceof UserVmVO;
-            final UserVmVO userVm = (UserVmVO) vm.getVirtualMachine();
-            _userVmMgr.setupVmForPvlan(true, userVm.getHostId(), nic);
+            _userVmMgr.setupVmForPvlan(true, 
vm.getVirtualMachine().getHostId(), nic);
         }
     }
 
@@ -1272,8 +1270,7 @@ NetworkMigrationResponder, AggregatedCommandExecutor, 
RedundantResource, DnsServ
             }
         } else if (vm.getType() == VirtualMachine.Type.User) {
             assert vm instanceof UserVmVO;
-            final UserVmVO userVm = (UserVmVO) vm.getVirtualMachine();
-            _userVmMgr.setupVmForPvlan(true, userVm.getHostId(), nic);
+            _userVmMgr.setupVmForPvlan(true, 
vm.getVirtualMachine().getHostId(), nic);
         }
     }