[GitHub] cloudstack issue #1579: CLOUDSTACK-9403 : Support for shared networks in Nua...
Github user rhtyd commented on the issue: https://github.com/apache/cloudstack/pull/1579 @blueorangutan test matrix --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1579: CLOUDSTACK-9403 : Support for shared networks in Nua...
Github user blueorangutan commented on the issue: https://github.com/apache/cloudstack/pull/1579 @rhtyd a Trillian-Jenkins matrix job (centos6 mgmt + xs65sp1, centos7 mgmt + vmware55u3, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1754: [4.10] Latest health test run
Github user blueorangutan commented on the issue: https://github.com/apache/cloudstack/pull/1754 Trillian test result (tid-503) Environment: vmware-55u3 (x2), Advanced Networking with Mgmt server 7 Total time taken: 39084 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr1754-t503-vmware-55u3.zip Test completed. 43 look ok, 6 have error(s) Test | Result | Time (s) | Test File --- | --- | --- | --- test_01_redundant_vpc_site2site_vpn | `Failure` | 241.73 | test_vpc_vpn.py test_router_dhcp_opts | `Failure` | 21.19 | test_router_dhcphosts.py test_01_vpc_site2site_vpn | `Error` | 517.02 | test_vpc_vpn.py test_01_VPC_nics_after_destroy | `Error` | 112.70 | test_vpc_router_nics.py test_05_rvpc_multi_tiers | `Error` | 107.49 | test_vpc_redundant.py ContextSuite context=TestSnapshotRootDisk>:setup | `Error` | 0.00 | test_snapshots.py test_09_reboot_router | `Error` | 156.09 | test_routers.py test_01_vpc_remote_access_vpn | Success | 171.72 | test_vpc_vpn.py test_02_VPC_default_routes | Success | 440.94 | test_vpc_router_nics.py test_04_rvpc_network_garbage_collector_nics | Success | 1550.21 | test_vpc_redundant.py test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers | Success | 765.38 | test_vpc_redundant.py test_02_redundant_VPC_default_routes | Success | 791.87 | test_vpc_redundant.py test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL | Success | 1382.68 | test_vpc_redundant.py test_09_delete_detached_volume | Success | 30.95 | test_volumes.py test_06_download_detached_volume | Success | 121.04 | test_volumes.py test_05_detach_volume | Success | 105.33 | test_volumes.py test_04_delete_attached_volume | Success | 15.23 | test_volumes.py test_03_download_attached_volume | Success | 15.47 | test_volumes.py test_02_attach_volume | Success | 58.82 | test_volumes.py test_01_create_volume | Success | 527.00 | test_volumes.py test_03_delete_vm_snapshots | Success | 275.22 | test_vm_snapshots.py test_02_revert_vm_snapshots | Success | 232.21 | test_vm_snapshots.py test_01_test_vm_volume_snapshot | Success | 146.29 | test_vm_snapshots.py test_01_create_vm_snapshots | Success | 161.66 | test_vm_snapshots.py test_deploy_vm_multiple | Success | 319.28 | test_vm_life_cycle.py test_deploy_vm | Success | 0.03 | test_vm_life_cycle.py test_advZoneVirtualRouter | Success | 0.02 | test_vm_life_cycle.py test_10_attachAndDetach_iso | Success | 26.89 | test_vm_life_cycle.py test_09_expunge_vm | Success | 125.24 | test_vm_life_cycle.py test_08_migrate_vm | Success | 81.40 | test_vm_life_cycle.py test_07_restore_vm | Success | 0.10 | test_vm_life_cycle.py test_06_destroy_vm | Success | 10.15 | test_vm_life_cycle.py test_03_reboot_vm | Success | 5.17 | test_vm_life_cycle.py test_02_start_vm | Success | 20.23 | test_vm_life_cycle.py test_01_stop_vm | Success | 10.15 | test_vm_life_cycle.py test_CreateTemplateWithDuplicateName | Success | 256.75 | test_templates.py test_08_list_system_templates | Success | 0.03 | test_templates.py test_07_list_public_templates | Success | 0.04 | test_templates.py test_05_template_permissions | Success | 0.06 | test_templates.py test_04_extract_template | Success | 15.66 | test_templates.py test_03_delete_template | Success | 5.10 | test_templates.py test_02_edit_template | Success | 90.10 | test_templates.py test_01_create_template | Success | 121.23 | test_templates.py test_10_destroy_cpvm | Success | 241.88 | test_ssvm.py test_09_destroy_ssvm | Success | 239.42 | test_ssvm.py test_08_reboot_cpvm | Success | 156.62 | test_ssvm.py test_07_reboot_ssvm | Success | 188.63 | test_ssvm.py test_06_stop_cpvm | Success | 207.14 | test_ssvm.py test_05_stop_ssvm | Success | 214.00 | test_ssvm.py test_04_cpvm_internals | Success | 1.35 | test_ssvm.py test_03_ssvm_internals | Success | 4.33 | test_ssvm.py test_02_list_cpvm_vm | Success | 0.14 | test_ssvm.py test_01_list_sec_storage_vm | Success | 0.15 | test_ssvm.py test_04_change_offering_small | Success | 126.94 | test_service_offerings.py test_03_delete_service_offering | Success | 0.04 | test_service_offerings.py test_02_edit_service_offering | Success | 0.06 | test_service_offerings.py test_01_create_service_offering | Success | 0.11 | test_service_offerings.py test_02_sys_template_ready | Success | 0.14 | test_secondary_storage.py test_01_sys_vm_start | Success | 0.20 | test_secondary_storage.py test_08_start_router | Success | 156.09 | test_routers.py test_07_stop_router | Success | 25.25 | test_routers.py test_06_router_advanced | Success | 0.06 | test_routers.py test_05_router_basic | Success | 0.04 | test_routers.py test_04_restart_network_wo_cleanup | Success | 5.68 | test_routers.py test_03_r
Back to the list
Hi there, I have been away for a while, but would like to let you now that I will try to follow a a bit more closely the development around CloudStack. :) After I left Schuberg Philis I forgot to change my email address on the dev-list. It means that I might have missed some messages. Sorry for that. See you around. Cheers, Wilder
Re: Back to the list
Welcome back Wilder! I am also back as I manged to have a decent filtering of all the github mails :) René On 11/30/2016 09:58 AM, Wilder Rodrigues wrote: > Hi there, > > I have been away for a while, but would like to let you now that I will try > to follow a a bit more closely the development around CloudStack. :) > > After I left Schuberg Philis I forgot to change my email address on the > dev-list. It means that I might have missed some messages. Sorry for that. > > See you around. > > Cheers, > Wilder >
[GitHub] cloudstack pull request #1799: CLOUDSTACK-9632: Upgrade bouncy castle to ver...
GitHub user rhtyd opened a pull request: https://github.com/apache/cloudstack/pull/1799 CLOUDSTACK-9632: Upgrade bouncy castle to version 1.55 - Upgrades Maven dependency version to v1.55 - Fixes bountycastle usages and issues - Adds timeout to jetty/annotation scanning - Picks up PR #1510 by Daan You can merge this pull request into a Git repository by running: $ git pull https://github.com/shapeblue/cloudstack bcprov-upgrade Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cloudstack/pull/1799.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1799 commit 3346def2fb9302499a63a3d5290ce70df3b435ab Author: Rohit Yadav Date: 2016-11-30T09:31:28Z CLOUDSTACK-9632: Upgrade bouncy castle to version 1.55 - Upgrades Maven dependency version to v1.55 - Fixes bountycastle usages and issues - Adds timeout to jetty/annotation scanning - Picks up PR #1510 by Daan Signed-off-by: Rohit Yadav --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
Re: Back to the list
Welcome back Wilder ! 2016-11-30 9:58 GMT+01:00 Wilder Rodrigues : > Hi there, > > I have been away for a while, but would like to let you now that I will try > to follow a a bit more closely the development around CloudStack. :) > > After I left Schuberg Philis I forgot to change my email address on the > dev-list. It means that I might have missed some messages. Sorry for that. > > See you around. > > Cheers, > Wilder >
[GitHub] cloudstack pull request #1800: CLOUDSTACK-9633:test_snapshot is failing due ...
GitHub user borisstoyanov opened a pull request: https://github.com/apache/cloudstack/pull/1800 CLOUDSTACK-9633:test_snapshot is failing due to incorrect string cons⦠â¦truction in utils.py You can merge this pull request into a Git repository by running: $ git pull https://github.com/shapeblue/cloudstack 4.8-marvin-fix-for-snapshots-xenserver Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cloudstack/pull/1800.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1800 commit dfae673e7fae02ccb9d3b8a5d7d0fb202f4d6d1d Author: Boris Date: 2016-11-30T09:38:12Z CLOUDSTACK-9633:test_snapshot is failing due to incorrect string construction in utils.py --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
Ansible 2.2: CloudStack Modules News
Hi List As I know there are a few Ansible users here using the CloudStack modules, let me give you an update: New Modules in 2.2 - cs_router - cs_snapshot_policy In the upcoming 2.2.1, the modules also work with python3. Roadmap for 2.3 === New modules planned --- - cs_host - cs_vpc (done) - cs_nic (done) - cs_serviceoffer (currently WIP https://github.com/ansible/ansible-modules-extras/pull/3396, testing and feedback would be welcome!) - and more Diff Support: - In 2.3 if you set --diff you will get a line diff of the things changed for many of the cloudstack modules. This will also work for --check mode. VPC Support --- I am about to extend VPC support in the modules and working on new modules related to VPC. Integration Testing --- I am working on fully automated integration tests for ansbile cloudstack modules PRs against a dockerized simulator. ENV VAR Support --- I already implemented a way to set ENV variables for domain, account, project, zone and vpc in 2.3. It allows to DRY With help of ansible block feature. See more info in the cloudstack guide docs http://docs.ansible.com/ansible/guide_cloudstack.html#environment-variables Support --- A good tooling is essential for CloudStack. Ansible is one of the most used cfg management tools around. Thanks for all the support I received in 2016 https://renemoser.net/blog/2015/11/26/crowdfunding-ansible-cloudstack-modules/. I still need your support in 2017 to continuing my work. I don't have a commercial use of these modules and develop them in my free time (1 day per week). If you use them and/or like my work, a small donation would be much appreciated. Please contact me off list for details. Thanks René
[GitHub] cloudstack issue #1638: CLOUDSTACK-9456: Migrate master to Spring 4.x
Github user rhtyd commented on the issue: https://github.com/apache/cloudstack/pull/1638 @blueorangutan package --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1638: CLOUDSTACK-9456: Migrate master to Spring 4.x
Github user blueorangutan commented on the issue: https://github.com/apache/cloudstack/pull/1638 @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
Re: Back to the list
I might need that filter, Rene! :D Cheers, Wilder On 30 November 2016 at 10:34, Wei ZHOU wrote: > Welcome back Wilder ! > > 2016-11-30 9:58 GMT+01:00 Wilder Rodrigues : > > > Hi there, > > > > I have been away for a while, but would like to let you now that I will > try > > to follow a a bit more closely the development around CloudStack. :) > > > > After I left Schuberg Philis I forgot to change my email address on the > > dev-list. It means that I might have missed some messages. Sorry for > that. > > > > See you around. > > > > Cheers, > > Wilder > > >
[GitHub] cloudstack issue #1320: CLOUDSTACK-8968: UI icon over VM snapshot to deploy ...
Github user nitin-maharana commented on the issue: https://github.com/apache/cloudstack/pull/1320 Hi @rhtyd, I observed there is a change in the way we were maintaining the dictionary. The messages*.properties and dictioanry*.jsp file was removed and the content was moved to the l10n folder. How the change in l10n files reflect in the browser. Do we need to modify any other file to reflect the change? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack pull request #1801: fix marvin test failure test_router_dhcp_opts
GitHub user murali-reddy opened a pull request: https://github.com/apache/cloudstack/pull/1801 fix marvin test failure test_router_dhcp_opts marvin, VirtualMachine objects are not in any particualr order in the array. so check isdefault attribute to the get non-default nic earlier test made assumption that nic[0] is default nic, which is not true always You can merge this pull request into a Git repository by running: $ git pull https://github.com/murali-reddy/cloudstack test_router_dhcp_opts Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cloudstack/pull/1801.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1801 commit e3912820deeda54942af797dc89bf0dc5e1f53fe Author: Murali Reddy Date: 2016-11-30T10:49:38Z fix test failure test_router_dhcp_opts marvin, VirtualMachine objects are not in any particualr order in the array. so check isdefault attribute the get non-default nic --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1638: CLOUDSTACK-9456: Migrate master to Spring 4.x
Github user blueorangutan commented on the issue: https://github.com/apache/cloudstack/pull/1638 Packaging result: âcentos6 âcentos7 âdebian. JID-285 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
Re: Back to the list
LOL On 11/30/2016 11:46 AM, Wilder Rodrigues wrote: > I might need that filter, Rene! :D As I run my own mail server and read my mails on mobile devices, I put the filter on my mail server with a header check (postfix). This might not work for you :) /^Subject: \[GitHub\] cloudstack .*/DISCARD GitHub CloudStack flood
[GitHub] cloudstack issue #1800: CLOUDSTACK-9633:test_snapshot is failing due to inco...
Github user borisstoyanov commented on the issue: https://github.com/apache/cloudstack/pull/1800 @blueorangutan package --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1800: CLOUDSTACK-9633:test_snapshot is failing due to inco...
Github user blueorangutan commented on the issue: https://github.com/apache/cloudstack/pull/1800 @borisstoyanov a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1800: CLOUDSTACK-9633:test_snapshot is failing due to inco...
Github user rhtyd commented on the issue: https://github.com/apache/cloudstack/pull/1800 LGTM. @blueorangutan package --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1638: CLOUDSTACK-9456: Migrate master to Spring 4.x
Github user blueorangutan commented on the issue: https://github.com/apache/cloudstack/pull/1638 @rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1638: CLOUDSTACK-9456: Migrate master to Spring 4.x
Github user rhtyd commented on the issue: https://github.com/apache/cloudstack/pull/1638 @blueorangutan test --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1800: CLOUDSTACK-9633:test_snapshot is failing due to inco...
Github user blueorangutan commented on the issue: https://github.com/apache/cloudstack/pull/1800 @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1801: fix marvin test failure test_router_dhcp_opts
Github user borisstoyanov commented on the issue: https://github.com/apache/cloudstack/pull/1801 @blueorangutan package --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1801: fix marvin test failure test_router_dhcp_opts
Github user rhtyd commented on the issue: https://github.com/apache/cloudstack/pull/1801 @murali-reddy can you use a JIRA id in the git commit? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1801: fix marvin test failure test_router_dhcp_opts
Github user blueorangutan commented on the issue: https://github.com/apache/cloudstack/pull/1801 @borisstoyanov a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1801: fix marvin test failure test_router_dhcp_opts
Github user borisstoyanov commented on the issue: https://github.com/apache/cloudstack/pull/1801 I've kicked packaging and will test matrix this pr, LTGM on code review. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack pull request #1511: [master] bountycastle changes
Github user rhtyd closed the pull request at: https://github.com/apache/cloudstack/pull/1511 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1511: [master] bountycastle changes
Github user rhtyd commented on the issue: https://github.com/apache/cloudstack/pull/1511 I'll close this PR in favour of PR #1799 @jburwell I'll fixed the issues you've reviewed in #1799 thanks --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
Re: Back to the list
Hi Wilder, Good to hear from you, welcome back! You may also want to change your @apache.org email fwd-ing to your email, change it through https://id.apache.org. Regards. From: Wilder Rodrigues Sent: 30 November 2016 14:28:12 To: dev@cloudstack.apache.org Subject: Back to the list Hi there, I have been away for a while, but would like to let you now that I will try to follow a a bit more closely the development around CloudStack. :) After I left Schuberg Philis I forgot to change my email address on the dev-list. It means that I might have missed some messages. Sorry for that. See you around. Cheers, Wilder rohit.ya...@shapeblue.com www.shapeblue.com 53 Chandos Place, Covent Garden, London WC2N 4HSUK @shapeblue
Re: Ansible 2.2: CloudStack Modules News
Thanks Rene, and for your work. Trillian [1] is certainly powered by your work. [1] https://github.com/shapeblue/Trillian Regards. From: Rene Moser Sent: 30 November 2016 15:41:57 To: dev@cloudstack.apache.org; us...@cloudstack.apache.org Subject: Ansible 2.2: CloudStack Modules News Hi List As I know there are a few Ansible users here using the CloudStack modules, let me give you an update: New Modules in 2.2 - cs_router - cs_snapshot_policy In the upcoming 2.2.1, the modules also work with python3. Roadmap for 2.3 === New modules planned --- - cs_host - cs_vpc (done) - cs_nic (done) - cs_serviceoffer (currently WIP https://github.com/ansible/ansible-modules-extras/pull/3396, testing and feedback would be welcome!) - and more Diff Support: - In 2.3 if you set --diff you will get a line diff of the things changed for many of the cloudstack modules. This will also work for --check mode. VPC Support --- I am about to extend VPC support in the modules and working on new modules related to VPC. Integration Testing --- I am working on fully automated integration tests for ansbile cloudstack modules PRs against a dockerized simulator. ENV VAR Support --- I already implemented a way to set ENV variables for domain, account, project, zone and vpc in 2.3. It allows to DRY With help of ansible block feature. See more info in the cloudstack guide docs http://docs.ansible.com/ansible/guide_cloudstack.html#environment-variables Support --- A good tooling is essential for CloudStack. Ansible is one of the most used cfg management tools around. Thanks for all the support I received in 2016 https://renemoser.net/blog/2015/11/26/crowdfunding-ansible-cloudstack-modules/. I still need your support in 2017 to continuing my work. I don't have a commercial use of these modules and develop them in my free time (1 day per week). If you use them and/or like my work, a small donation would be much appreciated. Please contact me off list for details. Thanks René rohit.ya...@shapeblue.com www.shapeblue.com 53 Chandos Place, Covent Garden, London WC2N 4HSUK @shapeblue
[GitHub] cloudstack issue #1762: CLOUDSTACK-9595 Transactions are not getting retried...
Github user rafaelweingartner commented on the issue: https://github.com/apache/cloudstack/pull/1762 @serg38 I have the same understanding about the agent LB. And this is one of the problems I think we have found here. It seems that this method is removing the balance created with agent LB. And, of course, this method is also causing deadlocks. Letâs hear the feedback from others and discuss what we can do forward. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
Re: Back to the list
Thanks, Rohit! I already had 2 forwarding rules, but anyway it's nice to remove the non-existing email from one of them. :) Cheers, Wilder On 30 November 2016 at 12:32, Rohit Yadav wrote: > Hi Wilder, > > > Good to hear from you, welcome back! You may also want to change your @ > apache.org email fwd-ing to your email, change it through > https://id.apache.org. > > > Regards. > > > From: Wilder Rodrigues > Sent: 30 November 2016 14:28:12 > To: dev@cloudstack.apache.org > Subject: Back to the list > > Hi there, > > I have been away for a while, but would like to let you now that I will try > to follow a a bit more closely the development around CloudStack. :) > > After I left Schuberg Philis I forgot to change my email address on the > dev-list. It means that I might have missed some messages. Sorry for that. > > See you around. > > Cheers, > Wilder > > rohit.ya...@shapeblue.com > www.shapeblue.com > 53 Chandos Place, Covent Garden, London WC2N 4HSUK > @shapeblue > > > >
[GitHub] cloudstack issue #1320: CLOUDSTACK-8968: UI icon over VM snapshot to deploy ...
Github user rhtyd commented on the issue: https://github.com/apache/cloudstack/pull/1320 @nitin-maharana yes, the master branch is JSP free now. The UI is purely JS/html/css based. Yes, you'll need to add new keys only to the l10n (localisation) specific files and use them in the UI/JS code. This also fixes the issue of adding the same set of keys to messages.properties file and then the dictionary/jsp files. The workflow is much easier now. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1799: CLOUDSTACK-9632: Upgrade bouncy castle to version 1....
Github user rhtyd commented on the issue: https://github.com/apache/cloudstack/pull/1799 @blueorangutan package --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1799: CLOUDSTACK-9632: Upgrade bouncy castle to version 1....
Github user blueorangutan commented on the issue: https://github.com/apache/cloudstack/pull/1799 @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1579: CLOUDSTACK-9403 : Support for shared networks in Nua...
Github user rhtyd commented on the issue: https://github.com/apache/cloudstack/pull/1579 @prashanthvarma @fmaximus @nlivens thanks, I've kicked some tests. I'll be willing to merge the PR once they pass and we've no outstanding review items. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1800: CLOUDSTACK-9633:test_snapshot is failing due to inco...
Github user blueorangutan commented on the issue: https://github.com/apache/cloudstack/pull/1800 Packaging result: âcentos6 âcentos7 âdebian. JID-286 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack pull request #1579: CLOUDSTACK-9403 : Support for shared networks...
Github user rhtyd commented on a diff in the pull request: https://github.com/apache/cloudstack/pull/1579#discussion_r90220410 --- Diff: client/pom.xml --- @@ -168,6 +168,11 @@ org.apache.cloudstack + cloud-plugin-network-vsp --- End diff -- Are nuage specific dependencies Apache 2.0 license compliant and available on maven? Only then, I would be in a favour of moving the plugin to the default build profile. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack pull request #1579: CLOUDSTACK-9403 : Support for shared networks...
Github user rhtyd commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1579#discussion_r90220849
--- Diff: api/src/com/cloud/network/Network.java ---
@@ -215,6 +216,8 @@ public static Provider getProvider(String providerName)
{
public static final Capability DistributedRouter = new
Capability("DistributedRouter");
public static final Capability StretchedL2Subnet = new
Capability("StretchedL2Subnet");
public static final Capability RegionLevelVpc = new
Capability("RegionLevelVpc");
+public static final Capability NoVlan = new Capability("NoVlan");
+public static final Capability PublicAccess = new
Capability("PublicAccess");
--- End diff --
Can you check if an untagged capability can be used, and default egress
policy can be used; instead of introducing these two capabilities?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request #1579: CLOUDSTACK-9403 : Support for shared networks...
Github user rhtyd commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1579#discussion_r90221150
--- Diff: server/src/com/cloud/network/NetworkModelImpl.java ---
@@ -1558,6 +1558,32 @@ public boolean checkIpForService(IpAddress userIp,
Service service, Long network
}
@Override
+public boolean providerSupportsCapability(Set providers,
Service service, Capability cap) {
--- End diff --
Can we have a unit test for this?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request #1579: CLOUDSTACK-9403 : Support for shared networks...
Github user rhtyd commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1579#discussion_r90221096
--- Diff: server/src/com/cloud/configuration/ConfigurationManagerImpl.java
---
@@ -2968,8 +2939,45 @@ public Vlan doInTransaction(final TransactionStatus
status) {
throw new InvalidParameterValueException("The gateway ip
should not be the part of the ip range being added.");
}
-final Pair> result = new
Pair>(sameSubnet, vlanDetails);
-return result;
+return new Pair>(sameSubnet,
vlanDetails);
+}
+
+private boolean hasSameSubnet(boolean ipv4, String vlanGateway, String
vlanNetmask, String newVlanGateway, String newVlanNetmask, String newStartIp,
String newEndIp,
--- End diff --
Do we have a unit test for this method?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request #1579: CLOUDSTACK-9403 : Support for shared networks...
Github user rhtyd commented on a diff in the pull request: https://github.com/apache/cloudstack/pull/1579#discussion_r90220227 --- Diff: api/src/org/apache/cloudstack/api/ApiConstants.java --- @@ -639,6 +639,7 @@ public static final String READ_ONLY = "readonly"; public static final String SUPPORTS_REGION_LEVEL_VPC = "supportsregionLevelvpc"; public static final String SUPPORTS_STRECHED_L2_SUBNET = "supportsstrechedl2subnet"; +public static final String SUPPORTS_PUBLIC_ACCESS = "supportspublicaccess"; --- End diff -- Guest VM's with public network access is possible by checking default egress rule. Without adding this new notion of a 'public access', networks can reuse the `Egress Default Policy`. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack pull request #1579: CLOUDSTACK-9403 : Support for shared networks...
Github user rhtyd commented on a diff in the pull request: https://github.com/apache/cloudstack/pull/1579#discussion_r90221275 --- Diff: setup/db/db/schema-4910to41000.sql --- @@ -45,4 +45,6 @@ CREATE TABLE `cloud`.`vlan_details` ( `display` tinyint(1) NOT NULL DEFAULT 1 COMMENT 'Should detail be displayed to the end user', PRIMARY KEY (`id`), CONSTRAINT `fk_vlan_details__vlan_id` FOREIGN KEY `fk_vlan_details__vlan_id`(`vlan_id`) REFERENCES `vlan`(`id`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8; \ No newline at end of file +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +ALTER TABLE `cloud`.`network_offerings` ADD COLUMN supports_public_access boolean default false; --- End diff -- By reusing the default egress policy column, this new column can be avoided. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack pull request #1579: CLOUDSTACK-9403 : Support for shared networks...
Github user rhtyd commented on a diff in the pull request: https://github.com/apache/cloudstack/pull/1579#discussion_r90220265 --- Diff: api/src/org/apache/cloudstack/api/response/NetworkOfferingResponse.java --- @@ -120,6 +120,10 @@ @Param(description = "true if network offering supports network that span multiple zones", since = "4.4") private Boolean supportsStrechedL2Subnet; +@SerializedName(ApiConstants.SUPPORTS_PUBLIC_ACCESS) +@Param(description = "true if network offering supports public access for guest networks", since = "4.9.0") +private Boolean supportsPublicAccess; --- End diff -- New networks can reuse the `Egress Default Policy`? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack pull request #1579: CLOUDSTACK-9403 : Support for shared networks...
Github user rhtyd commented on a diff in the pull request: https://github.com/apache/cloudstack/pull/1579#discussion_r90220642 --- Diff: engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java --- @@ -142,6 +142,9 @@ @Column(name="supports_streched_l2") boolean supportsStrechedL2 = false; +@Column(name="supports_public_access") +boolean supportsPublicAccess = false; + --- End diff -- Can we use egress_default_policy? Justify introduction of a new column? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1800: CLOUDSTACK-9633:test_snapshot is failing due to inco...
Github user blueorangutan commented on the issue: https://github.com/apache/cloudstack/pull/1800 Packaging result: âcentos6 âcentos7 âdebian. JID-287 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1800: CLOUDSTACK-9633:test_snapshot is failing due to inco...
Github user rhtyd commented on the issue: https://github.com/apache/cloudstack/pull/1800 @blueorangutan test centos7 xenserver-65sp1 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1800: CLOUDSTACK-9633:test_snapshot is failing due to inco...
Github user blueorangutan commented on the issue: https://github.com/apache/cloudstack/pull/1800 @rhtyd a Trillian-Jenkins test job (centos7 mgmt + xenserver-65sp1) has been kicked to run smoke tests --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1801: fix marvin test failure test_router_dhcp_opts
Github user blueorangutan commented on the issue: https://github.com/apache/cloudstack/pull/1801 Packaging result: âcentos6 âcentos7 âdebian. JID-288 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1801: fix marvin test failure test_router_dhcp_opts
Github user rhtyd commented on the issue: https://github.com/apache/cloudstack/pull/1801 @blueorangutan test centos7 vmware-55u3 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1801: fix marvin test failure test_router_dhcp_opts
Github user blueorangutan commented on the issue: https://github.com/apache/cloudstack/pull/1801 @rhtyd a Trillian-Jenkins test job (centos7 mgmt + vmware-55u3) has been kicked to run smoke tests --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1799: CLOUDSTACK-9632: Upgrade bouncy castle to version 1....
Github user blueorangutan commented on the issue: https://github.com/apache/cloudstack/pull/1799 Packaging result: âcentos6 âcentos7 âdebian. JID-289 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack pull request #1579: CLOUDSTACK-9403 : Support for shared networks...
Github user rhtyd commented on a diff in the pull request: https://github.com/apache/cloudstack/pull/1579#discussion_r90227580 --- Diff: client/pom.xml --- @@ -168,6 +168,11 @@ org.apache.cloudstack + cloud-plugin-network-vsp --- End diff -- Thanks for confirming @fmaximus --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack pull request #1802: CLOUDSTACK-9635: fix test_privategw_acl.py
GitHub user murali-reddy opened a pull request: https://github.com/apache/cloudstack/pull/1802 CLOUDSTACK-9635: fix test_privategw_acl.py ensure VLAN used for createPrivateGateway is determined after the guest networks in the VPC is created, so that we skip VLAN allocated for guest network for the private network of vpc gateway You can merge this pull request into a Git repository by running: $ git pull https://github.com/murali-reddy/cloudstack test_privategw_acl Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cloudstack/pull/1802.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1802 commit 16c86d78471d169ff5135ab54a243f18c403c202 Author: Murali Reddy Date: 2016-11-30T13:06:43Z CLOUDSTACK-9635: fix test_privategw_acl.py ensure VLAN used for createPrivateGateway is determined after the guest networks in the VPC is created, so that we skip VLAN allocated for guest network for the private network of vpc gateway --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1802: CLOUDSTACK-9635: fix test_privategw_acl.py
Github user murali-reddy commented on the issue: https://github.com/apache/cloudstack/pull/1802 @blueorangutan package --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1802: CLOUDSTACK-9635: fix test_privategw_acl.py
Github user blueorangutan commented on the issue: https://github.com/apache/cloudstack/pull/1802 @murali-reddy a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1799: CLOUDSTACK-9632: Upgrade bouncy castle to version 1....
Github user rhtyd commented on the issue: https://github.com/apache/cloudstack/pull/1799 @blueorangutan test --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1799: CLOUDSTACK-9632: Upgrade bouncy castle to version 1....
Github user blueorangutan commented on the issue: https://github.com/apache/cloudstack/pull/1799 @rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1802: CLOUDSTACK-9635: fix test_privategw_acl.py
Github user blueorangutan commented on the issue: https://github.com/apache/cloudstack/pull/1802 Packaging result: âcentos6 âcentos7 âdebian. JID-290 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack pull request #1579: CLOUDSTACK-9403 : Support for shared networks...
Github user fmaximus commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1579#discussion_r90236739
--- Diff: api/src/com/cloud/network/Network.java ---
@@ -215,6 +216,8 @@ public static Provider getProvider(String providerName)
{
public static final Capability DistributedRouter = new
Capability("DistributedRouter");
public static final Capability StretchedL2Subnet = new
Capability("StretchedL2Subnet");
public static final Capability RegionLevelVpc = new
Capability("RegionLevelVpc");
+public static final Capability NoVlan = new Capability("NoVlan");
+public static final Capability PublicAccess = new
Capability("PublicAccess");
--- End diff --
NoVlan is a Capability we're currently using when adding a new IP range to
an existing shared network. Without this, the Broadcast URI would become
vlan://untagged, while the shared network has a Broadcast URI of
vsp://network-uuid. When the CIDR of the new ip range is the same as one of the
already existing ip ranges, it would still not be allowed as the vlan id is
different.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1802: CLOUDSTACK-9635: fix test_privategw_acl.py
Github user murali-reddy commented on the issue: https://github.com/apache/cloudstack/pull/1802 @blueorangutan test centos7 kvm-centos6 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
Re: [GitHub] cloudstack issue #1800: CLOUDSTACK-9633:test_snapshot is failing due to inco...
LGTM
[GitHub] cloudstack issue #1802: CLOUDSTACK-9635: fix test_privategw_acl.py
Github user murali-reddy commented on the issue: https://github.com/apache/cloudstack/pull/1802 @blueorangutan test centos6 kvm-centos6 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
Re: [GitHub] cloudstack issue #1801: fix marvin test failure test_router_dhcp_opts
LGTM
[GitHub] cloudstack issue #1802: CLOUDSTACK-9635: fix test_privategw_acl.py
Github user blueorangutan commented on the issue: https://github.com/apache/cloudstack/pull/1802 @murali-reddy a Trillian-Jenkins test job (centos6 mgmt + kvm-centos6) has been kicked to run smoke tests --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1579: CLOUDSTACK-9403 : Support for shared networks in Nua...
Github user blueorangutan commented on the issue: https://github.com/apache/cloudstack/pull/1579 Trillian test result (tid-506) Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7 Total time taken: 29877 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr1579-t506-kvm-centos7.zip Test completed. 45 look ok, 4 have error(s) Test | Result | Time (s) | Test File --- | --- | --- | --- test_05_rvpc_multi_tiers | `Failure` | 374.62 | test_vpc_redundant.py test_router_dhcp_opts | `Failure` | 21.80 | test_router_dhcphosts.py test_05_rvpc_multi_tiers | `Error` | 677.06 | test_vpc_redundant.py test_01_create_template | `Error` | 80.77 | test_templates.py ContextSuite context=TestSnapshotRootDisk>:teardown | `Error` | 46.69 | test_snapshots.py test_01_vpc_site2site_vpn | Success | 175.90 | test_vpc_vpn.py test_01_vpc_remote_access_vpn | Success | 71.39 | test_vpc_vpn.py test_01_redundant_vpc_site2site_vpn | Success | 256.11 | test_vpc_vpn.py test_02_VPC_default_routes | Success | 328.89 | test_vpc_router_nics.py test_01_VPC_nics_after_destroy | Success | 575.60 | test_vpc_router_nics.py test_04_rvpc_network_garbage_collector_nics | Success | 1357.26 | test_vpc_redundant.py test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers | Success | 638.25 | test_vpc_redundant.py test_02_redundant_VPC_default_routes | Success | 801.85 | test_vpc_redundant.py test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL | Success | 1396.53 | test_vpc_redundant.py test_09_delete_detached_volume | Success | 15.59 | test_volumes.py test_08_resize_volume | Success | 15.41 | test_volumes.py test_07_resize_fail | Success | 20.48 | test_volumes.py test_06_download_detached_volume | Success | 15.58 | test_volumes.py test_05_detach_volume | Success | 100.25 | test_volumes.py test_04_delete_attached_volume | Success | 10.23 | test_volumes.py test_03_download_attached_volume | Success | 15.45 | test_volumes.py test_02_attach_volume | Success | 44.53 | test_volumes.py test_01_create_volume | Success | 737.52 | test_volumes.py test_deploy_vm_multiple | Success | 268.80 | test_vm_life_cycle.py test_deploy_vm | Success | 0.03 | test_vm_life_cycle.py test_advZoneVirtualRouter | Success | 0.03 | test_vm_life_cycle.py test_10_attachAndDetach_iso | Success | 26.72 | test_vm_life_cycle.py test_09_expunge_vm | Success | 125.24 | test_vm_life_cycle.py test_08_migrate_vm | Success | 41.06 | test_vm_life_cycle.py test_07_restore_vm | Success | 0.13 | test_vm_life_cycle.py test_06_destroy_vm | Success | 130.93 | test_vm_life_cycle.py test_03_reboot_vm | Success | 130.90 | test_vm_life_cycle.py test_02_start_vm | Success | 10.22 | test_vm_life_cycle.py test_01_stop_vm | Success | 50.45 | test_vm_life_cycle.py test_CreateTemplateWithDuplicateName | Success | 90.78 | test_templates.py test_08_list_system_templates | Success | 0.03 | test_templates.py test_07_list_public_templates | Success | 0.04 | test_templates.py test_05_template_permissions | Success | 0.06 | test_templates.py test_04_extract_template | Success | 5.14 | test_templates.py test_03_delete_template | Success | 5.13 | test_templates.py test_02_edit_template | Success | 90.19 | test_templates.py test_10_destroy_cpvm | Success | 141.71 | test_ssvm.py test_09_destroy_ssvm | Success | 168.81 | test_ssvm.py test_08_reboot_cpvm | Success | 166.85 | test_ssvm.py test_07_reboot_ssvm | Success | 169.24 | test_ssvm.py test_06_stop_cpvm | Success | 136.89 | test_ssvm.py test_05_stop_ssvm | Success | 199.16 | test_ssvm.py test_04_cpvm_internals | Success | 1.25 | test_ssvm.py test_03_ssvm_internals | Success | 4.13 | test_ssvm.py test_02_list_cpvm_vm | Success | 0.13 | test_ssvm.py test_01_list_sec_storage_vm | Success | 0.14 | test_ssvm.py test_01_snapshot_root_disk | Success | 11.24 | test_snapshots.py test_04_change_offering_small | Success | 245.73 | test_service_offerings.py test_03_delete_service_offering | Success | 0.04 | test_service_offerings.py test_02_edit_service_offering | Success | 0.08 | test_service_offerings.py test_01_create_service_offering | Success | 0.12 | test_service_offerings.py test_02_sys_template_ready | Success | 0.18 | test_secondary_storage.py test_01_sys_vm_start | Success | 0.25 | test_secondary_storage.py test_09_reboot_router | Success | 65.69 | test_routers.py test_08_start_router | Success | 50.48 | test_routers.py test_07_stop_router | Success | 15.20 | test_routers.py test_06_router_advanced | Success | 0.07 | test_routers.py test_05_router_basic | Success | 0.04 | test_routers.py test_04_restart_network_wo_cleanup | Success | 5.83 | test_routers.py test_03_restart_network_cleanup | Success | 80
[GitHub] cloudstack issue #1579: CLOUDSTACK-9403 : Support for shared networks in Nua...
Github user blueorangutan commented on the issue: https://github.com/apache/cloudstack/pull/1579 Trillian test result (tid-505) Environment: xenserver-65sp1 (x2), Advanced Networking with Mgmt server 6 Total time taken: 34519 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr1579-t505-xenserver-65sp1.zip Test completed. 46 look ok, 3 have error(s) Test | Result | Time (s) | Test File --- | --- | --- | --- test_05_rvpc_multi_tiers | `Failure` | 556.81 | test_vpc_redundant.py test_04_rvpc_network_garbage_collector_nics | `Failure` | 1376.31 | test_vpc_redundant.py test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL | `Failure` | 568.62 | test_vpc_redundant.py test_01_snapshot_root_disk | `Failure` | 16.14 | test_snapshots.py test_router_dhcp_opts | `Failure` | 31.02 | test_router_dhcphosts.py test_01_vpc_site2site_vpn | Success | 402.15 | test_vpc_vpn.py test_01_vpc_remote_access_vpn | Success | 177.02 | test_vpc_vpn.py test_01_redundant_vpc_site2site_vpn | Success | 597.55 | test_vpc_vpn.py test_02_VPC_default_routes | Success | 354.86 | test_vpc_router_nics.py test_01_VPC_nics_after_destroy | Success | 708.85 | test_vpc_router_nics.py test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers | Success | 869.84 | test_vpc_redundant.py test_02_redundant_VPC_default_routes | Success | 1121.57 | test_vpc_redundant.py test_09_delete_detached_volume | Success | 15.59 | test_volumes.py test_08_resize_volume | Success | 85.77 | test_volumes.py test_07_resize_fail | Success | 100.84 | test_volumes.py test_06_download_detached_volume | Success | 20.32 | test_volumes.py test_05_detach_volume | Success | 100.25 | test_volumes.py test_04_delete_attached_volume | Success | 10.20 | test_volumes.py test_03_download_attached_volume | Success | 15.30 | test_volumes.py test_02_attach_volume | Success | 10.66 | test_volumes.py test_01_create_volume | Success | 387.50 | test_volumes.py test_03_delete_vm_snapshots | Success | 280.21 | test_vm_snapshots.py test_02_revert_vm_snapshots | Success | 181.51 | test_vm_snapshots.py test_01_create_vm_snapshots | Success | 146.18 | test_vm_snapshots.py test_deploy_vm_multiple | Success | 323.35 | test_vm_life_cycle.py test_deploy_vm | Success | 0.02 | test_vm_life_cycle.py test_advZoneVirtualRouter | Success | 0.02 | test_vm_life_cycle.py test_10_attachAndDetach_iso | Success | 46.96 | test_vm_life_cycle.py test_09_expunge_vm | Success | 125.14 | test_vm_life_cycle.py test_08_migrate_vm | Success | 71.14 | test_vm_life_cycle.py test_07_restore_vm | Success | 0.10 | test_vm_life_cycle.py test_06_destroy_vm | Success | 10.13 | test_vm_life_cycle.py test_03_reboot_vm | Success | 10.14 | test_vm_life_cycle.py test_02_start_vm | Success | 20.20 | test_vm_life_cycle.py test_01_stop_vm | Success | 30.24 | test_vm_life_cycle.py test_CreateTemplateWithDuplicateName | Success | 110.81 | test_templates.py test_08_list_system_templates | Success | 0.02 | test_templates.py test_07_list_public_templates | Success | 0.03 | test_templates.py test_05_template_permissions | Success | 0.04 | test_templates.py test_04_extract_template | Success | 5.19 | test_templates.py test_03_delete_template | Success | 5.10 | test_templates.py test_02_edit_template | Success | 90.12 | test_templates.py test_01_create_template | Success | 76.20 | test_templates.py test_10_destroy_cpvm | Success | 201.57 | test_ssvm.py test_09_destroy_ssvm | Success | 229.08 | test_ssvm.py test_08_reboot_cpvm | Success | 151.65 | test_ssvm.py test_07_reboot_ssvm | Success | 143.76 | test_ssvm.py test_06_stop_cpvm | Success | 201.76 | test_ssvm.py test_05_stop_ssvm | Success | 168.89 | test_ssvm.py test_04_cpvm_internals | Success | 1.18 | test_ssvm.py test_03_ssvm_internals | Success | 3.38 | test_ssvm.py test_02_list_cpvm_vm | Success | 0.09 | test_ssvm.py test_01_list_sec_storage_vm | Success | 0.10 | test_ssvm.py test_04_change_offering_small | Success | 113.92 | test_service_offerings.py test_03_delete_service_offering | Success | 0.04 | test_service_offerings.py test_02_edit_service_offering | Success | 0.07 | test_service_offerings.py test_01_create_service_offering | Success | 0.08 | test_service_offerings.py test_02_sys_template_ready | Success | 0.09 | test_secondary_storage.py test_01_sys_vm_start | Success | 0.13 | test_secondary_storage.py test_01_scale_vm | Success | 5.19 | test_scale_vm.py test_09_reboot_router | Success | 65.43 | test_routers.py test_08_start_router | Success | 55.40 | test_routers.py test_07_stop_router | Success | 15.16 | test_routers.py test_06_router_advanced | Success | 0.05 | test_routers.py test_05_router_basic | Success | 0.03 | test_routers.
[GitHub] cloudstack issue #1753: [4.9] Latest health test run
Github user blueorangutan commented on the issue: https://github.com/apache/cloudstack/pull/1753 Trillian test result (tid-504) Environment: vmware-55u3 (x2), Advanced Networking with Mgmt server 7 Total time taken: 39047 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr1753-t504-vmware-55u3.zip Test completed. 45 look ok, 3 have error(s) Test | Result | Time (s) | Test File --- | --- | --- | --- test_01_vpc_remote_access_vpn | `Failure` | 120.68 | test_vpc_vpn.py test_router_dhcp_opts | `Failure` | 21.29 | test_router_dhcphosts.py test_04_rvpc_privategw_static_routes | `Failure` | 539.11 | test_privategw_acl.py test_01_vpc_privategw_acl | `Failure` | 192.12 | test_privategw_acl.py test_01_vpc_site2site_vpn | `Error` | 541.50 | test_vpc_vpn.py test_01_redundant_vpc_site2site_vpn | `Error` | 843.52 | test_vpc_vpn.py test_02_VPC_default_routes | Success | 375.17 | test_vpc_router_nics.py test_01_VPC_nics_after_destroy | Success | 836.46 | test_vpc_router_nics.py test_05_rvpc_multi_tiers | Success | 787.55 | test_vpc_redundant.py test_04_rvpc_network_garbage_collector_nics | Success | 1583.18 | test_vpc_redundant.py test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers | Success | 857.28 | test_vpc_redundant.py test_02_redundant_VPC_default_routes | Success | 779.58 | test_vpc_redundant.py test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL | Success | 1473.54 | test_vpc_redundant.py test_09_delete_detached_volume | Success | 30.89 | test_volumes.py test_06_download_detached_volume | Success | 80.56 | test_volumes.py test_05_detach_volume | Success | 105.25 | test_volumes.py test_04_delete_attached_volume | Success | 15.16 | test_volumes.py test_03_download_attached_volume | Success | 20.39 | test_volumes.py test_02_attach_volume | Success | 59.02 | test_volumes.py test_01_create_volume | Success | 543.29 | test_volumes.py test_03_delete_vm_snapshots | Success | 280.21 | test_vm_snapshots.py test_02_revert_vm_snapshots | Success | 237.15 | test_vm_snapshots.py test_01_test_vm_volume_snapshot | Success | 196.15 | test_vm_snapshots.py test_01_create_vm_snapshots | Success | 161.70 | test_vm_snapshots.py test_deploy_vm_multiple | Success | 257.58 | test_vm_life_cycle.py test_deploy_vm | Success | 0.02 | test_vm_life_cycle.py test_advZoneVirtualRouter | Success | 0.02 | test_vm_life_cycle.py test_10_attachAndDetach_iso | Success | 26.79 | test_vm_life_cycle.py test_09_expunge_vm | Success | 125.18 | test_vm_life_cycle.py test_08_migrate_vm | Success | 80.86 | test_vm_life_cycle.py test_07_restore_vm | Success | 0.07 | test_vm_life_cycle.py test_06_destroy_vm | Success | 10.12 | test_vm_life_cycle.py test_03_reboot_vm | Success | 5.10 | test_vm_life_cycle.py test_02_start_vm | Success | 20.18 | test_vm_life_cycle.py test_01_stop_vm | Success | 10.11 | test_vm_life_cycle.py test_CreateTemplateWithDuplicateName | Success | 301.56 | test_templates.py test_08_list_system_templates | Success | 0.02 | test_templates.py test_07_list_public_templates | Success | 0.03 | test_templates.py test_05_template_permissions | Success | 0.05 | test_templates.py test_04_extract_template | Success | 15.24 | test_templates.py test_03_delete_template | Success | 5.08 | test_templates.py test_02_edit_template | Success | 90.10 | test_templates.py test_01_create_template | Success | 155.85 | test_templates.py test_10_destroy_cpvm | Success | 266.61 | test_ssvm.py test_09_destroy_ssvm | Success | 268.47 | test_ssvm.py test_08_reboot_cpvm | Success | 156.42 | test_ssvm.py test_07_reboot_ssvm | Success | 158.48 | test_ssvm.py test_06_stop_cpvm | Success | 206.62 | test_ssvm.py test_05_stop_ssvm | Success | 213.82 | test_ssvm.py test_04_cpvm_internals | Success | 1.18 | test_ssvm.py test_03_ssvm_internals | Success | 3.33 | test_ssvm.py test_02_list_cpvm_vm | Success | 0.14 | test_ssvm.py test_01_list_sec_storage_vm | Success | 0.09 | test_ssvm.py test_01_snapshot_root_disk | Success | 66.19 | test_snapshots.py test_04_change_offering_small | Success | 92.45 | test_service_offerings.py test_03_delete_service_offering | Success | 0.03 | test_service_offerings.py test_02_edit_service_offering | Success | 0.06 | test_service_offerings.py test_01_create_service_offering | Success | 0.06 | test_service_offerings.py test_02_sys_template_ready | Success | 0.09 | test_secondary_storage.py test_01_sys_vm_start | Success | 0.13 | test_secondary_storage.py test_09_reboot_router | Success | 150.84 | test_routers.py test_08_start_router | Success | 156.18 | test_routers.py test_07_stop_router | Success | 20.26 | test_routers.py test_06_router_advanced | Success | 0.04 | test_routers.py test_
[GitHub] cloudstack issue #1579: CLOUDSTACK-9403 : Support for shared networks in Nua...
Github user blueorangutan commented on the issue: https://github.com/apache/cloudstack/pull/1579 Trillian test result (tid-507) Environment: vmware-55u3 (x2), Advanced Networking with Mgmt server 7 Total time taken: 40678 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr1579-t507-vmware-55u3.zip Test completed. 45 look ok, 4 have error(s) Test | Result | Time (s) | Test File --- | --- | --- | --- test_router_dhcp_opts | `Failure` | 25.94 | test_router_dhcphosts.py test_01_vpc_site2site_vpn | `Error` | 561.48 | test_vpc_vpn.py test_01_redundant_vpc_site2site_vpn | `Error` | 772.69 | test_vpc_vpn.py test_06_download_detached_volume | `Error` | 80.57 | test_volumes.py test_nested_virtualization_vmware | `Error` | 382.41 | test_nested_virtualization.py test_01_vpc_remote_access_vpn | Success | 216.47 | test_vpc_vpn.py test_02_VPC_default_routes | Success | 375.40 | test_vpc_router_nics.py test_01_VPC_nics_after_destroy | Success | 820.98 | test_vpc_router_nics.py test_05_rvpc_multi_tiers | Success | 730.46 | test_vpc_redundant.py test_04_rvpc_network_garbage_collector_nics | Success | 1527.52 | test_vpc_redundant.py test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers | Success | 757.55 | test_vpc_redundant.py test_02_redundant_VPC_default_routes | Success | 764.31 | test_vpc_redundant.py test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL | Success | 1418.41 | test_vpc_redundant.py test_09_delete_detached_volume | Success | 35.81 | test_volumes.py test_05_detach_volume | Success | 105.22 | test_volumes.py test_04_delete_attached_volume | Success | 15.17 | test_volumes.py test_03_download_attached_volume | Success | 20.32 | test_volumes.py test_02_attach_volume | Success | 60.53 | test_volumes.py test_01_create_volume | Success | 517.97 | test_volumes.py test_03_delete_vm_snapshots | Success | 275.18 | test_vm_snapshots.py test_02_revert_vm_snapshots | Success | 224.06 | test_vm_snapshots.py test_01_test_vm_volume_snapshot | Success | 271.48 | test_vm_snapshots.py test_01_create_vm_snapshots | Success | 166.66 | test_vm_snapshots.py test_deploy_vm_multiple | Success | 257.49 | test_vm_life_cycle.py test_deploy_vm | Success | 0.02 | test_vm_life_cycle.py test_advZoneVirtualRouter | Success | 0.02 | test_vm_life_cycle.py test_10_attachAndDetach_iso | Success | 167.35 | test_vm_life_cycle.py test_09_expunge_vm | Success | 125.14 | test_vm_life_cycle.py test_08_migrate_vm | Success | 81.07 | test_vm_life_cycle.py test_07_restore_vm | Success | 0.07 | test_vm_life_cycle.py test_06_destroy_vm | Success | 10.11 | test_vm_life_cycle.py test_03_reboot_vm | Success | 5.10 | test_vm_life_cycle.py test_02_start_vm | Success | 25.19 | test_vm_life_cycle.py test_01_stop_vm | Success | 10.12 | test_vm_life_cycle.py test_CreateTemplateWithDuplicateName | Success | 281.95 | test_templates.py test_08_list_system_templates | Success | 0.02 | test_templates.py test_07_list_public_templates | Success | 0.03 | test_templates.py test_05_template_permissions | Success | 0.04 | test_templates.py test_04_extract_template | Success | 25.53 | test_templates.py test_03_delete_template | Success | 5.08 | test_templates.py test_02_edit_template | Success | 90.16 | test_templates.py test_01_create_template | Success | 125.71 | test_templates.py test_10_destroy_cpvm | Success | 266.57 | test_ssvm.py test_09_destroy_ssvm | Success | 268.86 | test_ssvm.py test_08_reboot_cpvm | Success | 156.28 | test_ssvm.py test_07_reboot_ssvm | Success | 188.42 | test_ssvm.py test_06_stop_cpvm | Success | 176.65 | test_ssvm.py test_05_stop_ssvm | Success | 213.57 | test_ssvm.py test_04_cpvm_internals | Success | 1.03 | test_ssvm.py test_03_ssvm_internals | Success | 4.34 | test_ssvm.py test_02_list_cpvm_vm | Success | 0.09 | test_ssvm.py test_01_list_sec_storage_vm | Success | 0.10 | test_ssvm.py test_01_snapshot_root_disk | Success | 66.43 | test_snapshots.py test_04_change_offering_small | Success | 128.25 | test_service_offerings.py test_03_delete_service_offering | Success | 0.03 | test_service_offerings.py test_02_edit_service_offering | Success | 0.06 | test_service_offerings.py test_01_create_service_offering | Success | 0.08 | test_service_offerings.py test_02_sys_template_ready | Success | 0.10 | test_secondary_storage.py test_01_sys_vm_start | Success | 0.13 | test_secondary_storage.py test_09_reboot_router | Success | 175.85 | test_routers.py test_08_start_router | Success | 155.79 | test_routers.py test_07_stop_router | Success | 20.17 | test_routers.py test_06_router_advanced | Success | 0.04 | test_routers.py test_05_router_basic | Success | 0.03 | test_routers.py test_04_restart_n
[GitHub] cloudstack issue #1579: CLOUDSTACK-9403 : Support for shared networks in Nua...
Github user jburwell commented on the issue: https://github.com/apache/cloudstack/pull/1579 @prashanthvarma please ignore my last comment. It appears that we have found an issue with the `test_router_dhcp_opts` test case. #1801 has been submitted to fix it. Once #1800 and #1801 have been merged, I would like to have you rebase this PR and re-run the regression tests. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1800: CLOUDSTACK-9633:test_snapshot is failing due to inco...
Github user jburwell commented on the issue: https://github.com/apache/cloudstack/pull/1800 @borisstoyanov there is a Jenkins failure, but the results page returns a 404. Could you please re-push this PR to re-trigger the Jenkins/Travis run by running `git commit --amend --no-edit && git push -f`? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1579: CLOUDSTACK-9403 : Support for shared networks in Nua...
Github user jburwell commented on the issue: https://github.com/apache/cloudstack/pull/1579 @prashanthvarma the redundant router/VPC failures are known. We have a fix pending for the `test_snapshot` failures in XenServer (#1800). However, I am concerned about that`test_router_dhcp_opts` is consistently failing on KVM and XenServer. Could you please investigate this failure? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack pull request #1803: CLOUDSTACK-9636: The host alerts box should b...
GitHub user nitin-maharana opened a pull request: https://github.com/apache/cloudstack/pull/1803 CLOUDSTACK-9636: The host alerts box should be named as hosts in Alerts. The host Alerts box shows hosts in Alerts. The name host Alerts is misleading, it should be changed to hosts in alerts. You can merge this pull request into a Git repository by running: $ git pull https://github.com/nitin-maharana/CloudStack-Nitin nitin6 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cloudstack/pull/1803.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1803 commit 572b5dcc00a2694e7a27dd48765367b0c652eb1c Author: Nitin Kumar Maharana Date: 2016-11-30T19:49:44Z CLOUDSTACK-9636: The host alerts box should be named as hosts in Alerts. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1711: XenServer 7 Support
Github user syed commented on the issue: https://github.com/apache/cloudstack/pull/1711 Thanks Guys for testing this out. I had a question @jburwell You wanted me to port this to 4.9 and then it would be forward merged to 4.10 and master. How would the DB changes be handled? right now I have the schema in `schema-4910to41000.sql` now if I backport to 4.9 it would be something like `schema-4910to4920` correct? If so, how would you forward merge? wouldn't you also need `schema-4920to41010` and `schema-41010to41100` ? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1769: tools: fix Dockerfile
Github user pdion891 commented on the issue: https://github.com/apache/cloudstack/pull/1769 So, should we go forward and merge #1435 + #1769 to master? I might just need to rebase and update version number of the current commit. With those 2 PR, we would have master back online on dockerhub so we can get an updater docker image for the simulator! --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1769: tools: fix Dockerfile
Github user pdion891 commented on the issue: https://github.com/apache/cloudstack/pull/1769 @resmo could you do a PR on top of #1435 ? or this have to be merged first? so we can get your chances and some of mine. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1769: tools: fix Dockerfile
Github user resmo commented on the issue: https://github.com/apache/cloudstack/pull/1769 @pdion891 I would say merge #1435 first --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1769: tools: fix Dockerfile
Github user pdion891 commented on the issue: https://github.com/apache/cloudstack/pull/1769 ok, I'll update the PR and merge it I think the PR go all required LGTM. I'll confirmed with John, in case he is in a code freeze period. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack issue #1801: fix marvin test failure test_router_dhcp_opts
Github user blueorangutan commented on the issue: https://github.com/apache/cloudstack/pull/1801 Trillian test result (tid-510) Environment: vmware-55u3 (x2), Advanced Networking with Mgmt server 7 Total time taken: 33387 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr1801-t510-vmware-55u3.zip Test completed. 39 look ok, 4 have error(s) Test | Result | Time (s) | Test File --- | --- | --- | --- test_01_vpc_site2site_vpn | `Error` | 493.42 | test_vpc_vpn.py test_01_redundant_vpc_site2site_vpn | `Error` | 659.27 | test_vpc_vpn.py test_06_download_detached_volume | `Error` | 50.51 | test_volumes.py test_CreateTemplateWithDuplicateName | `Error` | 181.78 | test_templates.py test_01_create_template | `Error` | 50.77 | test_templates.py ContextSuite context=TestTemplates>:setup | `Error` | 479.44 | test_templates.py test_04_rvpc_privategw_static_routes | `Error` | 1006.85 | test_privategw_acl.py test_01_vpc_remote_access_vpn | Success | 197.75 | test_vpc_vpn.py test_02_VPC_default_routes | Success | 456.31 | test_vpc_router_nics.py test_01_VPC_nics_after_destroy | Success | 715.26 | test_vpc_router_nics.py test_05_rvpc_multi_tiers | Success | 574.66 | test_vpc_redundant.py test_04_rvpc_network_garbage_collector_nics | Success | 1570.15 | test_vpc_redundant.py test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers | Success | 617.79 | test_vpc_redundant.py test_02_redundant_VPC_default_routes | Success | 597.09 | test_vpc_redundant.py test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL | Success | 1210.70 | test_vpc_redundant.py test_09_delete_detached_volume | Success | 31.27 | test_volumes.py test_05_detach_volume | Success | 110.40 | test_volumes.py test_04_delete_attached_volume | Success | 15.29 | test_volumes.py test_03_download_attached_volume | Success | 20.47 | test_volumes.py test_02_attach_volume | Success | 58.96 | test_volumes.py test_01_create_volume | Success | 519.95 | test_volumes.py test_03_delete_vm_snapshots | Success | 275.28 | test_vm_snapshots.py test_02_revert_vm_snapshots | Success | 199.30 | test_vm_snapshots.py test_01_test_vm_volume_snapshot | Success | 166.83 | test_vm_snapshots.py test_01_create_vm_snapshots | Success | 162.75 | test_vm_snapshots.py test_deploy_vm_multiple | Success | 275.52 | test_vm_life_cycle.py test_deploy_vm | Success | 0.03 | test_vm_life_cycle.py test_advZoneVirtualRouter | Success | 0.10 | test_vm_life_cycle.py test_10_attachAndDetach_iso | Success | 27.17 | test_vm_life_cycle.py test_09_expunge_vm | Success | 125.20 | test_vm_life_cycle.py test_08_migrate_vm | Success | 81.93 | test_vm_life_cycle.py test_07_restore_vm | Success | 0.18 | test_vm_life_cycle.py test_06_destroy_vm | Success | 10.18 | test_vm_life_cycle.py test_03_reboot_vm | Success | 5.24 | test_vm_life_cycle.py test_02_start_vm | Success | 20.30 | test_vm_life_cycle.py test_01_stop_vm | Success | 10.25 | test_vm_life_cycle.py test_10_destroy_cpvm | Success | 267.85 | test_ssvm.py test_09_destroy_ssvm | Success | 234.40 | test_ssvm.py test_08_reboot_cpvm | Success | 156.86 | test_ssvm.py test_07_reboot_ssvm | Success | 159.37 | test_ssvm.py test_06_stop_cpvm | Success | 208.05 | test_ssvm.py test_05_stop_ssvm | Success | 210.82 | test_ssvm.py test_04_cpvm_internals | Success | 1.93 | test_ssvm.py test_03_ssvm_internals | Success | 4.78 | test_ssvm.py test_02_list_cpvm_vm | Success | 0.11 | test_ssvm.py test_01_list_sec_storage_vm | Success | 0.11 | test_ssvm.py test_01_snapshot_root_disk | Success | 36.47 | test_snapshots.py test_04_change_offering_small | Success | 87.93 | test_service_offerings.py test_03_delete_service_offering | Success | 0.09 | test_service_offerings.py test_02_edit_service_offering | Success | 0.14 | test_service_offerings.py test_01_create_service_offering | Success | 0.10 | test_service_offerings.py test_02_sys_template_ready | Success | 0.28 | test_secondary_storage.py test_01_sys_vm_start | Success | 0.28 | test_secondary_storage.py test_09_reboot_router | Success | 171.81 | test_routers.py test_08_start_router | Success | 151.60 | test_routers.py test_07_stop_router | Success | 20.26 | test_routers.py test_06_router_advanced | Success | 0.05 | test_routers.py test_05_router_basic | Success | 0.04 | test_routers.py test_04_restart_network_wo_cleanup | Success | 5.67 | test_routers.py test_03_restart_network_cleanup | Success | 181.70 | test_routers.py test_02_router_internal_adv | Success | 1.08 | test_routers.py test_01_router_internal_basic | Success | 0.94 | test_routers.py test_router_dhcphosts | Success | 150.45 | test_router_dhcphosts.py test_router_dhcp_opts | Success | 22.66 | test_router_dhcphosts.
[GitHub] cloudstack issue #1800: CLOUDSTACK-9633:test_snapshot is failing due to inco...
Github user blueorangutan commented on the issue: https://github.com/apache/cloudstack/pull/1800 Trillian test result (tid-509) Environment: xenserver-65sp1 (x2), Advanced Networking with Mgmt server 7 Total time taken: 33518 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr1800-t509-xenserver-65sp1.zip Test completed. 40 look ok, 3 have error(s) Test | Result | Time (s) | Test File --- | --- | --- | --- test_05_rvpc_multi_tiers | `Failure` | 504.06 | test_vpc_redundant.py test_04_rvpc_network_garbage_collector_nics | `Failure` | 1342.50 | test_vpc_redundant.py test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL | `Failure` | 517.75 | test_vpc_redundant.py test_01_snapshot_root_disk | `Failure` | 27.27 | test_snapshots.py test_router_dhcp_opts | `Failure` | 21.96 | test_router_dhcphosts.py test_01_vpc_site2site_vpn | Success | 318.25 | test_vpc_vpn.py test_01_vpc_remote_access_vpn | Success | 142.09 | test_vpc_vpn.py test_01_redundant_vpc_site2site_vpn | Success | 540.15 | test_vpc_vpn.py test_02_VPC_default_routes | Success | 333.11 | test_vpc_router_nics.py test_01_VPC_nics_after_destroy | Success | 686.85 | test_vpc_router_nics.py test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers | Success | 819.09 | test_vpc_redundant.py test_02_redundant_VPC_default_routes | Success | 1014.05 | test_vpc_redundant.py test_09_delete_detached_volume | Success | 20.79 | test_volumes.py test_08_resize_volume | Success | 106.57 | test_volumes.py test_07_resize_fail | Success | 111.50 | test_volumes.py test_06_download_detached_volume | Success | 30.48 | test_volumes.py test_05_detach_volume | Success | 105.41 | test_volumes.py test_04_delete_attached_volume | Success | 15.40 | test_volumes.py test_03_download_attached_volume | Success | 20.43 | test_volumes.py test_02_attach_volume | Success | 20.97 | test_volumes.py test_01_create_volume | Success | 393.48 | test_volumes.py test_03_delete_vm_snapshots | Success | 280.31 | test_vm_snapshots.py test_02_revert_vm_snapshots | Success | 186.63 | test_vm_snapshots.py test_01_create_vm_snapshots | Success | 137.33 | test_vm_snapshots.py test_deploy_vm_multiple | Success | 295.38 | test_vm_life_cycle.py test_deploy_vm | Success | 0.05 | test_vm_life_cycle.py test_advZoneVirtualRouter | Success | 0.07 | test_vm_life_cycle.py test_10_attachAndDetach_iso | Success | 42.10 | test_vm_life_cycle.py test_09_expunge_vm | Success | 125.22 | test_vm_life_cycle.py test_08_migrate_vm | Success | 66.41 | test_vm_life_cycle.py test_07_restore_vm | Success | 0.11 | test_vm_life_cycle.py test_06_destroy_vm | Success | 10.18 | test_vm_life_cycle.py test_03_reboot_vm | Success | 10.33 | test_vm_life_cycle.py test_02_start_vm | Success | 15.31 | test_vm_life_cycle.py test_01_stop_vm | Success | 30.36 | test_vm_life_cycle.py test_CreateTemplateWithDuplicateName | Success | 151.83 | test_templates.py test_08_list_system_templates | Success | 0.05 | test_templates.py test_07_list_public_templates | Success | 0.05 | test_templates.py test_05_template_permissions | Success | 0.09 | test_templates.py test_04_extract_template | Success | 5.24 | test_templates.py test_03_delete_template | Success | 5.14 | test_templates.py test_02_edit_template | Success | 90.09 | test_templates.py test_01_create_template | Success | 91.15 | test_templates.py test_10_destroy_cpvm | Success | 232.00 | test_ssvm.py test_09_destroy_ssvm | Success | 199.28 | test_ssvm.py test_08_reboot_cpvm | Success | 181.95 | test_ssvm.py test_07_reboot_ssvm | Success | 154.18 | test_ssvm.py test_06_stop_cpvm | Success | 141.85 | test_ssvm.py test_05_stop_ssvm | Success | 144.23 | test_ssvm.py test_04_cpvm_internals | Success | 1.24 | test_ssvm.py test_03_ssvm_internals | Success | 3.88 | test_ssvm.py test_02_list_cpvm_vm | Success | 0.16 | test_ssvm.py test_01_list_sec_storage_vm | Success | 0.15 | test_ssvm.py test_04_change_offering_small | Success | 64.15 | test_service_offerings.py test_03_delete_service_offering | Success | 0.04 | test_service_offerings.py test_02_edit_service_offering | Success | 0.08 | test_service_offerings.py test_01_create_service_offering | Success | 0.09 | test_service_offerings.py test_02_sys_template_ready | Success | 0.12 | test_secondary_storage.py test_01_sys_vm_start | Success | 0.21 | test_secondary_storage.py test_01_scale_vm | Success | 5.37 | test_scale_vm.py test_09_reboot_router | Success | 80.90 | test_routers.py test_08_start_router | Success | 65.76 | test_routers.py test_07_stop_router | Success | 15.28 | test_routers.py test_06_router_advanced | Success | 0.08 | test_routers.py test_05_router_basic | Success | 0.04 | test_routers.
[GitHub] cloudstack issue #1253: CLOUDSTACK-9184: [VMware] vmware.ports.per.dvportgro...
Github user sureshanaparti commented on the issue: https://github.com/apache/cloudstack/pull/1253 Addressed all the changes suggested and rebased. With vSphere 4.0/4.1, when the ports per dvportgroup is set to less than 256 (current default), then it is set to the default 256, else it takes the actual config value. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] cloudstack pull request #1799: CLOUDSTACK-9632: Upgrade bouncy castle to ver...
Github user jburwell commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1799#discussion_r90310270
--- Diff:
utils/src/main/java/com/cloud/utils/security/CertificateHelper.java ---
@@ -40,123 +46,122 @@
import java.util.ArrayList;
import java.util.List;
-import com.cloud.utils.exception.CloudRuntimeException;
-import org.apache.commons.codec.binary.Base64;
-
-import com.cloud.utils.Ternary;
-import org.bouncycastle.openssl.PEMReader;
-
public class CertificateHelper {
-public static byte[] buildAndSaveKeystore(String alias, String cert,
String privateKey, String storePassword) throws KeyStoreException,
CertificateException,
-NoSuchAlgorithmException, InvalidKeySpecException, IOException {
-KeyStore ks = buildKeystore(alias, cert, privateKey,
storePassword);
-
-ByteArrayOutputStream os = new ByteArrayOutputStream();
-ks.store(os, storePassword != null ? storePassword.toCharArray() :
null);
-os.close();
-return os.toByteArray();
+public static byte[] buildAndSaveKeystore(final String alias, final
String cert, final String privateKey, final String storePassword) throws
KeyStoreException, CertificateException,
+NoSuchAlgorithmException, InvalidKeySpecException, IOException {
+final KeyStore ks = buildKeystore(alias, cert, privateKey,
storePassword);
+
+try (final ByteArrayOutputStream os = new ByteArrayOutputStream())
{
+ks.store(os, storePassword != null ?
storePassword.toCharArray() : null);
+return os.toByteArray();
+}
}
-public static byte[] buildAndSaveKeystore(List> certs, String storePassword) throws KeyStoreException,
NoSuchAlgorithmException,
-CertificateException, IOException, InvalidKeySpecException {
-KeyStore ks = KeyStore.getInstance("JKS");
+public static byte[] buildAndSaveKeystore(final List> certs, final String storePassword) throws KeyStoreException,
NoSuchAlgorithmException,
+CertificateException, IOException, InvalidKeySpecException {
+final KeyStore ks = KeyStore.getInstance("JKS");
ks.load(null, storePassword != null ? storePassword.toCharArray()
: null);
//name,cert,key
-for (Ternary cert : certs) {
+for (final Ternary cert : certs) {
if (cert.third() == null) {
-Certificate c = buildCertificate(cert.second());
+final Certificate c = buildCertificate(cert.second());
ks.setCertificateEntry(cert.first(), c);
} else {
-Certificate[] c = new Certificate[certs.size()];
+final Certificate[] c = new Certificate[certs.size()];
int i = certs.size();
-for (Ternary ct : certs) {
+for (final Ternary ct : certs) {
c[i - 1] = buildCertificate(ct.second());
i--;
}
ks.setKeyEntry(cert.first(),
buildPrivateKey(cert.third()), storePassword != null ?
storePassword.toCharArray() : null, c);
}
}
-ByteArrayOutputStream os = new ByteArrayOutputStream();
-ks.store(os, storePassword != null ? storePassword.toCharArray() :
null);
-os.close();
-return os.toByteArray();
+try (final ByteArrayOutputStream os = new ByteArrayOutputStream())
{
+ks.store(os, storePassword != null ?
storePassword.toCharArray() : null);
+return os.toByteArray();
+}
}
-public static KeyStore loadKeystore(byte[] ksData, String
storePassword) throws KeyStoreException, CertificateException,
NoSuchAlgorithmException, IOException {
-assert (ksData != null);
-KeyStore ks = KeyStore.getInstance("JKS");
-ks.load(new ByteArrayInputStream(ksData), storePassword != null ?
storePassword.toCharArray() : null);
+public static KeyStore loadKeystore(final byte[] ksData, final String
storePassword) throws KeyStoreException, CertificateException,
NoSuchAlgorithmException, IOException {
+assert ksData != null;
+final KeyStore ks = KeyStore.getInstance("JKS");
+try (final ByteArrayInputStream is = new
ByteArrayInputStream(ksData)) {
+ks.load(is, storePassword != null ?
storePassword.toCharArray() : null);
+}
return ks;
}
-public static KeyStore buildKeystore(String alias, String cert, String
privateKey, String storePassword) throws KeyStoreException,
CertificateException,
-NoSuchAlgorithmException, InvalidKeySpecException, IOException {
+
[GitHub] cloudstack pull request #1799: CLOUDSTACK-9632: Upgrade bouncy castle to ver...
Github user jburwell commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1799#discussion_r90311210
--- Diff:
utils/src/main/java/com/cloud/utils/security/CertificateHelper.java ---
@@ -40,123 +46,122 @@
import java.util.ArrayList;
import java.util.List;
-import com.cloud.utils.exception.CloudRuntimeException;
-import org.apache.commons.codec.binary.Base64;
-
-import com.cloud.utils.Ternary;
-import org.bouncycastle.openssl.PEMReader;
-
public class CertificateHelper {
-public static byte[] buildAndSaveKeystore(String alias, String cert,
String privateKey, String storePassword) throws KeyStoreException,
CertificateException,
-NoSuchAlgorithmException, InvalidKeySpecException, IOException {
-KeyStore ks = buildKeystore(alias, cert, privateKey,
storePassword);
-
-ByteArrayOutputStream os = new ByteArrayOutputStream();
-ks.store(os, storePassword != null ? storePassword.toCharArray() :
null);
-os.close();
-return os.toByteArray();
+public static byte[] buildAndSaveKeystore(final String alias, final
String cert, final String privateKey, final String storePassword) throws
KeyStoreException, CertificateException,
+NoSuchAlgorithmException, InvalidKeySpecException, IOException {
+final KeyStore ks = buildKeystore(alias, cert, privateKey,
storePassword);
+
+try (final ByteArrayOutputStream os = new ByteArrayOutputStream())
{
+ks.store(os, storePassword != null ?
storePassword.toCharArray() : null);
+return os.toByteArray();
+}
}
-public static byte[] buildAndSaveKeystore(List> certs, String storePassword) throws KeyStoreException,
NoSuchAlgorithmException,
-CertificateException, IOException, InvalidKeySpecException {
-KeyStore ks = KeyStore.getInstance("JKS");
+public static byte[] buildAndSaveKeystore(final List> certs, final String storePassword) throws KeyStoreException,
NoSuchAlgorithmException,
+CertificateException, IOException, InvalidKeySpecException {
+final KeyStore ks = KeyStore.getInstance("JKS");
ks.load(null, storePassword != null ? storePassword.toCharArray()
: null);
//name,cert,key
-for (Ternary cert : certs) {
+for (final Ternary cert : certs) {
if (cert.third() == null) {
-Certificate c = buildCertificate(cert.second());
+final Certificate c = buildCertificate(cert.second());
ks.setCertificateEntry(cert.first(), c);
} else {
-Certificate[] c = new Certificate[certs.size()];
+final Certificate[] c = new Certificate[certs.size()];
int i = certs.size();
-for (Ternary ct : certs) {
+for (final Ternary ct : certs) {
c[i - 1] = buildCertificate(ct.second());
i--;
}
ks.setKeyEntry(cert.first(),
buildPrivateKey(cert.third()), storePassword != null ?
storePassword.toCharArray() : null, c);
}
}
-ByteArrayOutputStream os = new ByteArrayOutputStream();
-ks.store(os, storePassword != null ? storePassword.toCharArray() :
null);
-os.close();
-return os.toByteArray();
+try (final ByteArrayOutputStream os = new ByteArrayOutputStream())
{
+ks.store(os, storePassword != null ?
storePassword.toCharArray() : null);
+return os.toByteArray();
+}
}
-public static KeyStore loadKeystore(byte[] ksData, String
storePassword) throws KeyStoreException, CertificateException,
NoSuchAlgorithmException, IOException {
-assert (ksData != null);
-KeyStore ks = KeyStore.getInstance("JKS");
-ks.load(new ByteArrayInputStream(ksData), storePassword != null ?
storePassword.toCharArray() : null);
+public static KeyStore loadKeystore(final byte[] ksData, final String
storePassword) throws KeyStoreException, CertificateException,
NoSuchAlgorithmException, IOException {
+assert ksData != null;
+final KeyStore ks = KeyStore.getInstance("JKS");
+try (final ByteArrayInputStream is = new
ByteArrayInputStream(ksData)) {
+ks.load(is, storePassword != null ?
storePassword.toCharArray() : null);
+}
return ks;
}
-public static KeyStore buildKeystore(String alias, String cert, String
privateKey, String storePassword) throws KeyStoreException,
CertificateException,
-NoSuchAlgorithmException, InvalidKeySpecException, IOException {
+
[GitHub] cloudstack pull request #1799: CLOUDSTACK-9632: Upgrade bouncy castle to ver...
Github user jburwell commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1799#discussion_r90310775
--- Diff:
utils/src/main/java/com/cloud/utils/security/CertificateHelper.java ---
@@ -40,123 +46,122 @@
import java.util.ArrayList;
import java.util.List;
-import com.cloud.utils.exception.CloudRuntimeException;
-import org.apache.commons.codec.binary.Base64;
-
-import com.cloud.utils.Ternary;
-import org.bouncycastle.openssl.PEMReader;
-
public class CertificateHelper {
-public static byte[] buildAndSaveKeystore(String alias, String cert,
String privateKey, String storePassword) throws KeyStoreException,
CertificateException,
-NoSuchAlgorithmException, InvalidKeySpecException, IOException {
-KeyStore ks = buildKeystore(alias, cert, privateKey,
storePassword);
-
-ByteArrayOutputStream os = new ByteArrayOutputStream();
-ks.store(os, storePassword != null ? storePassword.toCharArray() :
null);
-os.close();
-return os.toByteArray();
+public static byte[] buildAndSaveKeystore(final String alias, final
String cert, final String privateKey, final String storePassword) throws
KeyStoreException, CertificateException,
+NoSuchAlgorithmException, InvalidKeySpecException, IOException {
+final KeyStore ks = buildKeystore(alias, cert, privateKey,
storePassword);
+
+try (final ByteArrayOutputStream os = new ByteArrayOutputStream())
{
+ks.store(os, storePassword != null ?
storePassword.toCharArray() : null);
+return os.toByteArray();
+}
}
-public static byte[] buildAndSaveKeystore(List> certs, String storePassword) throws KeyStoreException,
NoSuchAlgorithmException,
-CertificateException, IOException, InvalidKeySpecException {
-KeyStore ks = KeyStore.getInstance("JKS");
+public static byte[] buildAndSaveKeystore(final List> certs, final String storePassword) throws KeyStoreException,
NoSuchAlgorithmException,
+CertificateException, IOException, InvalidKeySpecException {
+final KeyStore ks = KeyStore.getInstance("JKS");
ks.load(null, storePassword != null ? storePassword.toCharArray()
: null);
//name,cert,key
-for (Ternary cert : certs) {
+for (final Ternary cert : certs) {
if (cert.third() == null) {
-Certificate c = buildCertificate(cert.second());
+final Certificate c = buildCertificate(cert.second());
ks.setCertificateEntry(cert.first(), c);
} else {
-Certificate[] c = new Certificate[certs.size()];
+final Certificate[] c = new Certificate[certs.size()];
int i = certs.size();
-for (Ternary ct : certs) {
+for (final Ternary ct : certs) {
c[i - 1] = buildCertificate(ct.second());
i--;
}
ks.setKeyEntry(cert.first(),
buildPrivateKey(cert.third()), storePassword != null ?
storePassword.toCharArray() : null, c);
}
}
-ByteArrayOutputStream os = new ByteArrayOutputStream();
-ks.store(os, storePassword != null ? storePassword.toCharArray() :
null);
-os.close();
-return os.toByteArray();
+try (final ByteArrayOutputStream os = new ByteArrayOutputStream())
{
+ks.store(os, storePassword != null ?
storePassword.toCharArray() : null);
+return os.toByteArray();
+}
}
-public static KeyStore loadKeystore(byte[] ksData, String
storePassword) throws KeyStoreException, CertificateException,
NoSuchAlgorithmException, IOException {
-assert (ksData != null);
-KeyStore ks = KeyStore.getInstance("JKS");
-ks.load(new ByteArrayInputStream(ksData), storePassword != null ?
storePassword.toCharArray() : null);
+public static KeyStore loadKeystore(final byte[] ksData, final String
storePassword) throws KeyStoreException, CertificateException,
NoSuchAlgorithmException, IOException {
+assert ksData != null;
+final KeyStore ks = KeyStore.getInstance("JKS");
+try (final ByteArrayInputStream is = new
ByteArrayInputStream(ksData)) {
+ks.load(is, storePassword != null ?
storePassword.toCharArray() : null);
+}
return ks;
}
-public static KeyStore buildKeystore(String alias, String cert, String
privateKey, String storePassword) throws KeyStoreException,
CertificateException,
-NoSuchAlgorithmException, InvalidKeySpecException, IOException {
+
[GitHub] cloudstack pull request #1799: CLOUDSTACK-9632: Upgrade bouncy castle to ver...
Github user jburwell commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1799#discussion_r90314781
--- Diff: server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
---
@@ -226,14 +226,14 @@ public void runUploadSslCertSelfSignedNoPassword()
throws Exception {
when(certService._accountDao.findByIdIncludingRemoved(anyLong())).thenReturn((AccountVO)account);
//creating the command
-UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
-Class _class = uploadCmd.getClass().getSuperclass();
+final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
+final Class klazz = uploadCmd.getClass().getSuperclass();
-Field certField = _class.getDeclaredField("cert");
+final Field certField = klazz.getDeclaredField("cert");
certField.setAccessible(true);
certField.set(uploadCmd, cert);
-Field keyField = _class.getDeclaredField("key");
+final Field keyField = klazz.getDeclaredField("key");
keyField.setAccessible(true);
keyField.set(uploadCmd, key);
--- End diff --
This method has not assertions to verify the correctness of
`certService.uploadSslCert`. Please consider adding such assertions.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request #1799: CLOUDSTACK-9632: Upgrade bouncy castle to ver...
Github user jburwell commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1799#discussion_r90310643
--- Diff:
utils/src/main/java/com/cloud/utils/security/CertificateHelper.java ---
@@ -40,123 +46,122 @@
import java.util.ArrayList;
import java.util.List;
-import com.cloud.utils.exception.CloudRuntimeException;
-import org.apache.commons.codec.binary.Base64;
-
-import com.cloud.utils.Ternary;
-import org.bouncycastle.openssl.PEMReader;
-
public class CertificateHelper {
-public static byte[] buildAndSaveKeystore(String alias, String cert,
String privateKey, String storePassword) throws KeyStoreException,
CertificateException,
-NoSuchAlgorithmException, InvalidKeySpecException, IOException {
-KeyStore ks = buildKeystore(alias, cert, privateKey,
storePassword);
-
-ByteArrayOutputStream os = new ByteArrayOutputStream();
-ks.store(os, storePassword != null ? storePassword.toCharArray() :
null);
-os.close();
-return os.toByteArray();
+public static byte[] buildAndSaveKeystore(final String alias, final
String cert, final String privateKey, final String storePassword) throws
KeyStoreException, CertificateException,
+NoSuchAlgorithmException, InvalidKeySpecException, IOException {
+final KeyStore ks = buildKeystore(alias, cert, privateKey,
storePassword);
+
+try (final ByteArrayOutputStream os = new ByteArrayOutputStream())
{
+ks.store(os, storePassword != null ?
storePassword.toCharArray() : null);
+return os.toByteArray();
+}
}
-public static byte[] buildAndSaveKeystore(List> certs, String storePassword) throws KeyStoreException,
NoSuchAlgorithmException,
-CertificateException, IOException, InvalidKeySpecException {
-KeyStore ks = KeyStore.getInstance("JKS");
+public static byte[] buildAndSaveKeystore(final List> certs, final String storePassword) throws KeyStoreException,
NoSuchAlgorithmException,
+CertificateException, IOException, InvalidKeySpecException {
+final KeyStore ks = KeyStore.getInstance("JKS");
ks.load(null, storePassword != null ? storePassword.toCharArray()
: null);
//name,cert,key
-for (Ternary cert : certs) {
+for (final Ternary cert : certs) {
if (cert.third() == null) {
-Certificate c = buildCertificate(cert.second());
+final Certificate c = buildCertificate(cert.second());
ks.setCertificateEntry(cert.first(), c);
} else {
-Certificate[] c = new Certificate[certs.size()];
+final Certificate[] c = new Certificate[certs.size()];
int i = certs.size();
-for (Ternary ct : certs) {
+for (final Ternary ct : certs) {
c[i - 1] = buildCertificate(ct.second());
i--;
}
ks.setKeyEntry(cert.first(),
buildPrivateKey(cert.third()), storePassword != null ?
storePassword.toCharArray() : null, c);
}
}
-ByteArrayOutputStream os = new ByteArrayOutputStream();
-ks.store(os, storePassword != null ? storePassword.toCharArray() :
null);
-os.close();
-return os.toByteArray();
+try (final ByteArrayOutputStream os = new ByteArrayOutputStream())
{
+ks.store(os, storePassword != null ?
storePassword.toCharArray() : null);
+return os.toByteArray();
+}
}
-public static KeyStore loadKeystore(byte[] ksData, String
storePassword) throws KeyStoreException, CertificateException,
NoSuchAlgorithmException, IOException {
-assert (ksData != null);
-KeyStore ks = KeyStore.getInstance("JKS");
-ks.load(new ByteArrayInputStream(ksData), storePassword != null ?
storePassword.toCharArray() : null);
+public static KeyStore loadKeystore(final byte[] ksData, final String
storePassword) throws KeyStoreException, CertificateException,
NoSuchAlgorithmException, IOException {
+assert ksData != null;
+final KeyStore ks = KeyStore.getInstance("JKS");
+try (final ByteArrayInputStream is = new
ByteArrayInputStream(ksData)) {
+ks.load(is, storePassword != null ?
storePassword.toCharArray() : null);
+}
return ks;
}
-public static KeyStore buildKeystore(String alias, String cert, String
privateKey, String storePassword) throws KeyStoreException,
CertificateException,
-NoSuchAlgorithmException, InvalidKeySpecException, IOException {
+
[GitHub] cloudstack pull request #1799: CLOUDSTACK-9632: Upgrade bouncy castle to ver...
Github user jburwell commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1799#discussion_r90314765
--- Diff: server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
---
@@ -176,18 +176,18 @@ public void runUploadSslCertSelfSignedWithPassword()
throws Exception {
when(certService._accountDao.findByIdIncludingRemoved(anyLong())).thenReturn((AccountVO)account);
//creating the command
-UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
-Class _class = uploadCmd.getClass().getSuperclass();
+final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
+final Class klazz = uploadCmd.getClass().getSuperclass();
-Field certField = _class.getDeclaredField("cert");
+final Field certField = klazz.getDeclaredField("cert");
certField.setAccessible(true);
certField.set(uploadCmd, cert);
-Field keyField = _class.getDeclaredField("key");
+final Field keyField = klazz.getDeclaredField("key");
keyField.setAccessible(true);
keyField.set(uploadCmd, key);
-Field passField = _class.getDeclaredField("password");
+final Field passField = klazz.getDeclaredField("password");
passField.setAccessible(true);
passField.set(uploadCmd, password);
--- End diff --
This method has not assertions to verify the correctness of
`certService.uploadSslCert`. Please consider adding such assertions.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request #1799: CLOUDSTACK-9632: Upgrade bouncy castle to ver...
Github user jburwell commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1799#discussion_r90312334
--- Diff:
utils/src/main/java/com/cloud/utils/security/CertificateHelper.java ---
@@ -40,123 +46,122 @@
import java.util.ArrayList;
import java.util.List;
-import com.cloud.utils.exception.CloudRuntimeException;
-import org.apache.commons.codec.binary.Base64;
-
-import com.cloud.utils.Ternary;
-import org.bouncycastle.openssl.PEMReader;
-
public class CertificateHelper {
-public static byte[] buildAndSaveKeystore(String alias, String cert,
String privateKey, String storePassword) throws KeyStoreException,
CertificateException,
-NoSuchAlgorithmException, InvalidKeySpecException, IOException {
-KeyStore ks = buildKeystore(alias, cert, privateKey,
storePassword);
-
-ByteArrayOutputStream os = new ByteArrayOutputStream();
-ks.store(os, storePassword != null ? storePassword.toCharArray() :
null);
-os.close();
-return os.toByteArray();
+public static byte[] buildAndSaveKeystore(final String alias, final
String cert, final String privateKey, final String storePassword) throws
KeyStoreException, CertificateException,
+NoSuchAlgorithmException, InvalidKeySpecException, IOException {
+final KeyStore ks = buildKeystore(alias, cert, privateKey,
storePassword);
+
+try (final ByteArrayOutputStream os = new ByteArrayOutputStream())
{
+ks.store(os, storePassword != null ?
storePassword.toCharArray() : null);
+return os.toByteArray();
+}
}
-public static byte[] buildAndSaveKeystore(List> certs, String storePassword) throws KeyStoreException,
NoSuchAlgorithmException,
-CertificateException, IOException, InvalidKeySpecException {
-KeyStore ks = KeyStore.getInstance("JKS");
+public static byte[] buildAndSaveKeystore(final List> certs, final String storePassword) throws KeyStoreException,
NoSuchAlgorithmException,
+CertificateException, IOException, InvalidKeySpecException {
+final KeyStore ks = KeyStore.getInstance("JKS");
ks.load(null, storePassword != null ? storePassword.toCharArray()
: null);
//name,cert,key
-for (Ternary cert : certs) {
+for (final Ternary cert : certs) {
if (cert.third() == null) {
-Certificate c = buildCertificate(cert.second());
+final Certificate c = buildCertificate(cert.second());
ks.setCertificateEntry(cert.first(), c);
} else {
-Certificate[] c = new Certificate[certs.size()];
+final Certificate[] c = new Certificate[certs.size()];
int i = certs.size();
-for (Ternary ct : certs) {
+for (final Ternary ct : certs) {
c[i - 1] = buildCertificate(ct.second());
i--;
}
ks.setKeyEntry(cert.first(),
buildPrivateKey(cert.third()), storePassword != null ?
storePassword.toCharArray() : null, c);
}
}
-ByteArrayOutputStream os = new ByteArrayOutputStream();
-ks.store(os, storePassword != null ? storePassword.toCharArray() :
null);
-os.close();
-return os.toByteArray();
+try (final ByteArrayOutputStream os = new ByteArrayOutputStream())
{
+ks.store(os, storePassword != null ?
storePassword.toCharArray() : null);
+return os.toByteArray();
+}
}
-public static KeyStore loadKeystore(byte[] ksData, String
storePassword) throws KeyStoreException, CertificateException,
NoSuchAlgorithmException, IOException {
-assert (ksData != null);
-KeyStore ks = KeyStore.getInstance("JKS");
-ks.load(new ByteArrayInputStream(ksData), storePassword != null ?
storePassword.toCharArray() : null);
+public static KeyStore loadKeystore(final byte[] ksData, final String
storePassword) throws KeyStoreException, CertificateException,
NoSuchAlgorithmException, IOException {
+assert ksData != null;
+final KeyStore ks = KeyStore.getInstance("JKS");
+try (final ByteArrayInputStream is = new
ByteArrayInputStream(ksData)) {
+ks.load(is, storePassword != null ?
storePassword.toCharArray() : null);
+}
return ks;
}
-public static KeyStore buildKeystore(String alias, String cert, String
privateKey, String storePassword) throws KeyStoreException,
CertificateException,
-NoSuchAlgorithmException, InvalidKeySpecException, IOException {
+
[GitHub] cloudstack pull request #1799: CLOUDSTACK-9632: Upgrade bouncy castle to ver...
Github user jburwell commented on a diff in the pull request: https://github.com/apache/cloudstack/pull/1799#discussion_r90338915 --- Diff: server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java --- @@ -339,190 +348,182 @@ public SslCertResponse createCertResponse(SslCertVO cert, List
[GitHub] cloudstack pull request #1799: CLOUDSTACK-9632: Upgrade bouncy castle to ver...
Github user jburwell commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1799#discussion_r90315376
--- Diff: server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
---
@@ -111,37 +116,37 @@ public CertServiceImpl() {
@DB
@Override
@ActionEvent(eventType = EventTypes.EVENT_LB_CERT_UPLOAD,
eventDescription = "Uploading a certificate to cloudstack", async = false)
-public SslCertResponse uploadSslCert(UploadSslCertCmd certCmd) {
+public SslCertResponse uploadSslCert(final UploadSslCertCmd certCmd) {
try {
-String cert = certCmd.getCert();
-String key = certCmd.getKey();
-String password = certCmd.getPassword();
-String chain = certCmd.getChain();
+final String cert = certCmd.getCert();
+final String key = certCmd.getKey();
+final String password = certCmd.getPassword();
+final String chain = certCmd.getChain();
validate(cert, key, password, chain);
s_logger.debug("Certificate Validation succeeded");
-String fingerPrint =
generateFingerPrint(parseCertificate(cert));
+final String fingerPrint =
generateFingerPrint(parseCertificate(cert));
-CallContext ctx = CallContext.current();
-Account caller = ctx.getCallingAccount();
+final CallContext ctx = CallContext.current();
+final Account caller = ctx.getCallingAccount();
Account owner = null;
-if ((certCmd.getAccountName() != null && certCmd.getDomainId()
!= null) || certCmd.getProjectId() != null) {
+if (certCmd.getAccountName() != null && certCmd.getDomainId()
!= null || certCmd.getProjectId() != null) {
owner = _accountMgr.finalizeOwner(caller,
certCmd.getAccountName(), certCmd.getDomainId(), certCmd.getProjectId());
} else {
owner = caller;
}
-Long accountId = owner.getId();
-Long domainId = owner.getDomainId();
+final Long accountId = owner.getId();
+final Long domainId = owner.getDomainId();
-SslCertVO certVO = new SslCertVO(cert, key, password, chain,
accountId, domainId, fingerPrint);
+final SslCertVO certVO = new SslCertVO(cert, key, password,
chain, accountId, domainId, fingerPrint);
_sslCertDao.persist(certVO);
return createCertResponse(certVO, null);
-} catch (Exception e) {
+} catch (final Exception e) {
--- End diff --
Why are we catching all checked and unchecked exceptions here? Wrapping
unchecked exceptions in `CloudRuntimeException` seems to add a layer
indirection without adding value.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request #1799: CLOUDSTACK-9632: Upgrade bouncy castle to ver...
Github user jburwell commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1799#discussion_r90338636
--- Diff: server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
---
@@ -240,68 +245,71 @@ public void deleteSslCert(DeleteSslCertCmd
deleteSslCertCmd) {
}
if (projectId != null) {
-Project project = _projectMgr.getProject(projectId);
+final Project project = _projectMgr.getProject(projectId);
if (project == null) {
throw new InvalidParameterValueException("Found no project
with id: " + projectId);
}
-List projectCertVOList =
_sslCertDao.listByAccountId(project.getProjectAccountId());
-if (projectCertVOList == null || projectCertVOList.isEmpty())
+final List projectCertVOList =
_sslCertDao.listByAccountId(project.getProjectAccountId());
+if (projectCertVOList == null || projectCertVOList.isEmpty()) {
return certResponseList;
+}
_accountMgr.checkAccess(caller,
SecurityChecker.AccessType.UseEntry, true, projectCertVOList.get(0));
-for (SslCertVO cert : projectCertVOList) {
+for (final SslCertVO cert : projectCertVOList) {
certLbMap = _lbCertDao.listByCertId(cert.getId());
certResponseList.add(createCertResponse(cert, certLbMap));
}
return certResponseList;
}
//reached here look by accountId
-List certVOList =
_sslCertDao.listByAccountId(accountId);
-if (certVOList == null || certVOList.isEmpty())
+final List certVOList =
_sslCertDao.listByAccountId(accountId);
+if (certVOList == null || certVOList.isEmpty()) {
return certResponseList;
+}
_accountMgr.checkAccess(caller,
SecurityChecker.AccessType.UseEntry, true, certVOList.get(0));
-for (SslCertVO cert : certVOList) {
+for (final SslCertVO cert : certVOList) {
certLbMap = _lbCertDao.listByCertId(cert.getId());
certResponseList.add(createCertResponse(cert, certLbMap));
}
return certResponseList;
}
-private void validate(String certInput, String keyInput, String
password, String chainInput) {
+private void validate(final String certInput, final String keyInput,
final String password, final String chainInput) {
Certificate cert;
PrivateKey key;
List chain = null;
try {
cert = parseCertificate(certInput);
-key = parsePrivateKey(keyInput, password);
+key = parsePrivateKey(keyInput);
if (chainInput != null) {
-chain = parseChain(chainInput);
+chain = CertificateHelper.parseChain(chainInput);
}
-} catch (IOException e) {
+} catch (final IOException | CertificateException e) {
throw new IllegalArgumentException("Parsing certificate/key
failed: " + e.getMessage(), e);
}
validateCert(cert, chainInput != null ? true : false);
validateKeys(cert.getPublicKey(), key);
-if (chainInput != null)
+if (chainInput != null) {
validateChain(chain, cert);
+}
}
-public SslCertResponse createCertResponse(SslCertVO cert,
List lbCertMap) {
-SslCertResponse response = new SslCertResponse();
+public SslCertResponse createCertResponse(final SslCertVO cert, final
List lbCertMap) {
--- End diff --
Please consider adding the following `Preconditions.checkArgument` checks:
* `cert` is not `null`
* `lbCertMap` is not `null`
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request #1799: CLOUDSTACK-9632: Upgrade bouncy castle to ver...
Github user jburwell commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1799#discussion_r90315448
--- Diff: server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
---
@@ -150,26 +155,26 @@ public SslCertResponse uploadSslCert(UploadSslCertCmd
certCmd) {
@DB
@Override
@ActionEvent(eventType = EventTypes.EVENT_LB_CERT_DELETE,
eventDescription = "Deleting a certificate to cloudstack", async = false)
-public void deleteSslCert(DeleteSslCertCmd deleteSslCertCmd) {
+public void deleteSslCert(final DeleteSslCertCmd deleteSslCertCmd) {
--- End diff --
Please consider adding a `Preconditions.checkArgument` to check that
`deleteSslCertCmd` is not null.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request #1799: CLOUDSTACK-9632: Upgrade bouncy castle to ver...
Github user jburwell commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1799#discussion_r90312936
--- Diff:
utils/src/main/java/com/cloud/utils/security/CertificateHelper.java ---
@@ -40,123 +46,122 @@
import java.util.ArrayList;
import java.util.List;
-import com.cloud.utils.exception.CloudRuntimeException;
-import org.apache.commons.codec.binary.Base64;
-
-import com.cloud.utils.Ternary;
-import org.bouncycastle.openssl.PEMReader;
-
public class CertificateHelper {
-public static byte[] buildAndSaveKeystore(String alias, String cert,
String privateKey, String storePassword) throws KeyStoreException,
CertificateException,
-NoSuchAlgorithmException, InvalidKeySpecException, IOException {
-KeyStore ks = buildKeystore(alias, cert, privateKey,
storePassword);
-
-ByteArrayOutputStream os = new ByteArrayOutputStream();
-ks.store(os, storePassword != null ? storePassword.toCharArray() :
null);
-os.close();
-return os.toByteArray();
+public static byte[] buildAndSaveKeystore(final String alias, final
String cert, final String privateKey, final String storePassword) throws
KeyStoreException, CertificateException,
+NoSuchAlgorithmException, InvalidKeySpecException, IOException {
--- End diff --
Please consider adding the following `Preconditions.checkArgument` checks:
* `alias` is not blank
* `cert` is not blank
* `privateKey` is not blank
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request #1799: CLOUDSTACK-9632: Upgrade bouncy castle to ver...
Github user jburwell commented on a diff in the pull request: https://github.com/apache/cloudstack/pull/1799#discussion_r90340246 --- Diff: server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java --- @@ -339,190 +348,182 @@ public SslCertResponse createCertResponse(SslCertVO cert, List
[GitHub] cloudstack pull request #1799: CLOUDSTACK-9632: Upgrade bouncy castle to ver...
Github user jburwell commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1799#discussion_r90312667
--- Diff:
utils/src/main/java/com/cloud/utils/security/CertificateHelper.java ---
@@ -40,123 +46,122 @@
import java.util.ArrayList;
import java.util.List;
-import com.cloud.utils.exception.CloudRuntimeException;
-import org.apache.commons.codec.binary.Base64;
-
-import com.cloud.utils.Ternary;
-import org.bouncycastle.openssl.PEMReader;
-
public class CertificateHelper {
-public static byte[] buildAndSaveKeystore(String alias, String cert,
String privateKey, String storePassword) throws KeyStoreException,
CertificateException,
-NoSuchAlgorithmException, InvalidKeySpecException, IOException {
-KeyStore ks = buildKeystore(alias, cert, privateKey,
storePassword);
-
-ByteArrayOutputStream os = new ByteArrayOutputStream();
-ks.store(os, storePassword != null ? storePassword.toCharArray() :
null);
-os.close();
-return os.toByteArray();
+public static byte[] buildAndSaveKeystore(final String alias, final
String cert, final String privateKey, final String storePassword) throws
KeyStoreException, CertificateException,
+NoSuchAlgorithmException, InvalidKeySpecException, IOException {
+final KeyStore ks = buildKeystore(alias, cert, privateKey,
storePassword);
+
+try (final ByteArrayOutputStream os = new ByteArrayOutputStream())
{
+ks.store(os, storePassword != null ?
storePassword.toCharArray() : null);
+return os.toByteArray();
+}
}
-public static byte[] buildAndSaveKeystore(List> certs, String storePassword) throws KeyStoreException,
NoSuchAlgorithmException,
-CertificateException, IOException, InvalidKeySpecException {
-KeyStore ks = KeyStore.getInstance("JKS");
+public static byte[] buildAndSaveKeystore(final List> certs, final String storePassword) throws KeyStoreException,
NoSuchAlgorithmException,
--- End diff --
Please consider adding a `Preconditions.checkArgument` to check that
`certs` is not `null`.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request #1799: CLOUDSTACK-9632: Upgrade bouncy castle to ver...
Github user jburwell commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1799#discussion_r90314823
--- Diff: server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
---
@@ -125,48 +125,48 @@ public void runUploadSslCertWithCAChain() throws
Exception {
when(certService._accountDao.findByIdIncludingRemoved(anyLong())).thenReturn((AccountVO)account);
//creating the command
-UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
-Class _class = uploadCmd.getClass().getSuperclass();
+final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
+final Class klazz = uploadCmd.getClass().getSuperclass();
-Field certField = _class.getDeclaredField("cert");
+final Field certField = klazz.getDeclaredField("cert");
certField.setAccessible(true);
certField.set(uploadCmd, cert);
-Field keyField = _class.getDeclaredField("key");
+final Field keyField = klazz.getDeclaredField("key");
keyField.setAccessible(true);
keyField.set(uploadCmd, key);
-Field chainField = _class.getDeclaredField("chain");
+final Field chainField = klazz.getDeclaredField("chain");
chainField.setAccessible(true);
chainField.set(uploadCmd, chain);
--- End diff --
This method has not assertions to verify the correctness of
`certService.uploadSslCert`. Please consider adding such assertions.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request #1799: CLOUDSTACK-9632: Upgrade bouncy castle to ver...
Github user jburwell commented on a diff in the pull request: https://github.com/apache/cloudstack/pull/1799#discussion_r90339460 --- Diff: server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java --- @@ -339,190 +348,182 @@ public SslCertResponse createCertResponse(SslCertVO cert, List
[GitHub] cloudstack pull request #1799: CLOUDSTACK-9632: Upgrade bouncy castle to ver...
Github user jburwell commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1799#discussion_r90313790
--- Diff: server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
---
@@ -245,48 +245,48 @@ public void runUploadSslCertSelfSignedNoPassword()
throws Exception {
public void runUploadSslCertBadChain() throws IOException,
IllegalAccessException, NoSuchFieldException {
Assume.assumeTrue(isOpenJdk() || isJCEInstalled());
-String certFile =
URLDecoder.decode(getClass().getResource("/certs/rsa_ca_signed.crt").getFile(),Charset.defaultCharset().name());
-String keyFile =
URLDecoder.decode(getClass().getResource("/certs/rsa_ca_signed.key").getFile(),Charset.defaultCharset().name());
-String chainFile =
URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed.crt").getFile(),Charset.defaultCharset().name());
+final String certFile =
URLDecoder.decode(getClass().getResource("/certs/rsa_ca_signed.crt").getFile(),Charset.defaultCharset().name());
+final String keyFile =
URLDecoder.decode(getClass().getResource("/certs/rsa_ca_signed.key").getFile(),Charset.defaultCharset().name());
+final String chainFile =
URLDecoder.decode(getClass().getResource("/certs/rsa_self_signed.crt").getFile(),Charset.defaultCharset().name());
-String cert = readFileToString(new File(certFile));
-String key = readFileToString(new File(keyFile));
-String chain = readFileToString(new File(chainFile));
+final String cert = readFileToString(new File(certFile));
+final String key = readFileToString(new File(keyFile));
+final String chain = readFileToString(new File(chainFile));
-CertServiceImpl certService = new CertServiceImpl();
+final CertServiceImpl certService = new CertServiceImpl();
//setting mock objects
certService._accountMgr = Mockito.mock(AccountManager.class);
-Account account = new AccountVO("testaccount", 1, "networkdomain",
(short)0, UUID.randomUUID().toString());
+final Account account = new AccountVO("testaccount", 1,
"networkdomain", (short)0, UUID.randomUUID().toString());
when(certService._accountMgr.getAccount(anyLong())).thenReturn(account);
certService._domainDao = Mockito.mock(DomainDao.class);
-DomainVO domain = new DomainVO("networkdomain", 1L, 1L,
"networkdomain");
+final DomainVO domain = new DomainVO("networkdomain", 1L, 1L,
"networkdomain");
when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain);
certService._sslCertDao = Mockito.mock(SslCertDao.class);
when(certService._sslCertDao.persist(any(SslCertVO.class))).thenReturn(new
SslCertVO());
//creating the command
-UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
-Class _class = uploadCmd.getClass().getSuperclass();
+final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn();
+final Class klazz = uploadCmd.getClass().getSuperclass();
-Field certField = _class.getDeclaredField("cert");
+final Field certField = klazz.getDeclaredField("cert");
certField.setAccessible(true);
certField.set(uploadCmd, cert);
-Field keyField = _class.getDeclaredField("key");
+final Field keyField = klazz.getDeclaredField("key");
keyField.setAccessible(true);
keyField.set(uploadCmd, key);
-Field chainField = _class.getDeclaredField("chain");
+final Field chainField = klazz.getDeclaredField("chain");
chainField.setAccessible(true);
chainField.set(uploadCmd, chain);
try {
certService.uploadSslCert(uploadCmd);
fail("The chain given is not the correct chain for the
certificate");
-} catch (Exception e) {
+} catch (final Exception e) {
--- End diff --
Please consider refactoring this method to use `@Test(expected)` to
eliminate this `try-catch` block.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request #1799: CLOUDSTACK-9632: Upgrade bouncy castle to ver...
Github user jburwell commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1799#discussion_r90315176
--- Diff: server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
---
@@ -111,37 +116,37 @@ public CertServiceImpl() {
@DB
@Override
@ActionEvent(eventType = EventTypes.EVENT_LB_CERT_UPLOAD,
eventDescription = "Uploading a certificate to cloudstack", async = false)
-public SslCertResponse uploadSslCert(UploadSslCertCmd certCmd) {
+public SslCertResponse uploadSslCert(final UploadSslCertCmd certCmd) {
try {
-String cert = certCmd.getCert();
-String key = certCmd.getKey();
-String password = certCmd.getPassword();
-String chain = certCmd.getChain();
+final String cert = certCmd.getCert();
+final String key = certCmd.getKey();
+final String password = certCmd.getPassword();
+final String chain = certCmd.getChain();
validate(cert, key, password, chain);
s_logger.debug("Certificate Validation succeeded");
-String fingerPrint =
generateFingerPrint(parseCertificate(cert));
+final String fingerPrint =
generateFingerPrint(parseCertificate(cert));
-CallContext ctx = CallContext.current();
-Account caller = ctx.getCallingAccount();
+final CallContext ctx = CallContext.current();
+final Account caller = ctx.getCallingAccount();
Account owner = null;
-if ((certCmd.getAccountName() != null && certCmd.getDomainId()
!= null) || certCmd.getProjectId() != null) {
+if (certCmd.getAccountName() != null && certCmd.getDomainId()
!= null || certCmd.getProjectId() != null) {
--- End diff --
Should `certCmd.getAccountName()` be checked that is not blank?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request #1799: CLOUDSTACK-9632: Upgrade bouncy castle to ver...
Github user jburwell commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1799#discussion_r90309869
--- Diff:
utils/src/main/java/com/cloud/utils/security/CertificateHelper.java ---
@@ -40,123 +46,122 @@
import java.util.ArrayList;
import java.util.List;
-import com.cloud.utils.exception.CloudRuntimeException;
-import org.apache.commons.codec.binary.Base64;
-
-import com.cloud.utils.Ternary;
-import org.bouncycastle.openssl.PEMReader;
-
public class CertificateHelper {
-public static byte[] buildAndSaveKeystore(String alias, String cert,
String privateKey, String storePassword) throws KeyStoreException,
CertificateException,
-NoSuchAlgorithmException, InvalidKeySpecException, IOException {
-KeyStore ks = buildKeystore(alias, cert, privateKey,
storePassword);
-
-ByteArrayOutputStream os = new ByteArrayOutputStream();
-ks.store(os, storePassword != null ? storePassword.toCharArray() :
null);
-os.close();
-return os.toByteArray();
+public static byte[] buildAndSaveKeystore(final String alias, final
String cert, final String privateKey, final String storePassword) throws
KeyStoreException, CertificateException,
+NoSuchAlgorithmException, InvalidKeySpecException, IOException {
+final KeyStore ks = buildKeystore(alias, cert, privateKey,
storePassword);
+
+try (final ByteArrayOutputStream os = new ByteArrayOutputStream())
{
+ks.store(os, storePassword != null ?
storePassword.toCharArray() : null);
+return os.toByteArray();
+}
}
-public static byte[] buildAndSaveKeystore(List> certs, String storePassword) throws KeyStoreException,
NoSuchAlgorithmException,
-CertificateException, IOException, InvalidKeySpecException {
-KeyStore ks = KeyStore.getInstance("JKS");
+public static byte[] buildAndSaveKeystore(final List> certs, final String storePassword) throws KeyStoreException,
NoSuchAlgorithmException,
+CertificateException, IOException, InvalidKeySpecException {
+final KeyStore ks = KeyStore.getInstance("JKS");
ks.load(null, storePassword != null ? storePassword.toCharArray()
: null);
//name,cert,key
-for (Ternary cert : certs) {
+for (final Ternary cert : certs) {
if (cert.third() == null) {
-Certificate c = buildCertificate(cert.second());
+final Certificate c = buildCertificate(cert.second());
ks.setCertificateEntry(cert.first(), c);
} else {
-Certificate[] c = new Certificate[certs.size()];
+final Certificate[] c = new Certificate[certs.size()];
int i = certs.size();
-for (Ternary ct : certs) {
+for (final Ternary ct : certs) {
c[i - 1] = buildCertificate(ct.second());
i--;
}
ks.setKeyEntry(cert.first(),
buildPrivateKey(cert.third()), storePassword != null ?
storePassword.toCharArray() : null, c);
}
}
-ByteArrayOutputStream os = new ByteArrayOutputStream();
-ks.store(os, storePassword != null ? storePassword.toCharArray() :
null);
-os.close();
-return os.toByteArray();
+try (final ByteArrayOutputStream os = new ByteArrayOutputStream())
{
+ks.store(os, storePassword != null ?
storePassword.toCharArray() : null);
+return os.toByteArray();
+}
}
-public static KeyStore loadKeystore(byte[] ksData, String
storePassword) throws KeyStoreException, CertificateException,
NoSuchAlgorithmException, IOException {
-assert (ksData != null);
-KeyStore ks = KeyStore.getInstance("JKS");
-ks.load(new ByteArrayInputStream(ksData), storePassword != null ?
storePassword.toCharArray() : null);
+public static KeyStore loadKeystore(final byte[] ksData, final String
storePassword) throws KeyStoreException, CertificateException,
NoSuchAlgorithmException, IOException {
+assert ksData != null;
--- End diff --
Since we don't usually run with assertions enabled, please consider
converting `assert` to `Preconditions.checkArgument`.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
