Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Refactor userVmDetailsDao field and remove unusued fields#2750

Merged
rafaelweingartner merged 2 commits intoapache:masterapache/cloudstack:masterfrom
shapeblue:removeDuplicatedFieldshapeblue/cloudstack:removeDuplicatedFieldCopy head branch name to clipboard
Jul 19, 2018
Merged

Refactor userVmDetailsDao field and remove unusued fields#2750
rafaelweingartner merged 2 commits intoapache:masterapache/cloudstack:masterfrom
shapeblue:removeDuplicatedFieldshapeblue/cloudstack:removeDuplicatedFieldCopy head branch name to clipboard

Conversation

@dhlaluku
Copy link
Contributor

@dhlaluku dhlaluku commented Jul 18, 2018

Description

This PR refactors a duplicated field vmDetailsDao and _uservmDetailsDao into userVmDetailsDao.
vmDetailsDao, uservmDetailsDao --> userVmDetailsDao

It also removes several unused injected vars as well i.e.;
_domainDao, rulesMgr, _vguTypesDao, _configDepot

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)

GitHub Issue/PRs

Screenshots (if appropriate):

How Has This Been Tested?

I have recompiled CloudStack in my local environment and ran the virtual machine related Marvin smoke tests.

Checklist:

  • I have read the CONTRIBUTING document.
  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
    Testing
  • I have added tests to cover my changes.
  • All relevant new and existing integration tests have passed.
  • A full integration testsuite with all test that can run on my environment has passed.

@borisstoyanov
Copy link
Contributor

borisstoyanov commented Jul 18, 2018

@blueorangutan package

@blueorangutan
Copy link

blueorangutan commented Jul 18, 2018

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

@dhlaluku
Copy link
Contributor Author

dhlaluku commented Jul 18, 2018

@DaanHoogland @rafaelweingartner @resmo @marcaurele I am new to this community and I would like to ask for your assistance with reviewing of this PR.

@blueorangutan
Copy link

blueorangutan commented Jul 18, 2018

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

@dhlaluku
Copy link
Contributor Author

dhlaluku commented Jul 18, 2018

@blueorangutan package

@blueorangutan
Copy link

blueorangutan commented Jul 18, 2018

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

@blueorangutan
Copy link

blueorangutan commented Jul 18, 2018

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

@dhlaluku
Copy link
Contributor Author

dhlaluku commented Jul 18, 2018

@blueorangutan test

@blueorangutan
Copy link

blueorangutan commented Jul 18, 2018

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

@rafaelweingartner rafaelweingartner self-assigned this Jul 18, 2018
@rafaelweingartner rafaelweingartner added this to the 4.12.0.0 milestone Jul 18, 2018
@rafaelweingartner rafaelweingartner removed their assignment Jul 18, 2018
rafaelweingartner
rafaelweingartner approved these changes Jul 18, 2018
View reviewed changes
Copy link
Member

@rafaelweingartner rafaelweingartner left a comment

Choose a reason for hiding this comment

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

Thanks for the cleanup! Can you please do a force push to trigger Jenkins again?

Also, can you check if we need all of those protected attributes? Then, if they can be set to private, please do so.

@dhlaluku
Copy link
Contributor Author

dhlaluku commented Jul 18, 2018

@rafaelweingartner checked the attributes, it seems like they can be set to private. I will modify them and do some tests before pushing again

@dhlaluku
Copy link
Contributor Author

dhlaluku commented Jul 18, 2018

@blueorangutan package

@blueorangutan
Copy link

blueorangutan commented Jul 18, 2018

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

@dhlaluku dhlaluku force-pushed the removeDuplicatedField branch from b25de51 to d90042f Compare July 18, 2018 17:48
@blueorangutan
Copy link

blueorangutan commented Jul 18, 2018

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

@blueorangutan
Copy link

blueorangutan commented Jul 18, 2018

Trillian test result (tid-2859)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 27365 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2750-t2859-kvm-centos7.zip
Intermitten failure detected: /marvin/tests/smoke/test_certauthority_root.py
Intermitten failure detected: /marvin/tests/smoke/test_deploy_virtio_scsi_vm.py
Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermitten failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Intermitten failure detected: /marvin/tests/smoke/test_volumes.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Intermitten failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 62 look OK, 6 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
test_provision_certificate Error 5.21 test_certauthority_root.py
ContextSuite context=TestDeployVirtioSCSIVM>:setup Error 0.00 test_deploy_virtio_scsi_vm.py
test_03_vpc_privategw_restart_vpc_cleanup Failure 1131.88 test_privategw_acl.py
test_01_secure_vm_migration Error 3.15 test_vm_life_cycle.py
test_02_unsecure_vm_migration Error 2.14 test_vm_life_cycle.py
test_03_secured_to_nonsecured_vm_migration Error 1.11 test_vm_life_cycle.py
test_04_nonsecured_to_secured_vm_migration Error 1.11 test_vm_life_cycle.py
test_11_migrate_volume_and_change_offering Error 128.34 test_volumes.py
test_hostha_enable_ha_when_host_in_maintenance Error 3.63 test_hostha_kvm.py

@dhlaluku
Copy link
Contributor Author

dhlaluku commented Jul 19, 2018

@blueorangutan test

@blueorangutan
Copy link

blueorangutan commented Jul 19, 2018

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

borisstoyanov
borisstoyanov approved these changes Jul 19, 2018
View reviewed changes
Copy link
Contributor

@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, I think the test failures are present in master as well, will have to address them in a separate PR

@rafaelweingartner rafaelweingartner merged commit 94dedd6 into apache:master Jul 19, 2018
@blueorangutan
Copy link

blueorangutan commented Jul 19, 2018

Trillian test result (tid-2860)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 25249 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2750-t2860-kvm-centos7.zip
Intermitten failure detected: /marvin/tests/smoke/test_certauthority_root.py
Intermitten failure detected: /marvin/tests/smoke/test_deploy_virtio_scsi_vm.py
Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermitten failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Intermitten failure detected: /marvin/tests/smoke/test_volumes.py
Smoke tests completed. 63 look OK, 5 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
test_provision_certificate Error 5.16 test_certauthority_root.py
ContextSuite context=TestDeployVirtioSCSIVM>:setup Error 0.00 test_deploy_virtio_scsi_vm.py
test_03_vpc_privategw_restart_vpc_cleanup Failure 1121.41 test_privategw_acl.py
test_01_secure_vm_migration Error 4.14 test_vm_life_cycle.py
test_02_unsecure_vm_migration Error 1.10 test_vm_life_cycle.py
test_03_secured_to_nonsecured_vm_migration Error 1.08 test_vm_life_cycle.py
test_04_nonsecured_to_secured_vm_migration Error 1.07 test_vm_life_cycle.py
test_11_migrate_volume_and_change_offering Error 127.90 test_volumes.py

@dhlaluku dhlaluku deleted the removeDuplicatedField branch July 19, 2018 13:08
borisstoyanov pushed a commit to shapeblue/cloudstack that referenced this pull request Jul 23, 2018
@borisstoyanov
Refactor userVmDetailsDao field and remove unusued fields (apache#2750)
7a81e83 
* Refactor userVmDetailsDao field and remove unusued fields

* Setting injected attributes to private instead of protected and amending unit test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@marcaurele marcaurele marcaurele approved these changes

@rafaelweingartner rafaelweingartner rafaelweingartner approved these changes

@borisstoyanov borisstoyanov borisstoyanov approved these changes

Assignees

@dhlaluku dhlaluku

Labels

type:cleanup

Projects

None yet

Milestone

4.12.0.0

Development

Successfully merging this pull request may close these issues.

5 participants

@dhlaluku @borisstoyanov @blueorangutan @marcaurele @rafaelweingartner
Morty Proxy This is a proxified and sanitized view of the page, visit original site.