Refactoring to remove duplicate code (by Frank/Nuage) by yadvr · Pull Request #3538 · apache/cloudstack

yadvr · 2019-08-02T07:37:34Z

The #3537 would revert the merged PR #3152 as we're close to 4.13 RC1 and have low confidence on what other regressions it might add. This simply re-creates PR #3152 using the same source fork/branch. We can work on this PR and attempt again to merge towards 4.14 after fixing discovered regressions and a more thorough review and testing.

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)

yadvr · 2019-08-02T07:40:32Z

@fmaximus please see #3537, we'll need to revert your PR #3152 for this purpose I've reopened your PR from the original branch. Kindly help test and fix regressions discovered in your branch, esp around registration and upload of archived templates and iso (templates/isos that are extractable like *.bz2, *gz etc).

yadvr · 2019-08-07T10:24:40Z

@blueorangutan package

blueorangutan · 2019-08-07T10:25:18Z

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

blueorangutan · 2019-08-07T11:30:28Z

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

yadvr · 2019-09-10T16:31:55Z

@blueorangutan package

yadvr · 2019-09-10T16:32:40Z

@fmaximus thanks for self assigning, can you help fix the conflict? I'll try and help you to get this merge now that master is not frozen anymore.

Make use of Java 8 default implementation in interfaces, to remove code duplication between XxxCmd and XxxCmdAsAdmin.

Refactor checkFormat by pre-calculating the supported extensions. Also make use of this in ImageStoreUtil. Makes it easier to add new file and compression formats.

fmaximus · 2019-09-13T22:48:59Z

@rhtyd Conflict is resolved.
Jenkins build has failed due to some build node issues:
FATAL: Couldn't find any executable in /home/jenkins/tools/maven/apache-maven-3.3.3

yadvr · 2019-09-13T23:01:09Z

Thanks @fmaximus I'll kick a build
@blueorangutan package

blueorangutan · 2019-09-13T23:02:10Z

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

blueorangutan · 2019-09-13T23:43:09Z

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

yadvr · 2019-09-13T23:45:52Z

@blueorangutan test matrix

blueorangutan · 2019-09-13T23:46:10Z

@rhtyd a Trillian-Jenkins matrix job (centos6 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

yadvr · 2019-09-19T04:36:37Z

(el6 failure expected)
@blueorangutan package

blueorangutan · 2019-09-19T04:37:34Z

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

blueorangutan · 2019-09-19T05:03:18Z

Packaging result: ✖centos6 ✔centos7 ✔debian. JID-283

yadvr · 2019-09-19T05:09:31Z

@blueorangutan test matrix

blueorangutan · 2019-09-19T05:10:34Z

@rhtyd a Trillian-Jenkins matrix job (centos7 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

blueorangutan · 2019-09-19T15:06:56Z

Trillian test result (tid-373)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 32648 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3538-t373-xenserver-71.zip
Intermittent failure detected: /marvin/tests/smoke/test_scale_vm.py
Smoke tests completed. 76 look OK, 1 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_01_scale_vm	`Failure`	20.86	test_scale_vm.py

blueorangutan · 2019-09-19T18:22:42Z

Trillian test result (tid-375)
Environment: vmware-65u2 (x2), Advanced Networking with Mgmt server 7
Total time taken: 44053 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3538-t375-vmware-65u2.zip
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Smoke tests completed. 76 look OK, 1 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_05_rvpc_multi_tiers	`Failure`	553.46	test_vpc_redundant.py
test_05_rvpc_multi_tiers	`Error`	595.79	test_vpc_redundant.py

svenvogel · 2019-09-20T11:19:53Z

@fmaximus @rhtyd does this also remove this global settings?

fmaximus · 2019-09-23T17:58:11Z

@svenvogel No, that's not part of it. This was a change I had been working on,
which I still wanted to offer the community.

svenvogel · 2019-09-23T19:22:42Z

@fmaximus thanks for answer. will this removed from you in a seperated PR or should the community track this?

fmaximus · 2019-09-23T20:43:35Z

@svenvogel That should go in a separate PR for sure, as it's a bugfix which should be fixed in the same release as Remove Nuage Plugin.

yadvr · 2019-09-24T07:03:36Z

CentOS7 job failed, rekicking
@blueorangutan test

blueorangutan · 2019-09-24T07:03:57Z

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

blueorangutan · 2019-09-24T16:32:50Z

Trillian test result (tid-377)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 32381 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3538-t377-kvm-centos7.zip
Smoke tests completed. 77 look OK, 0 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File

yadvr · 2019-09-25T04:51:15Z

LGTM, tests LGTM as well. Using lgtms from the original PR, merging this.

Refactor: Cleanup duplicate code Make use of Java 8 default implementation in interfaces, to remove code duplication between XxxCmd and XxxCmdAsAdmin. Refactor checkFormat by pre-calculating the supported extensions. Also make use of this in ImageStoreUtil. Makes it easier to add new file and compression formats.

yadvr changed the title ~~Refactoring to remove duplicate code~~ Refactoring to remove duplicate code (by Frank/Nuage) Aug 2, 2019

yadvr mentioned this pull request Aug 2, 2019

Refactoring to remove duplicate code. #3152

Merged

5 tasks

yadvr added this to the 4.14.0.0 milestone Aug 2, 2019

svenvogel added component:advanced-networking type:cleanup component:networking and removed component:advanced-networking labels Aug 6, 2019

fmaximus self-assigned this Aug 25, 2019

fmaximus and others added 3 commits September 13, 2019 13:23

Refactor: Cleanup duplicate code

fd964fa

Make use of Java 8 default implementation in interfaces, to remove code duplication between XxxCmd and XxxCmdAsAdmin.

Refactor: Cleanup duplicate code

17708ba

Refactor checkFormat by pre-calculating the supported extensions. Also make use of this in ImageStoreUtil. Makes it easier to add new file and compression formats.

Fix regression in refactoring.

94d9858

fmaximus force-pushed the feature/cleanup_cpd branch from 713b804 to 94d9858 Compare September 13, 2019 11:24

yadvr merged commit 7f91964 into apache:master Sep 25, 2019

fmaximus deleted the feature/cleanup_cpd branch September 25, 2019 13:29

Conversation

yadvr commented Aug 2, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Types of changes

Uh oh!

yadvr commented Aug 2, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

yadvr commented Aug 7, 2019

Uh oh!

blueorangutan commented Aug 7, 2019

Uh oh!

blueorangutan commented Aug 7, 2019

Uh oh!

yadvr commented Sep 10, 2019

Uh oh!

yadvr commented Sep 10, 2019

Uh oh!

fmaximus commented Sep 13, 2019

Uh oh!

yadvr commented Sep 13, 2019

Uh oh!

blueorangutan commented Sep 13, 2019

Uh oh!

blueorangutan commented Sep 13, 2019

Uh oh!

yadvr commented Sep 13, 2019

Uh oh!

blueorangutan commented Sep 13, 2019

Uh oh!

yadvr commented Sep 19, 2019

Uh oh!

blueorangutan commented Sep 19, 2019

Uh oh!

blueorangutan commented Sep 19, 2019

Uh oh!

yadvr commented Sep 19, 2019

Uh oh!

blueorangutan commented Sep 19, 2019

Uh oh!

blueorangutan commented Sep 19, 2019

Uh oh!

blueorangutan commented Sep 19, 2019

Uh oh!

svenvogel commented Sep 20, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fmaximus commented Sep 23, 2019

Uh oh!

svenvogel commented Sep 23, 2019

Uh oh!

fmaximus commented Sep 23, 2019

Uh oh!

yadvr commented Sep 24, 2019

Uh oh!

blueorangutan commented Sep 24, 2019

Uh oh!

blueorangutan commented Sep 24, 2019

Uh oh!

yadvr commented Sep 25, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

yadvr commented Aug 2, 2019 •

edited

Loading

yadvr commented Aug 2, 2019 •

edited

Loading

svenvogel commented Sep 20, 2019 •

edited

Loading