Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ui: fix enable static nat only towards first nic and not on any other interface #3338

Merged
merged 2 commits into from May 30, 2019

Conversation

Projects
None yet
6 participants
@ustcweizhou
Copy link
Contributor

commented May 20, 2019

Description

When enable static nat in a vpc on UI, it only lists the primary and secondary ips of first nic of a vm, no matter which vpc tier is selected.
The same issue happens when add a vm to load balancer.

Fixes: #3334

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)

Screenshots (if appropriate):

How Has This Been Tested?

@anuragaw
Copy link
Contributor

left a comment

Very minor suggestion but code looks good. Since it's a UI Change, some snapshots would help.

$.extend(data, {
networkid: network.id
});
}

This comment has been minimized.

Copy link
@anuragaw

anuragaw May 21, 2019

Contributor

very minor suggestion- Alternate way of writing could be (just to make it smaller)-

var data = {
         virtualmachineid: instance.id,
         networkid: (args.context.networkid != undefined) ? args.context.networkid : network.id
}

This comment has been minimized.

Copy link
@ustcweizhou

ustcweizhou May 21, 2019

Author Contributor

@anuragaw
Changed the code as you suggested, tested ok.
thanks for good suggestion.

@ustcweizhou ustcweizhou force-pushed the ustcweizhou:bugfix/vpc-enable-static-nat branch from 767356a to 3882758 May 21, 2019

@nvazquez

This comment has been minimized.

Copy link
Contributor

commented May 24, 2019

@blueorangutan package

@blueorangutan

This comment has been minimized.

Copy link

commented May 24, 2019

@nvazquez a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan

This comment has been minimized.

Copy link

commented May 24, 2019

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2779

@nvazquez
Copy link
Contributor

left a comment

Tested manually on local environment. LGTM
Thanks @ustcweizhou

@rhtyd rhtyd added this to the 4.11.3.0 milestone May 27, 2019

@rhtyd rhtyd requested a review from borisstoyanov May 27, 2019

@rhtyd

rhtyd approved these changes May 30, 2019

@rhtyd

This comment has been minimized.

Copy link
Member

commented May 30, 2019

@blueorangutan

This comment has been minimized.

Copy link

commented May 30, 2019

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@rhtyd rhtyd merged commit f6f381f into apache:4.11 May 30, 2019

1 of 2 checks passed

continuous-integration/travis-ci/pr The Travis CI build could not complete due to an error
Details
Jenkins This pull request looks good
Details
@rhtyd

This comment has been minimized.

Copy link
Member

commented May 30, 2019

Purely UI changes, merged based on reviews.

@blueorangutan

This comment has been minimized.

Copy link

commented May 30, 2019

Trillian test result (tid-3604)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 31644 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3338-t3604-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Smoke tests completed. 68 look OK, 0 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.