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

Author: nvazquez

server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java

@@ -2057,6 +2057,11 @@ public boolean finalizeStart(final VirtualMachineProfile profile, final long hos
         // 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 @@ public boolean finalizeStart(final VirtualMachineProfile profile, final long hos
                 }
             }
         }
+
         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;