fix check

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java

@@ -20,11 +20,11 @@
 import java.util.List;
 import java.util.Map;
 
-import com.cloud.dc.DataCenter;
 import org.apache.cloudstack.acl.ControlledEntity.ACLType;
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.ConfigKey.Scope;
 
+import com.cloud.dc.DataCenter;
 import com.cloud.deploy.DataCenterDeployment;
 import com.cloud.deploy.DeployDestination;
 import com.cloud.deploy.DeploymentPlan;
@@ -50,8 +50,8 @@
 import com.cloud.offering.NetworkOffering;
 import com.cloud.user.Account;
 import com.cloud.user.User;
-import com.cloud.utils.fsm.NoTransitionException;
 import com.cloud.utils.Pair;
+import com.cloud.utils.fsm.NoTransitionException;
 import com.cloud.vm.Nic;
 import com.cloud.vm.NicProfile;
 import com.cloud.vm.ReservationContext;
@@ -348,4 +348,6 @@ void implementNetworkElementsAndResources(DeployDestination dest, ReservationCon
     Pair<NicProfile, Integer> importNic(final String macAddress, int deviceId, final Network network, final Boolean isDefaultNic, final VirtualMachine vm, final Network.IpAddresses ipAddresses, final DataCenter datacenter, boolean forced) throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException;
 
     void unmanageNics(VirtualMachineProfile vm);
+
+    boolean isNetworkImplemented(final Network network);
 }

engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java

@@ -16,6 +16,8 @@
 // under the License.
 package org.apache.cloudstack.engine.orchestration;
 
+import static com.cloud.configuration.ConfigurationManager.MESSAGE_DELETE_VLAN_IP_RANGE_EVENT;
+
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -241,8 +243,8 @@
 import com.cloud.vm.UserVmVO;
 import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.VirtualMachine;
-import com.cloud.vm.VirtualMachineManager;
 import com.cloud.vm.VirtualMachine.Type;
+import com.cloud.vm.VirtualMachineManager;
 import com.cloud.vm.VirtualMachineProfile;
 import com.cloud.vm.dao.DomainRouterDao;
 import com.cloud.vm.dao.NicDao;
@@ -255,8 +257,6 @@
 import com.cloud.vm.dao.VMInstanceDao;
 import com.googlecode.ipv6.IPv6Address;
 
-import static com.cloud.configuration.ConfigurationManager.MESSAGE_DELETE_VLAN_IP_RANGE_EVENT;
-
 /**
  * NetworkManagerImpl implements NetworkManager.
  */
@@ -1339,20 +1339,6 @@ protected NicTO toNicTO(final NicVO nic, final NicProfile profile, final Network
         return to;
     }
 
-    boolean isNetworkImplemented(final NetworkVO network) {
-        final Network.State state = network.getState();
-        final NetworkOfferingVO offeringVO = _networkOfferingDao.findById(network.getNetworkOfferingId());
-        if (state == Network.State.Implemented) {
-            return true;
-        } else if (state == Network.State.Setup) {
-            final DataCenterVO zone = _dcDao.findById(network.getDataCenterId());
-            if ((!isSharedNetworkOfferingWithServices(network.getNetworkOfferingId()) && !offeringVO.isPersistent()) || zone.getNetworkType() == NetworkType.Basic) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     Pair<NetworkGuru, NetworkVO> implementNetwork(final long networkId, final DeployDestination dest, final ReservationContext context, final boolean isRouter) throws ConcurrentOperationException,
             ResourceUnavailableException, InsufficientCapacityException {
         Pair<NetworkGuru, NetworkVO> implemented = null;
@@ -1450,6 +1436,20 @@ private boolean networkMeetsPersistenceCriteria(NetworkVO network, NetworkOfferi
         }
     }
 
+    @Override
+    public boolean isNetworkImplemented(final Network network) {
+        final Network.State state = network.getState();
+        final NetworkOfferingVO offeringVO = _networkOfferingDao.findById(network.getNetworkOfferingId());
+        if (state == Network.State.Implemented) {
+            return true;
+        } else if (state == Network.State.Setup) {
+            final DataCenterVO zone = _dcDao.findById(network.getDataCenterId());
+            return (!isSharedNetworkOfferingWithServices(network.getNetworkOfferingId()) && !offeringVO.isPersistent())
+                    || zone.getNetworkType() == NetworkType.Basic;
+        }
+        return false;
+    }
+
     @Override
     @DB
     public Pair<NetworkGuru, NetworkVO> implementNetwork(final long networkId, final DeployDestination dest, final ReservationContext context) throws ConcurrentOperationException,

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -882,8 +882,10 @@ private boolean updateVMPasswordInNetworkElement(VirtualMachine vm, VMTemplateVO
             return false;
         }
         Network defaultNetwork = _networkDao.findById(defaultNic.getNetworkId());
-        if (State.Stopped.equals(vm.getState()) && !Network.State.Implemented.equals(defaultNetwork.getState())) {
-            s_logger.debug("%s is not ready, skipping updating VM password");
+        if (State.Stopped.equals(vm.getState()) &&
+                Arrays.asList(GuestType.Shared, GuestType.Isolated).contains(defaultNetwork.getGuestType()) &&
+                !_networkMgr.isNetworkImplemented(defaultNetwork)) {
+            s_logger.debug(String.format("%s is not ready, skipping updating VM password", defaultNetwork));
             return true;
         }
         NicProfile defaultNicProfile = new NicProfile(defaultNic, defaultNetwork, null, null,