mirror of https://github.com/apache/cloudstack.git
add nsx flag to create vlan public ip range
This commit is contained in:
parent
3a6f68b56a
commit
ce5a9111bd
|
|
@ -552,3 +552,95 @@ CREATE TABLE `cloud_usage`.`bucket_statistics` (
|
|||
`size` bigint unsigned COMMENT 'total size of bucket objects',
|
||||
PRIMARY KEY(`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
DROP VIEW IF EXISTS `cloud`.`host_view`;
|
||||
CREATE VIEW `cloud`.`host_view` AS
|
||||
SELECT
|
||||
host.id,
|
||||
host.uuid,
|
||||
host.name,
|
||||
host.status,
|
||||
host.disconnected,
|
||||
host.type,
|
||||
host.private_ip_address,
|
||||
host.version,
|
||||
host.hypervisor_type,
|
||||
host.hypervisor_version,
|
||||
host.capabilities,
|
||||
host.last_ping,
|
||||
host.created,
|
||||
host.removed,
|
||||
host.resource_state,
|
||||
host.mgmt_server_id,
|
||||
host.cpu_sockets,
|
||||
host.cpus,
|
||||
host.speed,
|
||||
host.ram,
|
||||
cluster.id cluster_id,
|
||||
cluster.uuid cluster_uuid,
|
||||
cluster.name cluster_name,
|
||||
cluster.cluster_type,
|
||||
data_center.id data_center_id,
|
||||
data_center.uuid data_center_uuid,
|
||||
data_center.name data_center_name,
|
||||
data_center.networktype data_center_type,
|
||||
host_pod_ref.id pod_id,
|
||||
host_pod_ref.uuid pod_uuid,
|
||||
host_pod_ref.name pod_name,
|
||||
GROUP_CONCAT(DISTINCT(host_tags.tag)) AS tag,
|
||||
host_tags.is_tag_a_rule is_tag_a_rule
|
||||
guest_os_category.id guest_os_category_id,
|
||||
guest_os_category.uuid guest_os_category_uuid,
|
||||
guest_os_category.name guest_os_category_name,
|
||||
mem_caps.used_capacity memory_used_capacity,
|
||||
mem_caps.reserved_capacity memory_reserved_capacity,
|
||||
cpu_caps.used_capacity cpu_used_capacity,
|
||||
cpu_caps.reserved_capacity cpu_reserved_capacity,
|
||||
async_job.id job_id,
|
||||
async_job.uuid job_uuid,
|
||||
async_job.job_status job_status,
|
||||
async_job.account_id job_account_id,
|
||||
oobm.enabled AS `oobm_enabled`,
|
||||
oobm.power_state AS `oobm_power_state`,
|
||||
ha_config.enabled AS `ha_enabled`,
|
||||
ha_config.ha_state AS `ha_state`,
|
||||
ha_config.provider AS `ha_provider`,
|
||||
`last_annotation_view`.`annotation` AS `annotation`,
|
||||
`last_annotation_view`.`created` AS `last_annotated`,
|
||||
`user`.`username` AS `username`
|
||||
FROM
|
||||
`cloud`.`host`
|
||||
LEFT JOIN
|
||||
`cloud`.`cluster` ON host.cluster_id = cluster.id
|
||||
LEFT JOIN
|
||||
`cloud`.`data_center` ON host.data_center_id = data_center.id
|
||||
LEFT JOIN
|
||||
`cloud`.`host_pod_ref` ON host.pod_id = host_pod_ref.id
|
||||
LEFT JOIN
|
||||
`cloud`.`host_details` ON host.id = host_details.host_id
|
||||
AND host_details.name = 'guest.os.category.id'
|
||||
LEFT JOIN
|
||||
`cloud`.`guest_os_category` ON guest_os_category.id = CONVERT ( host_details.value, UNSIGNED )
|
||||
LEFT JOIN
|
||||
`cloud`.`host_tags` ON host_tags.host_id = host.id
|
||||
LEFT JOIN
|
||||
`cloud`.`op_host_capacity` mem_caps ON host.id = mem_caps.host_id
|
||||
AND mem_caps.capacity_type = 0
|
||||
LEFT JOIN
|
||||
`cloud`.`op_host_capacity` cpu_caps ON host.id = cpu_caps.host_id
|
||||
AND cpu_caps.capacity_type = 1
|
||||
LEFT JOIN
|
||||
`cloud`.`async_job` ON async_job.instance_id = host.id
|
||||
AND async_job.instance_type = 'Host'
|
||||
AND async_job.job_status = 0
|
||||
LEFT JOIN
|
||||
`cloud`.`oobm` ON oobm.host_id = host.id
|
||||
left join
|
||||
`cloud`.`ha_config` ON ha_config.resource_id=host.id
|
||||
and ha_config.resource_type='Host'
|
||||
LEFT JOIN
|
||||
`cloud`.`last_annotation_view` ON `last_annotation_view`.`entity_uuid` = `host`.`uuid`
|
||||
LEFT JOIN
|
||||
`cloud`.`user` ON `user`.`uuid` = `last_annotation_view`.`user_uuid`
|
||||
GROUP BY
|
||||
`host`.`id`;
|
||||
|
|
|
|||
|
|
@ -240,13 +240,16 @@
|
|||
</a-form-item>
|
||||
</div>
|
||||
<div class="form__item" v-if="!basicGuestNetwork && form.iptype != 'ip6'">
|
||||
<a-form-item name="fornsx" ref="fornsx" :label="$t('label.fornsx')" class="form__item">
|
||||
<a-switch :disabled="form.forsystemvms" v-model:checked="form.fornsx"></a-switch>
|
||||
</a-form-item>
|
||||
<div style="color: black;">{{ $t('label.set.reservation') }}</div>
|
||||
<a-switch v-model:checked="showAccountFields" @change="handleShowAccountFields" />
|
||||
</div>
|
||||
<div v-if="showAccountFields && !basicGuestNetwork" style="margin-top: 20px;">
|
||||
<div v-html="$t('label.set.reservation.desc')"></div>
|
||||
<a-form-item name="forsystemvms" ref="forsystemvms" :label="$t('label.system.vms')" class="form__item">
|
||||
<a-switch v-model:checked="form.forsystemvms" />
|
||||
<a-switch :disabled="form.fornsx" v-model:checked="form.forsystemvms" />
|
||||
</a-form-item>
|
||||
<a-spin :spinning="domainsLoading">
|
||||
<a-form-item name="account" ref="account" :label="$t('label.account')" class="form__item">
|
||||
|
|
@ -317,7 +320,7 @@
|
|||
<a-input v-model:value="formUpdRange.netmask"></a-input>
|
||||
</a-form-item>
|
||||
<a-form-item name="forsystemvms" ref="forsystemvms" :label="$t('label.system.vms')" class="form__item">
|
||||
<a-switch v-model:checked="formUpdRange.forsystemvms"></a-switch>
|
||||
<a-switch :disabled="formUpdRange.fornsx" v-model:checked="formUpdRange.forsystemvms"></a-switch>
|
||||
</a-form-item>
|
||||
</div>
|
||||
|
||||
|
|
@ -576,6 +579,7 @@ export default {
|
|||
this.formUpdRange.gateway = this.selectedItem?.gateway || ''
|
||||
this.formUpdRange.netmask = this.selectedItem?.netmask || ''
|
||||
this.formUpdRange.forsystemvms = this.selectedItem?.forsystemvms || false
|
||||
this.formUpdRange.fornsx = this.selectedItem?.fornsx || false
|
||||
this.formUpdRange.ip6gateway = this.selectedItem?.ip6gateway || ''
|
||||
this.formUpdRange.ip6cidr = this.selectedItem?.ip6cidr || ''
|
||||
},
|
||||
|
|
@ -613,6 +617,7 @@ export default {
|
|||
params.account = values.forsystemvms ? null : values.account
|
||||
params.domainid = values.forsystemvms ? null : values.domain
|
||||
params.forvirtualnetwork = true
|
||||
params.fornsx = values.fornsx
|
||||
} else {
|
||||
params.forvirtualnetwork = false
|
||||
params.podid = values.podid
|
||||
|
|
|
|||
Loading…
Reference in New Issue