Merge branch 'fix/ZSTAC-82118' into '5.5.6'

fix(flatNetwork): ZSTAC-82118 fallback metadata hostname for VMs with userdata

See merge request zstackio/zstack!9144

Author: gitlab

plugin/flatNetworkProvider/src/main/java/org/zstack/network/service/flat/FlatUserdataBackend.java

@@ -310,6 +310,10 @@ private List<UserdataTO> getUserData() {
                         continue;
                     }
 
+                    if (mto.vmHostname == null) {
+                        mto.vmHostname = l.vmIp.replaceAll("\\.", "-");
+                    }
+
                     if (bridgeNames.get(l.l3Uuid) == null) {
                         continue;
                     }
@@ -780,6 +784,9 @@ public void run(final FlowTrigger trigger, Map data) {
                         MetadataTO to = new MetadataTO();
                         to.vmUuid = struct.getVmUuid();
                         to.vmHostname = VmSystemTags.HOSTNAME.getTokenByResourceUuid(struct.getVmUuid(), VmSystemTags.HOSTNAME_TOKEN);
+                        if (to.vmHostname == null) {
+                            to.vmHostname = ipv4.getIp().replaceAll("\\.", "-");
+                        }
                         to.regionName = getZoneNameByVmInstanceUuid(struct.getVmUuid());
                         to.mac = destNic.getMac();
                         to.dnsServersIp = getDnsServersIpFromVm(struct.getVmUuid());