From 80abb5a74bdcf3b36bf5f46551b3c8060e450168 Mon Sep 17 00:00:00 2001
From: Nicolas Vazquez <nicovazquez90@gmail.com>
Date: Thu, 21 Nov 2019 03:04:14 -0300
Subject: [PATCH] Fix VR creation issue while creating VM on shared network
 using PVLAN (#3653)

* Fix VR creation issue while creating VM on shared network using PVLAN

* Fix update guest networks
---
 .../router/VirtualNetworkApplianceManagerImpl.java  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 643ccbbf8a4..c8ea47b31db 100644
--- a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -2057,6 +2057,11 @@ Configurable, StateListener<VirtualMachine.State, VirtualMachine.Event, VirtualM
         // Get guest networks info
         final List<Network> guestNetworks = new ArrayList<Network>();
 
+        final GetDomRVersionAnswer versionAnswer = (GetDomRVersionAnswer) cmds.getAnswer("getDomRVersion");
+        router.setTemplateVersion(versionAnswer.getTemplateVersion());
+        router.setScriptsVersion(versionAnswer.getScriptsVersion());
+        _routerDao.persist(router, guestNetworks);
+
         final List<? extends Nic> routerNics = _nicDao.listByVmId(profile.getId());
         for (final Nic nic : routerNics) {
             final Network network = _networkModel.getNetwork(nic.getNetworkId());
@@ -2077,11 +2082,11 @@ Configurable, StateListener<VirtualMachine.State, VirtualMachine.Event, VirtualM
                 }
             }
         }
+
         if (result) {
-            final GetDomRVersionAnswer versionAnswer = (GetDomRVersionAnswer) cmds.getAnswer("getDomRVersion");
-            router.setTemplateVersion(versionAnswer.getTemplateVersion());
-            router.setScriptsVersion(versionAnswer.getScriptsVersion());
-            _routerDao.persist(router, guestNetworks);
+            for (Network guestNetwork : guestNetworks) {
+                _routerDao.addRouterToGuestNetwork(router, guestNetwork);
+            }
         }
 
         return result;