Skip to content
This repository was archived by the owner on Jan 20, 2021. It is now read-only.

Adding pvlan option for l2 and fixing passing none for no pvlan type#373

Merged
yadvr merged 5 commits into
apache:masterfrom
shapeblue:add-l2-pvlan
Jun 24, 2020
Merged

Adding pvlan option for l2 and fixing passing none for no pvlan type#373
yadvr merged 5 commits into
apache:masterfrom
shapeblue:add-l2-pvlan

Conversation

@davidjumani
Copy link
Copy Markdown
Contributor

This adds the option to create PVLAN for L2 networks, as well as fixes the issue caused by passing 'none' as the PVLAN type when no secondary VLAN type is selected

@yadvr
Copy link
Copy Markdown
Member

yadvr commented Jun 3, 2020

@borisstoyanov @vladimirpetrov - please ping me once you confirm testing the feature
@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

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

@blueorangutan
Copy link
Copy Markdown

Packaging result: ✔️centos ✔️debian ✔️archive. JID-1959

@yadvr yadvr modified the milestone: 1.0-GA Jun 4, 2020
@yadvr
Copy link
Copy Markdown
Member

yadvr commented Jun 5, 2020

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

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

@blueorangutan
Copy link
Copy Markdown

Packaging result: ✔️centos ✔️debian ✔️archive.
QA: http://primate-qa.cloudstack.cloud:8080/client/pr/373 (JID-1967)

@yadvr
Copy link
Copy Markdown
Member

yadvr commented Jun 8, 2020

Does it cover all cases for apache/cloudstack#3732 ? @davidjumani ?

@davidjumani
Copy link
Copy Markdown
Contributor Author

@rhtyd Yes it does!

@borisstoyanov
Copy link
Copy Markdown

@blueorangutan test

Copy link
Copy Markdown
Contributor

@shwstppr shwstppr left a comment

Choose a reason for hiding this comment

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

Minor code refactoring comments, functionality LGTM

initialValue: this.isolatePvlanType
}]"
buttonStyle="solid"
@change="selected => { this.handleIsolatedPvlanTypeChange(selected.target.value) }">
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.

minor: can be simplified

Suggested change
@change="selected => { this.handleIsolatedPvlanTypeChange(selected.target.value) }">
@change="selected => { this.isolatePvlanType = selected.target.value }">

Comment on lines +258 to +260
handleIsolatedPvlanTypeChange (pvlan) {
this.isolatePvlanType = pvlan
},
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.

Suggested change
handleIsolatedPvlanTypeChange (pvlan) {
this.isolatePvlanType = pvlan
},

Comment on lines +594 to +596
if (this.isValidValueForKey(values, 'isolatedpvlan')) {
params.isolatedpvlan = values.isolatedpvlan
}
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.

Not sure if this really needs to go inside isolatedpvlantype if block. Anyway we are not showing isolatedpvlan field for none type

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.

so we're verifying it only if the pvlan type is not none

@yadvr
Copy link
Copy Markdown
Member

yadvr commented Jun 18, 2020

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

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

@blueorangutan
Copy link
Copy Markdown

Packaging result: ✔️centos ✔️debian ✔️archive.
QA: http://primate-qa.cloudstack.cloud:8080/client/pr/373 (JID-2040)

@davidjumani
Copy link
Copy Markdown
Contributor Author

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

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

@blueorangutan
Copy link
Copy Markdown

Packaging result: ✔️centos ✔️debian ✔️archive.
QA: http://primate-qa.cloudstack.cloud:8080/client/pr/373 (JID-2050)

@davidjumani
Copy link
Copy Markdown
Contributor Author

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

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

@blueorangutan
Copy link
Copy Markdown

Packaging result: ✔️centos ✔️debian ✔️archive.
QA: http://primate-qa.cloudstack.cloud:8080/client/pr/373 (JID-2052)

@davidjumani
Copy link
Copy Markdown
Contributor Author

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

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

@blueorangutan
Copy link
Copy Markdown

Packaging result: ✔️centos ✔️debian ✔️archive.
QA: http://primate-qa.cloudstack.cloud:8080/client/pr/373 (JID-2053)

@yadvr yadvr added feature New Feature and removed feature New Feature labels Jun 20, 2020
Copy link
Copy Markdown

@borisstoyanov borisstoyanov left a comment

Choose a reason for hiding this comment

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

LGTM

@yadvr
Copy link
Copy Markdown
Member

yadvr commented Jun 23, 2020

@blueorangutan package

@yadvr
Copy link
Copy Markdown
Member

yadvr commented Jun 23, 2020

@davidjumani can you check and fix label on L2 form? (label.promiscuous)

@davidjumani
Copy link
Copy Markdown
Contributor Author

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

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

@blueorangutan
Copy link
Copy Markdown

Packaging result: ✔️centos ✔️debian ✔️archive.
QA: http://primate-qa.cloudstack.cloud:8080/client/pr/373 (JID-2087)

@yadvr
Copy link
Copy Markdown
Member

yadvr commented Jun 24, 2020

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

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

@blueorangutan
Copy link
Copy Markdown

Packaging result: ✔️centos ✔️debian ✔️archive.
QA: http://primate-qa.cloudstack.cloud:8080/client/pr/373 (JID-2106)

networkOfferingLoading: false,
selectedNetworkOffering: {},
accountVisible: this.isAdminOrDomainAdmin()
accountVisible: this.isAdminOrDomainAdmin(),
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@davidjumani did you check against legacy UI if we should show pvlan options to domain admins?

Copy link
Copy Markdown
Member

@yadvr yadvr 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 and compared legacy UI form with this as root admin, domain admin and user

@yadvr yadvr merged commit dbcd5e8 into apache:master Jun 24, 2020
weizhouapache pushed a commit that referenced this pull request Jan 19, 2021
…lan type (#373)

This adds the option to create PVLAN for L2 networks, as well as fixes the issue caused by passing 'none' as the PVLAN type when no secondary VLAN type is selected.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

feature New Feature

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants