VR: fix public-key is missing in VR after acquiring public IP (#7103)

weizhouapache · web-flow · commit e8c1b5509ea2 · 2023-01-25T10:38:28.000+01:00
diff --git a/server/src/main/java/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java b/server/src/main/java/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
@@ -254,7 +254,7 @@ public boolean visit(final UserdataToRouterRules userdata) throws ResourceUnavai
         final NicVO nicVo = userdata.getNicVo();
 
         final Commands commands = new Commands(Command.OnError.Stop);
-        _commandSetupHelper.createVmDataCommand(router, userVM, nicVo, null, commands);
+        _commandSetupHelper.createVmDataCommand(router, userVM, nicVo, userVM.getDetail("SSH.PublicKey"), commands);
 
         return _networkGeneralHelper.sendCommandsToRouter(router, commands);
     }

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ public boolean visit(final UserdataToRouterRules userdata) throws ResourceUnavai`
`254`	`254`	`final NicVO nicVo = userdata.getNicVo();`
`255`	`255`
`256`	`256`	`final Commands commands = new Commands(Command.OnError.Stop);`
`257`		`- _commandSetupHelper.createVmDataCommand(router, userVM, nicVo, null, commands);`
	`257`	`+ _commandSetupHelper.createVmDataCommand(router, userVM, nicVo, userVM.getDetail("SSH.PublicKey"), commands);`
`258`	`258`
`259`	`259`	`return _networkGeneralHelper.sendCommandsToRouter(router, commands);`
`260`	`260`	`}`