Skip to content

Conversation

@weizhouapache
Copy link
Member

Description

The default offering for vpc networks has been changed to conserved mode in PR #8309 . It looks good.
This PR enables the option on UI

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)
  • build/CI
  • test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

@codecov
Copy link

codecov bot commented Dec 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 16.03%. Comparing base (e57a82a) to head (d7adf5d).
Report is 5 commits behind head on 4.20.

Additional details and impacted files
@@            Coverage Diff            @@
##               4.20   #10082   +/-   ##
=========================================
  Coverage     16.03%   16.03%           
- Complexity    12814    12815    +1     
=========================================
  Files          5637     5637           
  Lines        493506   493506           
  Branches      59831    59831           
=========================================
+ Hits          79129    79130    +1     
+ Misses       405601   405600    -1     
  Partials       8776     8776           
Flag Coverage Δ
uitests 4.02% <ø> (ø)
unittests 16.87% <ø> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@DaanHoogland DaanHoogland added this to the 4.20.1 milestone Dec 11, 2024
@JoaoJandre
Copy link
Contributor

@blueorangutan ui

@blueorangutan
Copy link

@JoaoJandre a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress.

@blueorangutan
Copy link

UI build: ✔️
Live QA URL: https://qa.cloudstack.cloud/simulator/pr/10082 (QA-JID-501)

@DaanHoogland
Copy link
Contributor

@weizhouapache , any reason this should be on 4.20 and not 4.19?

@weizhouapache
Copy link
Member Author

@weizhouapache , any reason this should be on 4.20 and not 4.19?

as the line of code is different in 4.19/4.20

@@ -377,7 +452,7 @@
         <a-form-item
           name="conservemode"
           ref="conservemode"
-          v-if="(guestType === 'shared' || guestType === 'isolated') && !isVpcVirtualRouterForAtLeastOneService">
+          v-if="(guestType === 'shared' || guestType === 'isolated') && !isVpcVirtualRouterForAtLeastOneService && !forNsx && networkmode !== 'ROUTED'">
           <template #label>
             <tooltip-label :title="$t('label.conservemode')" :tooltip="apiParams.conservemode.description"/>
           </template>

I can rebase to 4.19 if you think it is needed. (then you will face merge conflict when merge forward 😄 )

@DaanHoogland
Copy link
Contributor

@weizhouapache , any reason this should be on 4.20 and not 4.19?

as the line of code is different in 4.19/4.20

@@ -377,7 +452,7 @@
         <a-form-item
           name="conservemode"
           ref="conservemode"
-          v-if="(guestType === 'shared' || guestType === 'isolated') && !isVpcVirtualRouterForAtLeastOneService">
+          v-if="(guestType === 'shared' || guestType === 'isolated') && !isVpcVirtualRouterForAtLeastOneService && !forNsx && networkmode !== 'ROUTED'">
           <template #label>
             <tooltip-label :title="$t('label.conservemode')" :tooltip="apiParams.conservemode.description"/>
           </template>

I can rebase to 4.19 if you think it is needed. (then you will face merge conflict when merge forward 😄 )

thanks, I think I wil live with it ;) but it should not be a big deal.

Copy link
Contributor

@JoaoJandre JoaoJandre left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, tested creating both VPC network offerings with and without conserve mode, both were correctly created

@DaanHoogland DaanHoogland merged commit ac19379 into apache:4.20 Dec 13, 2024
24 of 25 checks passed
@DaanHoogland DaanHoogland deleted the 4.20-ui-allow-vpc-conserve-mode branch December 13, 2024 16:05
DaanHoogland added a commit that referenced this pull request Dec 20, 2024
* 4.20:
  VR: apply iptables rules when add/remove static routes (#10064)
  Certificate and VM hostname validation improvements (#10051)
  set ulimit for server according to redhat spec (#10040)
  kvm-storage: provide isVMMigrate information to storage plugins (#10093)
  Allow config drive deletion of migrated VM, on host maintenance (#10045)
  linstor: improve heartbeat check with also asking linstor (#10105)
  server: simplify role change validation (#9173)
  UI: create VPC network offering with conserve mode (#10082)
  server: fix typo removeaccessvpn in VirtualRouterElement (#10086)
  UI: remove duplicated Instance Name in Public IP details page (#10087)
  UI: Fixes in the Usage UI (#10000)
  SAML2: add cookie with HttpOnly too #10013 (#10047)
  ui: Allow font-awesome icon usage and optimise icon size inconsistency (#9744)
dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Dec 26, 2024
@Pearl1594 Pearl1594 moved this to Done in ACS 4.20.1 Mar 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants