Skip to content

Commit 29ab4b7

Browse files
committed
add support for conserve mode
1 parent a8e2be3 commit 29ab4b7

2 files changed

Lines changed: 15 additions & 1 deletion

File tree

‎server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1079,6 +1079,11 @@ private void applyResolvedValuesToCommand(CloneVPCOfferingCmd cmd, VpcOfferingVO
10791079
ConfigurationManagerImpl.setField(cmd, "specifyAsNumber", sourceOffering.isSpecifyAsNumber());
10801080
}
10811081

1082+
Boolean conserveModeFieldValue = getRawFieldValue(cmd, "conserveMode", Boolean.class);
1083+
if (conserveModeFieldValue == null) {
1084+
ConfigurationManagerImpl.setField(cmd, "conserveMode", sourceOffering.isConserveMode());
1085+
}
1086+
10821087
if (cmd.getInternetProtocol() == null) {
10831088
String internetProtocol = vpcOfferingDetailsDao.getDetail(sourceOffering.getId(), ApiConstants.INTERNET_PROTOCOL);
10841089
if (internetProtocol != null) {

‎ui/src/views/offering/CloneVpcOffering.vue‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,12 @@
212212
</a-select-option>
213213
</a-select>
214214
</a-form-item>
215+
<a-form-item name="conservemode" ref="conservemode">
216+
<template #label>
217+
<tooltip-label :title="$t('label.conservemode')" :tooltip="apiParams.conservemode.description"/>
218+
</template>
219+
<a-switch v-model:checked="form.conservemode" />
220+
</a-form-item>
215221
<a-form-item name="ispublic" ref="ispublic" :label="$t('label.ispublic')" v-if="isAdmin()">
216222
<a-switch v-model:checked="form.ispublic" @change="val => { isPublic = val }" />
217223
</a-form-item>
@@ -308,7 +314,6 @@ export default {
308314
return {
309315
selectedDomains: [],
310316
selectedZones: [],
311-
isConserveMode: true,
312317
internetProtocolValue: 'ipv4',
313318
domains: [],
314319
domainLoading: false,
@@ -856,6 +861,10 @@ export default {
856861
params.enable = values.enable
857862
}
858863
864+
if (values.conservemode !== undefined) {
865+
params.conservemode = values.conservemode
866+
}
867+
859868
this.loading = true
860869
postAPI('cloneVPCOffering', params).then(json => {
861870
this.$message.success(`${this.$t('message.success.clone.vpc.offering')} ${values.name}`)

0 commit comments

Comments
 (0)