Skip to content

ui: fix merge issue that causes VR duplicates#3927

Merged
DaanHoogland merged 1 commit intoapache:masterfrom
shapeblue:fix-merge-vr-dupes-ui
Mar 4, 2020
Merged

ui: fix merge issue that causes VR duplicates#3927
DaanHoogland merged 1 commit intoapache:masterfrom
shapeblue:fix-merge-vr-dupes-ui

Conversation

@yadvr
Copy link
Copy Markdown
Member

@yadvr yadvr commented Mar 4, 2020

This fixes issue from merging 4d8a2da
on master/4.14-snapshot which causes duplicate VRs to show up.

Fixes #3926

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)

This fixes issue from merging 4d8a2da
on master/4.14-snapshot which causes duplicate VRs to show up.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
@yadvr yadvr added this to the 4.14.0.0 milestone Mar 4, 2020
@yadvr
Copy link
Copy Markdown
Member Author

yadvr commented Mar 4, 2020

This is UI only change backend smoketests not necessary, manual test/confirmation is asked
@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

@rhtyd 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-993

Copy link
Copy Markdown
Contributor

@DaanHoogland DaanHoogland left a comment

Choose a reason for hiding this comment

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

code change good, testing of corner cases by every one invited

Comment thread ui/scripts/system.js

$.ajax({
url: createURL("listRouters&listAll=true&page=" + args.page + "&pagesize=" + pageSize + array1.join("") + "&projectid=-1"),
url: createURL("listRouters&page=" + args.page + "&pagesize=" + pageSize + array1.join("") + "&projectid=-1"),
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.

listall | If  set to false, list only resources belonging to the command's caller; if  set to true - list resources that the caller is authorized to see.  Default value is false

so if the admin calls this and a router would not belong to them... I'll test some scenarios

Copy link
Copy Markdown
Member

@weizhouapache weizhouapache left a comment

Choose a reason for hiding this comment

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

looks good.
tested with network/vpc in normal view, and isolated network in project view.

@yadvr
Copy link
Copy Markdown
Member Author

yadvr commented Mar 4, 2020

@DaanHoogland please merge once you've tested and are satisfied

@DaanHoogland
Copy link
Copy Markdown
Contributor

tested with isolated vpc and shared as user and admin

@DaanHoogland DaanHoogland merged commit 8597f37 into apache:master Mar 4, 2020
@DaanHoogland DaanHoogland deleted the fix-merge-vr-dupes-ui branch March 4, 2020 09:51
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.

VRs listed twice in GUI

4 participants