Skip to content

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

Merged
yadvr merged 2 commits into
apache:4.11from
ustcweizhou:bugfix/vpc-enable-static-nat
May 30, 2019
Merged

ui: fix enable static nat only towards first nic and not on any other interface#3338
yadvr merged 2 commits into
apache:4.11from
ustcweizhou:bugfix/vpc-enable-static-nat

Conversation

@ustcweizhou
Copy link
Copy Markdown
Contributor

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?

Copy link
Copy Markdown
Contributor

@anuragaw anuragaw left a comment

Choose a reason for hiding this comment

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

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

Comment thread ui/scripts/network.js Outdated
$.extend(data, {
networkid: network.id
});
}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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
}

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

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

@ustcweizhou ustcweizhou force-pushed the bugfix/vpc-enable-static-nat branch from 767356a to 3882758 Compare May 21, 2019 07:23
@nvazquez
Copy link
Copy Markdown
Contributor

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

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

@blueorangutan
Copy link
Copy Markdown

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

Copy link
Copy Markdown
Contributor

@nvazquez nvazquez left a comment

Choose a reason for hiding this comment

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

Tested manually on local environment. LGTM
Thanks @ustcweizhou

@yadvr yadvr added this to the 4.11.3.0 milestone May 27, 2019
@yadvr yadvr requested a review from borisstoyanov May 27, 2019 13:14
@yadvr
Copy link
Copy Markdown
Member

yadvr commented May 30, 2019

@blueorangutan test

@blueorangutan
Copy link
Copy Markdown

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

@yadvr yadvr merged commit f6f381f into apache:4.11 May 30, 2019
@yadvr
Copy link
Copy Markdown
Member

yadvr commented May 30, 2019

Purely UI changes, merged based on reviews.

@blueorangutan
Copy link
Copy Markdown

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants