@@ -320,8 +320,12 @@ public boolean postStateTransitionEvent(StateMachine2.Transition<VirtualMachine.
320320 try {
321321 final Network network = _networkMgr .getNetwork (nic .getNetworkId ());
322322 final UserDataServiceProvider userDataUpdateProvider = _networkModel .getUserDataUpdateProvider (network );
323+ if (userDataUpdateProvider == null ) {
324+ LOG .warn ("Failed to get user data provider" );
325+ return false ;
326+ }
323327 final Provider provider = userDataUpdateProvider .getProvider ();
324- if (provider . equals ( Provider .ConfigDrive )) {
328+ if (Provider .ConfigDrive . equals ( provider )) {
325329 try {
326330 return deleteConfigDriveIso (vm );
327331 } catch (ResourceUnavailableException e ) {
@@ -336,7 +340,12 @@ public boolean postStateTransitionEvent(StateMachine2.Transition<VirtualMachine.
336340
337341 @ Override
338342 public boolean prepareMigration (NicProfile nic , Network network , VirtualMachineProfile vm , DeployDestination dest , ReservationContext context ) {
339- if (_networkModel .getUserDataUpdateProvider (network ).getProvider ().equals (Provider .ConfigDrive )) {
343+ final UserDataServiceProvider userDataUpdateProvider = _networkModel .getUserDataUpdateProvider (network );
344+ if (userDataUpdateProvider == null ) {
345+ LOG .warn ("Failed to prepare for migration, can't get user data provider" );
346+ return false ;
347+ }
348+ if (Provider .ConfigDrive .equals (userDataUpdateProvider .getProvider ())) {
340349 LOG .trace (String .format ("[prepareMigration] for vm: %s" , vm .getInstanceName ()));
341350 try {
342351 if (isConfigDriveIsoOnHostCache (vm .getId ())) {
@@ -384,7 +393,11 @@ public void commitMigration(NicProfile nic, Network network, VirtualMachineProfi
384393 }
385394
386395 private void recreateConfigDriveIso (NicProfile nic , Network network , VirtualMachineProfile vm , DeployDestination dest ) throws ResourceUnavailableException {
387- if (nic .isDefaultNic () && _networkModel .getUserDataUpdateProvider (network ).getProvider ().equals (Provider .ConfigDrive )) {
396+ final UserDataServiceProvider userDataUpdateProvider = _networkModel .getUserDataUpdateProvider (network );
397+ if (userDataUpdateProvider == null ) {
398+ return ;
399+ }
400+ if (nic .isDefaultNic () && Provider .ConfigDrive .equals (userDataUpdateProvider .getProvider ())) {
388401 DiskTO diskToUse = null ;
389402 for (DiskTO disk : vm .getDisks ()) {
390403 if (disk .getType () == Volume .Type .ISO && disk .getPath () != null && disk .getPath ().contains ("configdrive" )) {
0 commit comments