NE: update broadcast_uri of existing nics

Author: weizhouapache

framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/network/NetworkExtensionElement.java

@@ -472,30 +472,30 @@ public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm
         }
 
         // Sync nic with network
-        applyNicUpdateFromNetwork(network, nic);
+        applyNicUpdateFromNetwork(network, nic.getId());
 
         final NetworkOfferingVO offering = networkOfferingDao.findById(network.getNetworkOfferingId());
         implement(network, offering, dest, context);
 
         return true;
     }
 
-    private void applyNicUpdateFromNetwork(Network network, NicProfile nic) {
-        if (nic == null) {
+    private void applyNicUpdateFromNetwork(Network network, Long nicId) {
+        if (nicId == null) {
             return;
         }
         try {
-            NicVO nicVo = nicDao.findById(nic.getId());
+            NicVO nicVo = nicDao.findById(nicId);
             if (nicVo == null) {
                 return;
             }
             if (network.getBroadcastUri() != null) {
                 nicVo.setBroadcastUri(network.getBroadcastUri());
                 nicVo.setIsolationUri(network.getBroadcastUri());
             }
-            nicDao.update(nic.getId(), nicVo);
+            nicDao.update(nicId, nicVo);
         } catch (Exception e) {
-            logger.debug("Failed to update nic {}: {}", nic.getId(), e.getMessage());
+            logger.debug("Failed to update nic {}: {}", nicId, e.getMessage());
         }
     }
 
@@ -967,6 +967,9 @@ private void applyNetworkUpdateFromScriptOutput(Network network, String outputSt
 
             if (changed) {
                 networkDao.update(networkVo.getId(), networkVo);
+                for (NicVO nicVO : nicDao.listByNetworkId(networkVo.getId())) {
+                    applyNicUpdateFromNetwork(network, nicVO.getId());
+                }
             }
         } catch (Exception e) {
             logger.warn("Failed to update network {} from script output: {}", network.getId(), e.getMessage());