diff --git a/python/lib/cloudutils/networkConfig.py b/python/lib/cloudutils/networkConfig.py index 2d1f9936d39..ac51f92aa58 100644 --- a/python/lib/cloudutils/networkConfig.py +++ b/python/lib/cloudutils/networkConfig.py @@ -41,7 +41,7 @@ class networkConfig: return devs @staticmethod def getDefaultNetwork(): - cmd = bash("route -n|awk \'/^0.0.0.0/ {print $2,$8}\'") + cmd = bash("ip route show default | awk \'{print $3,$5}\'") if not cmd.isSuccess(): logging.debug("Failed to get default route") raise CloudRuntimeException("Failed to get default route") diff --git a/ui/src/views/compute/EditVM.vue b/ui/src/views/compute/EditVM.vue index 75a297cee3e..fad1dcc254e 100644 --- a/ui/src/views/compute/EditVM.vue +++ b/ui/src/views/compute/EditVM.vue @@ -185,7 +185,6 @@ export default { isdynamicallyscalable: this.resource.isdynamicallyscalable, deleteprotection: this.resource.deleteprotection, group: this.resource.group, - securitygroupids: this.resource.securitygroup.map(x => x.id), userdata: '', haenable: this.resource.haenable }) diff --git a/ui/src/views/image/RegisterOrUploadIso.vue b/ui/src/views/image/RegisterOrUploadIso.vue index acf4c3fd15b..6c26f08b581 100644 --- a/ui/src/views/image/RegisterOrUploadIso.vue +++ b/ui/src/views/image/RegisterOrUploadIso.vue @@ -88,6 +88,15 @@ + + + + +