[GitHub] blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes
blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes URL: https://github.com/apache/cloudstack/pull/2616#issuecomment-386502609 Trillian test result (tid-2594) Environment: vmware-65 (x2), Advanced Networking with Mgmt server 7 Total time taken: 26575 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2616-t2594-vmware-65.zip Intermitten failure detected: /marvin/tests/smoke/test_router_dhcphosts.py Smoke tests completed. 67 look OK, 0 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2621: Backports for 4.11 branch
blueorangutan commented on issue #2621: Backports for 4.11 branch URL: https://github.com/apache/cloudstack/pull/2621#issuecomment-386498228 Trillian test result (tid-2587) Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7 Total time taken: 52791 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2621-t2587-kvm-centos7.zip Intermitten failure detected: /marvin/tests/smoke/test_internal_lb.py Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py Intermitten failure detected: /marvin/tests/smoke/test_public_ip_range.py Intermitten failure detected: /marvin/tests/smoke/test_routers_network_ops.py Intermitten failure detected: /marvin/tests/smoke/test_templates.py Intermitten failure detected: /marvin/tests/smoke/test_usage.py Intermitten failure detected: /marvin/tests/smoke/test_volumes.py Intermitten failure detected: /marvin/tests/smoke/test_hostha_kvm.py Smoke tests completed. 61 look OK, 6 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_01_internallb_roundrobin_1VPC_3VM_HTTP_port80 | `Failure` | 334.26 | test_internal_lb.py test_03_vpc_internallb_haproxy_stats_on_all_interfaces | `Error` | 285.76 | test_internal_lb.py test_04_rvpc_internallb_haproxy_stats_on_all_interfaces | `Error` | 637.73 | test_internal_lb.py test_04_rvpc_privategw_static_routes | `Failure` | 413.73 | test_privategw_acl.py test_04_extract_template | `Failure` | 128.28 | test_templates.py ContextSuite context=TestISOUsage>:setup | `Error` | 0.00 | test_usage.py test_06_download_detached_volume | `Failure` | 138.56 | test_volumes.py test_hostha_enable_ha_when_host_in_maintenance | `Error` | 2.44 | test_hostha_kvm.py This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes
blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes URL: https://github.com/apache/cloudstack/pull/2616#issuecomment-386497971 Trillian test result (tid-2592) Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 6 Total time taken: 23370 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2616-t2592-xenserver-71.zip Intermitten failure detected: /marvin/tests/smoke/test_certauthority_root.py Intermitten failure detected: /marvin/tests/smoke/test_dynamicroles.py Intermitten failure detected: /marvin/tests/smoke/test_hostha_simulator.py Intermitten failure detected: /marvin/tests/smoke/test_login.py Intermitten failure detected: /marvin/tests/smoke/test_outofbandmanagement_nestedplugin.py Intermitten failure detected: /marvin/tests/smoke/test_outofbandmanagement.py Intermitten failure detected: /marvin/tests/smoke/test_primary_storage.py Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py Intermitten failure detected: /marvin/tests/smoke/test_snapshots.py Intermitten failure detected: /marvin/tests/smoke/test_templates.py Intermitten failure detected: /marvin/tests/smoke/test_usage.py Smoke tests completed. 56 look OK, 11 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- login_test_saml_user | `Error` | 0.43 | test_login.py test_revoke_certificate | `Error` | 0.01 | test_certauthority_root.py test_role_account_acls_multiple_mgmt_servers | `Error` | 0.47 | test_dynamicroles.py test_configure_ha_provider_invalid | `Error` | 0.01 | test_hostha_simulator.py test_configure_ha_provider_valid | `Error` | 0.01 | test_hostha_simulator.py test_ha_configure_enabledisable_across_clusterzones | `Error` | 0.01 | test_hostha_simulator.py test_ha_disable_feature_invalid | `Error` | 0.01 | test_hostha_simulator.py test_ha_enable_feature_invalid | `Error` | 0.01 | test_hostha_simulator.py test_ha_list_providers | `Error` | 0.01 | test_hostha_simulator.py test_ha_multiple_mgmt_server_ownership | `Error` | 0.01 | test_hostha_simulator.py test_ha_verify_fsm_available | `Error` | 0.01 | test_hostha_simulator.py test_ha_verify_fsm_degraded | `Error` | 0.01 | test_hostha_simulator.py test_ha_verify_fsm_fenced | `Error` | 0.01 | test_hostha_simulator.py test_ha_verify_fsm_recovering | `Error` | 0.01 | test_hostha_simulator.py test_hostha_configure_default_driver | `Error` | 0.01 | test_hostha_simulator.py test_hostha_configure_invalid_provider | `Error` | 0.01 | test_hostha_simulator.py test_hostha_disable_feature_valid | `Error` | 0.01 | test_hostha_simulator.py test_hostha_enable_feature_valid | `Error` | 0.01 | test_hostha_simulator.py test_hostha_enable_feature_without_setting_provider | `Error` | 0.01 | test_hostha_simulator.py test_list_ha_for_host | `Error` | 0.01 | test_hostha_simulator.py test_list_ha_for_host_invalid | `Error` | 0.01 | test_hostha_simulator.py test_list_ha_for_host_valid | `Error` | 0.01 | test_hostha_simulator.py test_02_edit_primary_storage_tags | `Error` | 0.01 | test_primary_storage.py test_oobm_issue_power_cycle | `Error` | 2.37 | test_outofbandmanagement_nestedplugin.py test_oobm_issue_power_off | `Error` | 3.34 | test_outofbandmanagement_nestedplugin.py test_oobm_issue_power_on | `Error` | 2.28 | test_outofbandmanagement_nestedplugin.py test_oobm_issue_power_reset | `Error` | 3.35 | test_outofbandmanagement_nestedplugin.py test_oobm_issue_power_soft | `Error` | 2.26 | test_outofbandmanagement_nestedplugin.py test_oobm_issue_power_status | `Error` | 2.39 | test_outofbandmanagement_nestedplugin.py test_oobm_background_powerstate_sync | `Failure` | 21.43 | test_outofbandmanagement.py test_oobm_background_powerstate_sync | `Error` | 21.43 | test_outofbandmanagement.py test_oobm_configure_default_driver | `Error` | 0.05 | test_outofbandmanagement.py test_oobm_configure_invalid_driver | `Error` | 0.05 | test_outofbandmanagement.py test_oobm_disable_feature_invalid | `Error` | 0.07 | test_outofbandmanagement.py test_oobm_disable_feature_valid | `Error` | 1.15 | test_outofbandmanagement.py test_oobm_enable_feature_invalid | `Error` | 0.11 | test_outofbandmanagement.py test_oobm_enable_feature_valid | `Error` | 1.13 | test_outofbandmanagement.py test_oobm_enabledisable_across_clusterzones | `Error` | 9.80 | test_outofbandmanagement.py test_oobm_enabledisable_across_clusterzones | `Error` | 9.80 | test_outofbandmanagement.py test_oobm_issue_power_cycle | `Error` | 4.30 | test_outofbandmanagement.py test_oobm_issue_power_cycle | `Error` | 4.30 | test_outofbandmanagement.py test_oobm_issue_power_off | `Error` | 4.32 | test_outofbandmanagement.py test_oobm_issue_power_off | `Error` | 4.32 | test_outofbandmanagement.py
[GitHub] blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes
blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes URL: https://github.com/apache/cloudstack/pull/2616#issuecomment-386497666 Trillian test result (tid-2593) Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7 Total time taken: 23174 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2616-t2593-kvm-centos7.zip Intermitten failure detected: /marvin/tests/smoke/test_vpc_redundant.py Intermitten failure detected: /marvin/tests/smoke/test_vpc_vpn.py Smoke tests completed. 66 look OK, 1 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_01_vpc_site2site_vpn | `Failure` | 138.62 | test_vpc_vpn.py This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2600: CLOUDSTACK-10362: Change the "getXXX" method names to "isXXX".
blueorangutan commented on issue #2600: CLOUDSTACK-10362: Change the "getXXX" method names to "isXXX". URL: https://github.com/apache/cloudstack/pull/2600#issuecomment-386494010 Trillian test result (tid-2589) Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7 Total time taken: 43342 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2600-t2589-kvm-centos7.zip Intermitten failure detected: /marvin/tests/smoke/test_certauthority_root.py Intermitten failure detected: /marvin/tests/smoke/test_internal_lb.py Intermitten failure detected: /marvin/tests/smoke/test_vm_life_cycle.py Intermitten failure detected: /marvin/tests/smoke/test_volumes.py Intermitten failure detected: /marvin/tests/smoke/test_vpc_vpn.py Intermitten failure detected: /marvin/tests/smoke/test_hostha_kvm.py Smoke tests completed. 63 look OK, 4 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_04_rvpc_internallb_haproxy_stats_on_all_interfaces | `Error` | 393.66 | test_internal_lb.py test_01_secured_vm_migration | `Error` | 43.55 | test_vm_life_cycle.py test_02_not_secured_vm_migration | `Error` | 42.51 | test_vm_life_cycle.py test_03_secured_to_nonsecured_vm_migration | `Error` | 42.51 | test_vm_life_cycle.py test_04_nonsecured_to_secured_vm_migration | `Error` | 42.49 | test_vm_life_cycle.py test_11_migrate_volume_and_change_offering | `Error` | 129.09 | test_volumes.py test_hostha_enable_ha_when_host_in_maintenance | `Error` | 3.48 | test_hostha_kvm.py This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] GabrielBrascher commented on a change in pull request #2508: CLOUDSTACK-9114: Reduce VR downtime during network restart
GabrielBrascher commented on a change in pull request #2508: CLOUDSTACK-9114: Reduce VR downtime during network restart URL: https://github.com/apache/cloudstack/pull/2508#discussion_r185953401 ## File path: engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java ## @@ -2868,6 +2849,89 @@ public boolean restartNetwork(final Long networkId, final Account callerAccount, } } +@Override +public void destroyExpendableRouters(final List routers, final ReservationContext context) throws ResourceUnavailableException { +final List remainingRouters = new ArrayList<>(); +for (final VirtualRouter router : routers) { +if (router.getState() == VirtualMachine.State.Stopped || +router.getState() == VirtualMachine.State.Error || +router.getState() == VirtualMachine.State.Shutdowned || +router.getState() == VirtualMachine.State.Unknown) { +s_logger.debug("Destroying old router " + router); +_routerService.destroyRouter(router.getId(), context.getAccount(), context.getCaller().getId()); +} else { +remainingRouters.add(router); +} +} + +if (remainingRouters.size() < 2) { +return; +} + +VirtualRouter backupRouter = null; +for (final VirtualRouter router : remainingRouters) { +if (router.getRedundantState() == VirtualRouter.RedundantState.BACKUP) { +backupRouter = router; Review comment: What do you think about break this loop when finding a router in the backup state? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] GabrielBrascher commented on a change in pull request #2508: CLOUDSTACK-9114: Reduce VR downtime during network restart
GabrielBrascher commented on a change in pull request #2508: CLOUDSTACK-9114: Reduce VR downtime during network restart URL: https://github.com/apache/cloudstack/pull/2508#discussion_r185835963 ## File path: engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java ## @@ -1216,6 +1180,32 @@ public void implementNetworkElementsAndResources(final DeployDestination dest, f } } +protected void implementNetworkElements(final DeployDestination dest, final ReservationContext context, final Network network, final NetworkOffering offering, final List providersToImplement) Review comment: Is there a reason for this method to be protected? What do you think about making it private? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] GabrielBrascher commented on a change in pull request #2508: CLOUDSTACK-9114: Reduce VR downtime during network restart
GabrielBrascher commented on a change in pull request #2508: CLOUDSTACK-9114: Reduce VR downtime during network restart URL: https://github.com/apache/cloudstack/pull/2508#discussion_r185980340 ## File path: server/src/com/cloud/network/vpc/VpcManagerImpl.java ## @@ -2435,4 +2444,43 @@ public boolean isSrcNatIpRequired(long vpcOfferingId) { final MapvpcOffSvcProvidersMap = getVpcOffSvcProvidersMap(vpcOfferingId); return vpcOffSvcProvidersMap.get(Network.Service.SourceNat).contains(Network.Provider.VPCVirtualRouter); } + +private boolean rollingRestartVpc(final Vpc vpc, final ReservationContext context) throws ResourceUnavailableException, ConcurrentOperationException, InsufficientCapacityException { +s_logger.debug("Performing rolling restart of routers of VPC " + vpc); +_ntwkMgr.destroyExpendableRouters(_routerDao.listByVpcId(vpc.getId()), context); + +final DeployDestination dest = new DeployDestination(_dcDao.findById(vpc.getZoneId()), null, null, null); +final List oldRouters = _routerDao.listByVpcId(vpc.getId()); + +// Create a new router +if (oldRouters.size() > 0) { +vpc.setRollingRestart(true); +} +startVpc(vpc, dest, context); +if (oldRouters.size() > 0) { +vpc.setRollingRestart(false); +} + +// For redundant vpc wait for 3*advert_int+skew_seconds for VRRP to kick in +if (vpc.isRedundant() || (oldRouters.size() == 1 && oldRouters.get(0).getIsRedundantRouter())) { +try { +Thread.sleep(1L); Review comment: What do you think about extracting the value `1L` to a static variable? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2619: Remove "self-injection" of AccountManagerImpl
blueorangutan commented on issue #2619: Remove "self-injection" of AccountManagerImpl URL: https://github.com/apache/cloudstack/pull/2619#issuecomment-386485058 Trillian test result (tid-2585) Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7 Total time taken: 47628 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2619-t2585-kvm-centos7.zip Intermitten failure detected: /marvin/tests/smoke/test_certauthority_root.py Intermitten failure detected: /marvin/tests/smoke/test_deploy_virtio_scsi_vm.py Intermitten failure detected: /marvin/tests/smoke/test_internal_lb.py Intermitten failure detected: /marvin/tests/smoke/test_routers_network_ops.py Intermitten failure detected: /marvin/tests/smoke/test_vm_life_cycle.py Intermitten failure detected: /marvin/tests/smoke/test_volumes.py Intermitten failure detected: /marvin/tests/smoke/test_hostha_kvm.py Smoke tests completed. 62 look OK, 5 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_01_internallb_roundrobin_1VPC_3VM_HTTP_port80 | `Failure` | 257.84 | test_internal_lb.py test_02_internallb_roundrobin_1RVPC_3VM_HTTP_port80 | `Failure` | 500.53 | test_internal_lb.py test_03_vpc_internallb_haproxy_stats_on_all_interfaces | `Error` | 493.42 | test_internal_lb.py test_01_isolate_network_FW_PF_default_routes_egress_true | `Failure` | 133.36 | test_routers_network_ops.py test_02_RVR_Network_FW_PF_SSH_default_routes_egress_false | `Failure` | 466.94 | test_routers_network_ops.py test_01_secured_vm_migration | `Error` | 40.69 | test_vm_life_cycle.py test_02_not_secured_vm_migration | `Error` | 40.56 | test_vm_life_cycle.py test_03_secured_to_nonsecured_vm_migration | `Error` | 41.56 | test_vm_life_cycle.py test_04_nonsecured_to_secured_vm_migration | `Error` | 42.59 | test_vm_life_cycle.py test_11_migrate_volume_and_change_offering | `Error` | 129.80 | test_volumes.py test_hostha_enable_ha_when_host_in_maintenance | `Error` | 2.62 | test_hostha_kvm.py This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes
blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes URL: https://github.com/apache/cloudstack/pull/2616#issuecomment-386472523 Trillian test result (tid-2591) Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 6 Total time taken: 27873 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2616-t2591-xenserver-71.zip Intermitten failure detected: /marvin/tests/smoke/test_certauthority_root.py Intermitten failure detected: /marvin/tests/smoke/test_dynamicroles.py Intermitten failure detected: /marvin/tests/smoke/test_hostha_simulator.py Intermitten failure detected: /marvin/tests/smoke/test_login.py Intermitten failure detected: /marvin/tests/smoke/test_outofbandmanagement_nestedplugin.py Intermitten failure detected: /marvin/tests/smoke/test_outofbandmanagement.py Intermitten failure detected: /marvin/tests/smoke/test_primary_storage.py Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py Intermitten failure detected: /marvin/tests/smoke/test_public_ip_range.py Intermitten failure detected: /marvin/tests/smoke/test_scale_vm.py Intermitten failure detected: /marvin/tests/smoke/test_snapshots.py Intermitten failure detected: /marvin/tests/smoke/test_templates.py Intermitten failure detected: /marvin/tests/smoke/test_usage.py Intermitten failure detected: /marvin/tests/smoke/test_volumes.py Smoke tests completed. 54 look OK, 13 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- login_test_saml_user | `Error` | 0.64 | test_login.py test_revoke_certificate | `Error` | 0.01 | test_certauthority_root.py test_role_account_acls_multiple_mgmt_servers | `Error` | 0.70 | test_dynamicroles.py test_configure_ha_provider_invalid | `Error` | 0.01 | test_hostha_simulator.py test_configure_ha_provider_valid | `Error` | 0.01 | test_hostha_simulator.py test_ha_configure_enabledisable_across_clusterzones | `Error` | 0.01 | test_hostha_simulator.py test_ha_disable_feature_invalid | `Error` | 0.01 | test_hostha_simulator.py test_ha_enable_feature_invalid | `Error` | 0.01 | test_hostha_simulator.py test_ha_list_providers | `Error` | 0.01 | test_hostha_simulator.py test_ha_multiple_mgmt_server_ownership | `Error` | 0.01 | test_hostha_simulator.py test_ha_verify_fsm_available | `Error` | 0.01 | test_hostha_simulator.py test_ha_verify_fsm_degraded | `Error` | 0.01 | test_hostha_simulator.py test_ha_verify_fsm_fenced | `Error` | 0.01 | test_hostha_simulator.py test_ha_verify_fsm_recovering | `Error` | 0.01 | test_hostha_simulator.py test_hostha_configure_default_driver | `Error` | 0.01 | test_hostha_simulator.py test_hostha_configure_invalid_provider | `Error` | 0.01 | test_hostha_simulator.py test_hostha_disable_feature_valid | `Error` | 0.01 | test_hostha_simulator.py test_hostha_enable_feature_valid | `Error` | 0.01 | test_hostha_simulator.py test_hostha_enable_feature_without_setting_provider | `Error` | 0.01 | test_hostha_simulator.py test_list_ha_for_host | `Error` | 0.01 | test_hostha_simulator.py test_list_ha_for_host_invalid | `Error` | 0.01 | test_hostha_simulator.py test_list_ha_for_host_valid | `Error` | 0.01 | test_hostha_simulator.py test_02_edit_primary_storage_tags | `Error` | 0.01 | test_primary_storage.py test_oobm_issue_power_cycle | `Error` | 2.32 | test_outofbandmanagement_nestedplugin.py test_oobm_issue_power_off | `Error` | 3.39 | test_outofbandmanagement_nestedplugin.py test_oobm_issue_power_on | `Error` | 3.40 | test_outofbandmanagement_nestedplugin.py test_oobm_issue_power_reset | `Error` | 3.39 | test_outofbandmanagement_nestedplugin.py test_oobm_issue_power_soft | `Error` | 2.33 | test_outofbandmanagement_nestedplugin.py test_oobm_issue_power_status | `Error` | 2.29 | test_outofbandmanagement_nestedplugin.py test_oobm_background_powerstate_sync | `Failure` | 21.56 | test_outofbandmanagement.py test_oobm_background_powerstate_sync | `Error` | 21.57 | test_outofbandmanagement.py test_oobm_configure_default_driver | `Error` | 0.06 | test_outofbandmanagement.py test_oobm_configure_invalid_driver | `Error` | 0.06 | test_outofbandmanagement.py test_oobm_disable_feature_invalid | `Error` | 0.07 | test_outofbandmanagement.py test_oobm_disable_feature_valid | `Error` | 1.15 | test_outofbandmanagement.py test_oobm_enable_feature_invalid | `Error` | 0.08 | test_outofbandmanagement.py test_oobm_enable_feature_valid | `Error` | 0.11 | test_outofbandmanagement.py test_oobm_enabledisable_across_clusterzones | `Error` | 7.02 | test_outofbandmanagement.py test_oobm_enabledisable_across_clusterzones | `Error` | 7.02 | test_outofbandmanagement.py test_oobm_issue_power_cycle | `Error` | 4.38 | test_outofbandmanagement.py
[GitHub] nathanejohnson commented on issue #2611: Ceph RBD primary storage fails connection and renders node unusable
nathanejohnson commented on issue #2611: Ceph RBD primary storage fails connection and renders node unusable URL: https://github.com/apache/cloudstack/issues/2611#issuecomment-386464903 On second thought, this might be a separate bug we were chasing. We were getting seeing this error in the logs: 2018-05-03 09:58:03,932 INFO [kvm.storage.LibvirtStorageAdaptor] (agentRequest-Handler-3:null) (logid:fb29bd87) Attempting to create volume f2d800a0-fc19-4b41-b886-57 5af6742425 (RBD) in pool e485c675-896a-303e-be82-c42357c6b4c1 with size 5368709120 2018-05-03 09:58:03,932 DEBUG [kvm.storage.LibvirtStorageAdaptor] (agentRequest-Handler-3:null) (logid:fb29bd87) f2d800a0-fc19-4b41-b886-575af6742425 5368709120 0744 2018-05-03 09:58:03,932 DEBUG [kvm.storage.KVMStorageProcessor] (agentRequest-Handler-3:null) (logid:fb29bd87) Failed to create volume: com.cloud.utils.exception.CloudRuntimeException: org.libvirt.LibvirtException: unsupported configuration: only RAW volumes are supported by this storage pool at com.cloud.hypervisor.kvm.storage.LibvirtStorageAdaptor.createPhysicalDiskByLibVirt(LibvirtStorageAdaptor.java:705) at com.cloud.hypervisor.kvm.storage.LibvirtStorageAdaptor.createPhysicalDisk(LibvirtStorageAdaptor.java:664) at com.cloud.hypervisor.kvm.storage.LibvirtStoragePool.createPhysicalDisk(LibvirtStoragePool.java:115) at com.cloud.hypervisor.kvm.storage.KVMStorageProcessor.createVolume(KVMStorageProcessor.java:1323) at com.cloud.storage.resource.StorageSubsystemCommandHandlerBase.execute(StorageSubsystemCommandHandlerBase.java:119) at com.cloud.storage.resource.StorageSubsystemCommandHandlerBase.handleStorageCommands(StorageSubsystemCommandHandlerBase.java:58) at com.cloud.hypervisor.kvm.resource.wrapper.LibvirtStorageSubSystemCommandWrapper.execute(LibvirtStorageSubSystemCommandWrapper.java:36) at com.cloud.hypervisor.kvm.resource.wrapper.LibvirtStorageSubSystemCommandWrapper.execute(LibvirtStorageSubSystemCommandWrapper.java:30) at com.cloud.hypervisor.kvm.resource.wrapper.LibvirtRequestWrapper.execute(LibvirtRequestWrapper.java:75) at com.cloud.hypervisor.kvm.resource.LibvirtComputingResource.executeRequest(LibvirtComputingResource.java:1438) at com.cloud.agent.Agent.processRequest(Agent.java:563) at com.cloud.agent.Agent$AgentRequestHandler.doTask(Agent.java:976) at com.cloud.utils.nio.Task.call(Task.java:83) at com.cloud.utils.nio.Task.call(Task.java:29) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) @giorgiomassar8 were you seeing similar messages? We were receiving these messages on a freshly created pool when attempting to deploy a VM. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] nathanejohnson commented on issue #2611: Ceph RBD primary storage fails connection and renders node unusable
nathanejohnson commented on issue #2611: Ceph RBD primary storage fails connection and renders node unusable URL: https://github.com/apache/cloudstack/issues/2611#issuecomment-386461876 @wido The issue seems to be that for any KVM host, the disk format is always hard coded to QCOW2 here: https://github.com/apache/cloudstack/blob/master/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java#L768 This gets sent along to the agent. I guess this is a reasonable default for KVM, but obviously for RBD it needs to be RAW, and it won't know that until it looks up the storage pool. In the short term, I think hard coding the disk format to RAW on the agent side for RBD is valid, it can't be anything but that, but it might also be good for the management server to send along the correct disk type. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] nathanejohnson commented on issue #2611: Ceph RBD primary storage fails connection and renders node unusable
nathanejohnson commented on issue #2611: Ceph RBD primary storage fails connection and renders node unusable URL: https://github.com/apache/cloudstack/issues/2611#issuecomment-386461876 @wido The issue seems to be that for any KVM host, the disk format is always hard coded to QCOW2 here: https://github.com/apache/cloudstack/blob/master/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java#L768 This gets sent along to the agent. I guess this is a reasonable default for KVM, but obviously for RBD it needs to be RAW, and it won't know that until it looks up the storage pool. In the short term, I think hard coding the disk format to RAW is valid, it can't be anything but that, but it might also be good for the management server to send along the correct disk type. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] nathanejohnson opened a new pull request #2623: fixes #2611
nathanejohnson opened a new pull request #2623: fixes #2611 URL: https://github.com/apache/cloudstack/pull/2623 fix issue where kvm / ceph cannot create volumes #2611 ## Description This hard codes the disk format to RAW in the case of RBD Fixes: #2611 ## How Has This Been Tested? This was tested in a centos 7 based lab on kvm with ceph primary storage. ## Checklist: - [X ] I have read the [CONTRIBUTING](https://github.com/apache/cloudstack/blob/master/CONTRIBUTING.md) document. - [X ] My code follows the code style of this project. - [ ] My change requires a change to the documentation. - [ ] I have updated the documentation accordingly. Testing - [ ] I have added tests to cover my changes. - [ ] All relevant new and existing integration tests have passed. - [ ] A full integration testsuite with all test that can run on my environment has passed. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[cloudstack] branch 4.11 updated (c005a44 -> 314caff)
This is an automated email from the ASF dual-hosted git repository. nathanejohnson pushed a change to branch 4.11 in repository https://gitbox.apache.org/repos/asf/cloudstack.git. omit c005a44 tentative fix for issue where kvm / ceph cannot create volumes This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/4.11 (314caff) \ O -- O -- O (c005a44) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact nathanejohn...@apache.org.
[cloudstack] branch 4.11 updated: tentative fix for issue where kvm / ceph cannot create volumes
This is an automated email from the ASF dual-hosted git repository. nathanejohnson pushed a commit to branch 4.11 in repository https://gitbox.apache.org/repos/asf/cloudstack.git The following commit(s) were added to refs/heads/4.11 by this push: new c005a44 tentative fix for issue where kvm / ceph cannot create volumes c005a44 is described below commit c005a44c5aba83bb82c3f9155025008f917de850 Author: Nathan JohnsonAuthorDate: Thu May 3 17:16:11 2018 -0500 tentative fix for issue where kvm / ceph cannot create volumes --- .../kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java index 792fc69..64d2a04 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java @@ -661,7 +661,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor { switch (pool.getType()) { case RBD: -return createPhysicalDiskByLibVirt(name, pool, format, provisioningType, size); +return createPhysicalDiskByLibVirt(name, pool, PhysicalDiskFormat.RAW, provisioningType, size); case NetworkFilesystem: case Filesystem: switch (format) { -- To stop receiving notification emails like this one, please contact nathanejohn...@apache.org.
[GitHub] rafaelweingartner commented on issue #2511: [CLOUDSTACK-10344] bug when moving ACL rules (change order with drag and drop)
rafaelweingartner commented on issue #2511: [CLOUDSTACK-10344] bug when moving ACL rules (change order with drag and drop) URL: https://github.com/apache/cloudstack/pull/2511#issuecomment-386446908 @rhtyd I have been thinking about this concurrency problem and it can be problematic for us. I will address it. I will take your design for the updateRole in consideration. I will not be able to address it right now though; I will be able to work on it probably in the next month or so. This PR was only merged to 4.12+, so we are safe here (4.11 will have the problem I solved here + the concurrency one though). This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes
blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes URL: https://github.com/apache/cloudstack/pull/2616#issuecomment-386427379 @rhtyd a Trillian-Jenkins matrix job (centos6 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rhtyd commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes
rhtyd commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes URL: https://github.com/apache/cloudstack/pull/2616#issuecomment-386427092 @blueorangutan test matrix This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes
blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes URL: https://github.com/apache/cloudstack/pull/2616#issuecomment-386425921 Trillian test result (tid-2586) Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7 Total time taken: 28775 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2616-t2586-xenserver-71.zip Intermitten failure detected: /marvin/tests/smoke/test_public_ip_range.py Intermitten failure detected: /marvin/tests/smoke/test_scale_vm.py Intermitten failure detected: /marvin/tests/smoke/test_templates.py Intermitten failure detected: /marvin/tests/smoke/test_usage.py Intermitten failure detected: /marvin/tests/smoke/test_volumes.py Intermitten failure detected: /marvin/tests/smoke/test_host_maintenance.py Smoke tests completed. 62 look OK, 5 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_01_scale_vm | `Error` | 14.42 | test_scale_vm.py test_04_extract_template | `Failure` | 128.34 | test_templates.py ContextSuite context=TestISOUsage>:setup | `Error` | 0.00 | test_usage.py test_06_download_detached_volume | `Failure` | 140.71 | test_volumes.py test_01_cancel_host_maintenace_with_no_migration_jobs | `Failure` | 1.14 | test_host_maintenance.py test_02_cancel_host_maintenace_with_migration_jobs | `Error` | 2.34 | test_host_maintenance.py This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes
blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes URL: https://github.com/apache/cloudstack/pull/2616#issuecomment-386378709 Trillian test result (tid-2583) Environment: vmware-65 (x2), Advanced Networking with Mgmt server 7 Total time taken: 28818 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2616-t2583-vmware-65.zip Intermitten failure detected: /marvin/tests/smoke/test_vpc_redundant.py Smoke tests completed. 66 look OK, 1 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_05_rvpc_multi_tiers | `Failure` | 447.57 | test_vpc_redundant.py test_05_rvpc_multi_tiers | `Error` | 486.00 | test_vpc_redundant.py This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes
blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes URL: https://github.com/apache/cloudstack/pull/2616#issuecomment-386364298 Trillian test result (tid-2582) Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7 Total time taken: 25567 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2616-t2582-kvm-centos7.zip Intermitten failure detected: /marvin/tests/smoke/test_deploy_virtio_scsi_vm.py Intermitten failure detected: /marvin/tests/smoke/test_vm_life_cycle.py Intermitten failure detected: /marvin/tests/smoke/test_vpc_redundant.py Intermitten failure detected: /marvin/tests/smoke/test_vpc_vpn.py Smoke tests completed. 66 look OK, 1 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_01_redundant_vpc_site2site_vpn | `Failure` | 222.81 | test_vpc_vpn.py test_01_vpc_site2site_vpn_multiple_options | `Failure` | 129.81 | test_vpc_vpn.py test_01_vpc_site2site_vpn | `Failure` | 149.41 | test_vpc_vpn.py This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2399: CLOUDSTACK-10223 delete snapshots when deleting domain
blueorangutan commented on issue #2399: CLOUDSTACK-10223 delete snapshots when deleting domain URL: https://github.com/apache/cloudstack/pull/2399#issuecomment-386362267 Trillian test result (tid-2571) Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7 Total time taken: 116753 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2399-t2571-kvm-centos7.zip Intermitten failure detected: /marvin/tests/smoke/test_certauthority_root.py Intermitten failure detected: /marvin/tests/smoke/test_deploy_virtio_scsi_vm.py Intermitten failure detected: /marvin/tests/smoke/test_internal_lb.py Intermitten failure detected: /marvin/tests/smoke/test_primary_storage.py Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py Intermitten failure detected: /marvin/tests/smoke/test_snapshots.py Intermitten failure detected: /marvin/tests/smoke/test_vm_life_cycle.py Intermitten failure detected: /marvin/tests/smoke/test_vpc_redundant.py Intermitten failure detected: /marvin/tests/smoke/test_vpc_vpn.py Intermitten failure detected: /marvin/tests/smoke/test_host_maintenance.py Intermitten failure detected: /marvin/tests/smoke/test_hostha_kvm.py Smoke tests completed. 59 look OK, 8 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_03_vpc_internallb_haproxy_stats_on_all_interfaces | `Error` | 374.87 | test_internal_lb.py test_01_add_primary_storage_disabled_host | `Error` | 2.20 | test_primary_storage.py test_01_primary_storage_nfs | `Error` | 0.13 | test_primary_storage.py ContextSuite context=TestStorageTags>:setup | `Error` | 0.23 | test_primary_storage.py test_02_list_snapshots_with_removed_data_store | `Error` | 1.16 | test_snapshots.py test_01_secured_vm_migration | `Error` | 40.56 | test_vm_life_cycle.py test_02_not_secured_vm_migration | `Error` | 40.57 | test_vm_life_cycle.py test_03_secured_to_nonsecured_vm_migration | `Error` | 40.55 | test_vm_life_cycle.py test_04_nonsecured_to_secured_vm_migration | `Error` | 40.56 | test_vm_life_cycle.py test_08_migrate_vm | `Error` | 18.91 | test_vm_life_cycle.py test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL | `Failure` | 945.20 | test_vpc_redundant.py test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers | `Failure` | 605.22 | test_vpc_redundant.py test_05_rvpc_multi_tiers | `Failure` | 885.48 | test_vpc_redundant.py test_05_rvpc_multi_tiers | `Error` | 918.83 | test_vpc_redundant.py test_01_redundant_vpc_site2site_vpn | `Failure` | 661.64 | test_vpc_vpn.py test_01_vpc_site2site_vpn_multiple_options | `Error` | 603.56 | test_vpc_vpn.py test_01_cancel_host_maintenace_with_no_migration_jobs | `Failure` | 0.11 | test_host_maintenance.py test_02_cancel_host_maintenace_with_migration_jobs | `Error` | 3.41 | test_host_maintenance.py test_hostha_enable_ha_when_host_in_maintenance | `Error` | 2.58 | test_hostha_kvm.py test_hostha_kvm_host_degraded | `Failure` | 1556.76 | test_hostha_kvm.py test_hostha_kvm_host_fencing | `Failure` | 628.08 | test_hostha_kvm.py test_hostha_kvm_host_recovering | `Failure` | 626.01 | test_hostha_kvm.py This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rafaelweingartner commented on a change in pull request #2595: CLOUDSTACK-10199: Support requesting a specific IPv4 address
rafaelweingartner commented on a change in pull request #2595: CLOUDSTACK-10199: Support requesting a specific IPv4 address URL: https://github.com/apache/cloudstack/pull/2595#discussion_r185860073 ## File path: engine/schema/src/main/java/com/cloud/dc/dao/VlanDaoImpl.java ## @@ -82,6 +83,24 @@ public VlanVO findByZoneAndVlanId(long zoneId, String vlanId) { return findOneBy(sc); } +/** + * Returns a vlan by the network id and if the given IPv4 is in the network IP range. + */ +@Override +public VlanVO findByNetworkIdAndIpv4Range(long networkId, String ipv4Address) { +List vlanVoList = listVlansByNetworkId(networkId); +for (VlanVO vlan : vlanVoList) { +String ipRange = vlan.getIpRange(); +String[] ipRangeParts = ipRange.split("-"); +String startIP = ipRangeParts[0]; +String endIP = ipRangeParts[1]; +if (NetUtils.isIpInRange(ipv4Address, startIP, endIP)) { Review comment: ok, got it This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] PaulAngus commented on issue #1037: Fix for CLOUDSTACK-8937 - XenServer migrations with storage failing i…
PaulAngus commented on issue #1037: Fix for CLOUDSTACK-8937 - XenServer migrations with storage failing i… URL: https://github.com/apache/cloudstack/pull/1037#issuecomment-386339279 closed as #1336 and #1596 address this problem. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] PaulAngus closed pull request #1037: Fix for CLOUDSTACK-8937 - XenServer migrations with storage failing i…
PaulAngus closed pull request #1037: Fix for CLOUDSTACK-8937 - XenServer migrations with storage failing i… URL: https://github.com/apache/cloudstack/pull/1037 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateWithStorageCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateWithStorageCommandWrapper.java index 2a79d26b045..195ea6a9835 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateWithStorageCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateWithStorageCommandWrapper.java @@ -41,6 +41,7 @@ import com.cloud.resource.CommandWrapper; import com.cloud.resource.ResourceWrapper; import com.cloud.utils.exception.CloudRuntimeException; +import com.cloud.utils.Pair; import com.xensource.xenapi.Connection; import com.xensource.xenapi.Host; import com.xensource.xenapi.Network; @@ -60,7 +61,7 @@ public Answer execute(final MigrateWithStorageCommand command, final XenServer610Resource xenServer610Resource) { final Connection connection = xenServer610Resource.getConnection(); final VirtualMachineTO vmSpec = command.getVirtualMachine(); -final MapvolumeToFiler = command.getVolumeToFiler(); +final List > volToFiler = command.getVolumeToFilerAsList(); final String vmName = vmSpec.getName(); Task task = null; @@ -83,10 +84,8 @@ public Answer execute(final MigrateWithStorageCommand command, final XenServer61 // Create the vif map. The vm stays in the same cluster so we have to pass an empty vif map. final Map vifMap = new HashMap (); final Map vdiMap = new HashMap (); -for (final Map.Entry entry : volumeToFiler.entrySet()) { -final VolumeTO volume = entry.getKey(); -final StorageFilerTO sotrageFiler = entry.getValue(); -vdiMap.put(xenServer610Resource.getVDIbyUuid(connection, volume.getPath()), xenServer610Resource.getStorageRepository(connection, sotrageFiler.getUuid())); +for (final Pair entry : volToFiler) { +vdiMap.put(xenServer610Resource.getVDIbyUuid(connection, entry.first().getPath()), xenServer610Resource.getStorageRepository(connection, entry.second().getUuid())); } // Get the vm to migrate. @@ -136,4 +135,4 @@ public Answer execute(final MigrateWithStorageCommand command, final XenServer61 } } } -} \ No newline at end of file +} diff --git a/plugins/hypervisors/xenserver/src/org/apache/cloudstack/storage/motion/XenServerStorageMotionStrategy.java b/plugins/hypervisors/xenserver/src/org/apache/cloudstack/storage/motion/XenServerStorageMotionStrategy.java index c8367dd3ac1..99174e221f4 100644 --- a/plugins/hypervisors/xenserver/src/org/apache/cloudstack/storage/motion/XenServerStorageMotionStrategy.java +++ b/plugins/hypervisors/xenserver/src/org/apache/cloudstack/storage/motion/XenServerStorageMotionStrategy.java @@ -19,6 +19,7 @@ package org.apache.cloudstack.storage.motion; import java.util.HashMap; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -59,6 +60,7 @@ import com.cloud.storage.VolumeVO; import com.cloud.storage.dao.VolumeDao; import com.cloud.utils.exception.CloudRuntimeException; +import com.cloud.utils.Pair; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.dao.VMInstanceDao; @@ -193,15 +195,14 @@ private Answer migrateVmWithVolumesWithinCluster(VMInstanceVO vm, VirtualMachine // Initiate migration of a virtual machine with it's volumes. try { -Map volumeToFilerto = new HashMap (); +List > volumeToFilerto = new ArrayList >(); for (Map.Entry entry : volumeToPool.entrySet()) { VolumeInfo volume = entry.getKey(); VolumeTO volumeTo = new VolumeTO(volume, storagePoolDao.findById(volume.getPoolId())); StorageFilerTO filerTo = new StorageFilerTO((StoragePool)entry.getValue()); -volumeToFilerto.put(volumeTo, filerTo); +volumeToFilerto.add(new Pair (volumeTo, filerTo));
[GitHub] blueorangutan commented on issue #2613: Cleanup POMs
blueorangutan commented on issue #2613: Cleanup POMs URL: https://github.com/apache/cloudstack/pull/2613#issuecomment-386338852 Packaging result: ✔centos6 ✔centos7 ✖debian. JID-2003 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2613: Cleanup POMs
blueorangutan commented on issue #2613: Cleanup POMs URL: https://github.com/apache/cloudstack/pull/2613#issuecomment-386330163 @khos2ow a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] khos2ow commented on issue #2613: Cleanup POMs
khos2ow commented on issue #2613: Cleanup POMs URL: https://github.com/apache/cloudstack/pull/2613#issuecomment-386329926 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rafaelweingartner commented on issue #2511: [CLOUDSTACK-10344] bug when moving ACL rules (change order with drag and drop)
rafaelweingartner commented on issue #2511: [CLOUDSTACK-10344] bug when moving ACL rules (change order with drag and drop) URL: https://github.com/apache/cloudstack/pull/2511#issuecomment-386326837 Ok, I see what you did there. Our goal was not to tackle concurrency problems with that new API method. We have not had these problems so far. The idea was only to fix the drag and drop sorting/limitations. I can put this in my backlog, and look for a way to tackle it as well. However, I would prefer a new method to maintain backward compatibility of that “update” method. BTW: can I open a transaction in the service (manager) layer? I really do not like the idea of putting logic in DAOs. If we were using spring to manage DAOs and transaction we would have `@Transactional` annotation. I see that in ACS some parts of the code use `@DB`, will it open a transaction for methods annotated with it? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2600: CLOUDSTACK-10362: Change the "getXXX" method names to "isXXX".
blueorangutan commented on issue #2600: CLOUDSTACK-10362: Change the "getXXX" method names to "isXXX". URL: https://github.com/apache/cloudstack/pull/2600#issuecomment-386310835 @DaanHoogland a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] DaanHoogland commented on issue #2600: CLOUDSTACK-10362: Change the "getXXX" method names to "isXXX".
DaanHoogland commented on issue #2600: CLOUDSTACK-10362: Change the "getXXX" method names to "isXXX". URL: https://github.com/apache/cloudstack/pull/2600#issuecomment-386310596 @blueorangutan test This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] DaanHoogland commented on issue #2116: CLOUDSTACK-8959: Option to attach the config drive
DaanHoogland commented on issue #2116: CLOUDSTACK-8959: Option to attach the config drive URL: https://github.com/apache/cloudstack/pull/2116#issuecomment-386309824 @rhtyd I don't see anything in this PR that is needed given other ConfigDrive functionality submitted in different PRs, awaitning responses from @jayapalu and @fmaximus This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rafaelweingartner commented on a change in pull request #2595: CLOUDSTACK-10199: Support requesting a specific IPv4 address
rafaelweingartner commented on a change in pull request #2595: CLOUDSTACK-10199: Support requesting a specific IPv4 address URL: https://github.com/apache/cloudstack/pull/2595#discussion_r185811769 ## File path: engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java ## @@ -883,6 +885,78 @@ public void saveExtraDhcpOptions(final String networkUuid, final Long nicId, fin return new Pair(vmNic, Integer.valueOf(deviceId)); } +/** + * If the requested IPv4 address from the NicProfile was configured then it configures the IPv4 address, Netmask and Gateway to deploy the VM with the requested IP. + */ +protected void configureNicProfileBasedOnRequestedIp(NicProfile requestedNicProfile, NicProfile nicProfile, Network network) { +if (requestedNicProfile == null) { +return; +} +String requestedIpv4Address = requestedNicProfile.getRequestedIPv4(); +if (requestedIpv4Address == null) { +return; +} +if (!NetUtils.isValidIp4(requestedIpv4Address)) { +throw new InvalidParameterValueException(String.format("The requested [IPv4 address='%s'] is not a valid IP address", requestedIpv4Address)); +} + +VlanVO vlanVo = _vlanDao.findByNetworkIdAndIpv4Range(network.getId(), requestedIpv4Address); Review comment: It makes sense. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2607: Allow changing disk offering of VMs' root volume during volume migration
blueorangutan commented on issue #2607: Allow changing disk offering of VMs' root volume during volume migration URL: https://github.com/apache/cloudstack/pull/2607#issuecomment-386308596 @DaanHoogland a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] DaanHoogland commented on issue #2607: Allow changing disk offering of VMs' root volume during volume migration
DaanHoogland commented on issue #2607: Allow changing disk offering of VMs' root volume during volume migration URL: https://github.com/apache/cloudstack/pull/2607#issuecomment-386308564 @blueorangutan test This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] GabrielBrascher commented on a change in pull request #2595: CLOUDSTACK-10199: Support requesting a specific IPv4 address
GabrielBrascher commented on a change in pull request #2595: CLOUDSTACK-10199: Support requesting a specific IPv4 address URL: https://github.com/apache/cloudstack/pull/2595#discussion_r185809174 ## File path: engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java ## @@ -883,6 +885,78 @@ public void saveExtraDhcpOptions(final String networkUuid, final Long nicId, fin return new Pair(vmNic, Integer.valueOf(deviceId)); } +/** + * If the requested IPv4 address from the NicProfile was configured then it configures the IPv4 address, Netmask and Gateway to deploy the VM with the requested IP. + */ +protected void configureNicProfileBasedOnRequestedIp(NicProfile requestedNicProfile, NicProfile nicProfile, Network network) { +if (requestedNicProfile == null) { +return; +} +String requestedIpv4Address = requestedNicProfile.getRequestedIPv4(); +if (requestedIpv4Address == null) { +return; +} +if (!NetUtils.isValidIp4(requestedIpv4Address)) { +throw new InvalidParameterValueException(String.format("The requested [IPv4 address='%s'] is not a valid IP address", requestedIpv4Address)); +} + +VlanVO vlanVo = _vlanDao.findByNetworkIdAndIpv4Range(network.getId(), requestedIpv4Address); Review comment: I can update it to `findByNetworkIdAndIpv4` then. What do you guys think of it? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] DaanHoogland commented on a change in pull request #2595: CLOUDSTACK-10199: Support requesting a specific IPv4 address
DaanHoogland commented on a change in pull request #2595: CLOUDSTACK-10199: Support requesting a specific IPv4 address URL: https://github.com/apache/cloudstack/pull/2595#discussion_r185807052 ## File path: engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java ## @@ -883,6 +885,78 @@ public void saveExtraDhcpOptions(final String networkUuid, final Long nicId, fin return new Pair(vmNic, Integer.valueOf(deviceId)); } +/** + * If the requested IPv4 address from the NicProfile was configured then it configures the IPv4 address, Netmask and Gateway to deploy the VM with the requested IP. + */ +protected void configureNicProfileBasedOnRequestedIp(NicProfile requestedNicProfile, NicProfile nicProfile, Network network) { +if (requestedNicProfile == null) { +return; +} +String requestedIpv4Address = requestedNicProfile.getRequestedIPv4(); +if (requestedIpv4Address == null) { +return; +} +if (!NetUtils.isValidIp4(requestedIpv4Address)) { +throw new InvalidParameterValueException(String.format("The requested [IPv4 address='%s'] is not a valid IP address", requestedIpv4Address)); +} + +VlanVO vlanVo = _vlanDao.findByNetworkIdAndIpv4Range(network.getId(), requestedIpv4Address); Review comment: convention says to leave out the vlan (we are already in the vlandao. so findByNetworkIdAndIpv4Range actually makes sense. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] fmaximus opened a new pull request #2622: CLOUDSTACK-10376: UI: Create VPC Offering does not show ConfigDrive a…
fmaximus opened a new pull request #2622: CLOUDSTACK-10376: UI: Create VPC Offering does not show ConfigDrive a… URL: https://github.com/apache/cloudstack/pull/2622 ## Description Added ConfigDrive as UserData provider in dropdown of Create VPC Offering ## Types of changes - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [ ] New feature (non-breaking change which adds functionality) - [x] Bug fix (non-breaking change which fixes an issue) - [ ] Enhancement (improves an existing feature and functionality) - [ ] Cleanup (Code refactoring and cleanup, that may add test cases) ## GitHub Issue/PRs ## Screenshots (if appropriate): ![Updated UI](https://user-images.githubusercontent.com/2563216/39580469-8a265f5a-4ee9-11e8-9713-711d9d493a26.png) ## How Has This Been Tested? Manually. ## Checklist: - [x] I have read the [CONTRIBUTING](https://github.com/apache/cloudstack/blob/master/CONTRIBUTING.md) document. - [x] My code follows the code style of this project. - [ ] My change requires a change to the documentation. - [ ] I have updated the documentation accordingly. Testing - [ ] I have added tests to cover my changes. - [ ] All relevant new and existing integration tests have passed. - [ ] A full integration testsuite with all test that can run on my environment has passed. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] GabrielBrascher commented on a change in pull request #2595: CLOUDSTACK-10199: Support requesting a specific IPv4 address
GabrielBrascher commented on a change in pull request #2595: CLOUDSTACK-10199: Support requesting a specific IPv4 address URL: https://github.com/apache/cloudstack/pull/2595#discussion_r185800197 ## File path: engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java ## @@ -883,6 +885,78 @@ public void saveExtraDhcpOptions(final String networkUuid, final Long nicId, fin return new Pair(vmNic, Integer.valueOf(deviceId)); } +/** + * If the requested IPv4 address from the NicProfile was configured then it configures the IPv4 address, Netmask and Gateway to deploy the VM with the requested IP. + */ +protected void configureNicProfileBasedOnRequestedIp(NicProfile requestedNicProfile, NicProfile nicProfile, Network network) { +if (requestedNicProfile == null) { +return; +} +String requestedIpv4Address = requestedNicProfile.getRequestedIPv4(); +if (requestedIpv4Address == null) { +return; +} +if (!NetUtils.isValidIp4(requestedIpv4Address)) { +throw new InvalidParameterValueException(String.format("The requested [IPv4 address='%s'] is not a valid IP address", requestedIpv4Address)); +} + +VlanVO vlanVo = _vlanDao.findByNetworkIdAndIpv4Range(network.getId(), requestedIpv4Address); +if (vlanVo == null) { +throw new CloudRuntimeException(String.format("Trying to configure a Nic with the requested [IPv4='%s'] but cannot find a Vlan for the [network id='%s']", +requestedIpv4Address, network.getId())); +} + +String ipv4Gateway = vlanVo.getVlanGateway(); +String ipv4Netmask = vlanVo.getVlanNetmask(); + +if (!NetUtils.isValidIp4(ipv4Gateway)) { +throw new CloudRuntimeException(String.format("The [IPv4Gateway='%s'] from [VlanId='%s'] is not valid", ipv4Gateway, vlanVo.getId())); +} +if (!NetUtils.isValidIp4Netmask(ipv4Netmask)) { +throw new CloudRuntimeException(String.format("The [IPv4Netmask='%s'] from [VlanId='%s'] is not valid", ipv4Netmask, vlanVo.getId())); +} + +acquireLockAndCheckIfIpv4IsFree(network, requestedIpv4Address); + +nicProfile.setIPv4Address(requestedIpv4Address); +nicProfile.setIPv4Gateway(ipv4Gateway); +nicProfile.setIPv4Netmask(ipv4Netmask); + +if (nicProfile.getMacAddress() == null) { +try { +String macAddress = _networkModel.getNextAvailableMacAddressInNetwork(network.getId()); +nicProfile.setMacAddress(macAddress); +} catch (InsufficientAddressCapacityException e) { +throw new CloudRuntimeException(String.format("Cannot get next available mac address in [network id='%s']", network.getId()), e); +} +} +} + +/** + * Acquires lock of in table "user_ip_address" and checks if the requested IPv4 address is Free. + */ +protected void acquireLockAndCheckIfIpv4IsFree(Network network, String requestedIpv4Address) { Review comment: Yes, that makes sense. I will update it. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] GabrielBrascher commented on a change in pull request #2595: CLOUDSTACK-10199: Support requesting a specific IPv4 address
GabrielBrascher commented on a change in pull request #2595: CLOUDSTACK-10199: Support requesting a specific IPv4 address URL: https://github.com/apache/cloudstack/pull/2595#discussion_r185796315 ## File path: engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java ## @@ -883,6 +885,78 @@ public void saveExtraDhcpOptions(final String networkUuid, final Long nicId, fin return new Pair(vmNic, Integer.valueOf(deviceId)); } +/** + * If the requested IPv4 address from the NicProfile was configured then it configures the IPv4 address, Netmask and Gateway to deploy the VM with the requested IP. + */ +protected void configureNicProfileBasedOnRequestedIp(NicProfile requestedNicProfile, NicProfile nicProfile, Network network) { +if (requestedNicProfile == null) { +return; +} +String requestedIpv4Address = requestedNicProfile.getRequestedIPv4(); +if (requestedIpv4Address == null) { +return; +} +if (!NetUtils.isValidIp4(requestedIpv4Address)) { +throw new InvalidParameterValueException(String.format("The requested [IPv4 address='%s'] is not a valid IP address", requestedIpv4Address)); +} + +VlanVO vlanVo = _vlanDao.findByNetworkIdAndIpv4Range(network.getId(), requestedIpv4Address); Review comment: Makes sense, I will change it. Thanks! This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] GabrielBrascher commented on a change in pull request #2595: CLOUDSTACK-10199: Support requesting a specific IPv4 address
GabrielBrascher commented on a change in pull request #2595: CLOUDSTACK-10199: Support requesting a specific IPv4 address URL: https://github.com/apache/cloudstack/pull/2595#discussion_r185795854 ## File path: engine/schema/src/main/java/com/cloud/dc/dao/VlanDaoImpl.java ## @@ -82,6 +83,24 @@ public VlanVO findByZoneAndVlanId(long zoneId, String vlanId) { return findOneBy(sc); } +/** + * Returns a vlan by the network id and if the given IPv4 is in the network IP range. + */ +@Override +public VlanVO findByNetworkIdAndIpv4Range(long networkId, String ipv4Address) { +List vlanVoList = listVlansByNetworkId(networkId); +for (VlanVO vlan : vlanVoList) { +String ipRange = vlan.getIpRange(); +String[] ipRangeParts = ipRange.split("-"); +String startIP = ipRangeParts[0]; +String endIP = ipRangeParts[1]; +if (NetUtils.isIpInRange(ipv4Address, startIP, endIP)) { Review comment: The problem is that I do not have a CIDR. The network CIDR (at least in the basic network) is null. I like the idea of isIp6InNetwork, but I will need to ignore CIDR at this stage and use only ipv4 range. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] GabrielBrascher commented on a change in pull request #2595: CLOUDSTACK-10199: Support requesting a specific IPv4 address
GabrielBrascher commented on a change in pull request #2595: CLOUDSTACK-10199: Support requesting a specific IPv4 address URL: https://github.com/apache/cloudstack/pull/2595#discussion_r185795774 ## File path: engine/orchestration/src/test/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestratorTest.java ## @@ -159,4 +174,255 @@ public void testDontRemoveDhcpServiceWhenNotProvided() { verify(testOrchastrator._ntwkSrvcDao, never()).getProviderForServiceInNetwork(network.getId(), Service.Dhcp); verify(testOrchastrator._networksDao, times(1)).findById(nic.getNetworkId()); } + +@Test +public void testConfigureNicProfileBasedOnRequestedIpTestMacNull() { +Network network = mock(Network.class); +NicProfile requestedNicProfile = new NicProfile(); +NicProfile nicProfile = Mockito.spy(new NicProfile()); + +configureTestConfigureNicProfileBasedOnRequestedIpTests(nicProfile, 0l, false, IPAddressVO.State.Free, "192.168.100.1", "255.255.255.0", "00-88-14-4D-4C-FB", +requestedNicProfile, null, "192.168.100.150"); + + testOrchastrator.configureNicProfileBasedOnRequestedIp(requestedNicProfile, nicProfile, network); + +verifyAndAssert("192.168.100.150", "192.168.100.1", "255.255.255.0", nicProfile, 1, 1); +} + +@Test +public void testConfigureNicProfileBasedOnRequestedIpTestNicProfileMacNotNull() { +Network network = mock(Network.class); +NicProfile requestedNicProfile = new NicProfile(); +NicProfile nicProfile = Mockito.spy(new NicProfile()); + +configureTestConfigureNicProfileBasedOnRequestedIpTests(nicProfile, 0l, false, IPAddressVO.State.Free, "192.168.100.1", "255.255.255.0", "00-88-14-4D-4C-FB", +requestedNicProfile, "00-88-14-4D-4C-FB", "192.168.100.150"); + + testOrchastrator.configureNicProfileBasedOnRequestedIp(requestedNicProfile, nicProfile, network); + +verifyAndAssert("192.168.100.150", "192.168.100.1", "255.255.255.0", nicProfile, 1, 0); +} + +@Test +public void testConfigureNicProfileBasedOnRequestedIpTestRequestedIpNull() { +testConfigureNicProfileBasedOnRequestedIpTestRequestedIp(null, "", false); +} + +@Test +public void testConfigureNicProfileBasedOnRequestedIpTestRequestedIpIsBlank() { +testConfigureNicProfileBasedOnRequestedIpTestRequestedIp("", "The requested [IPv4 address=''] is not a valid IP address", true); +} + +@Test +public void testConfigureNicProfileBasedOnRequestedIpTestRequestedIpIsNotValid() { +testConfigureNicProfileBasedOnRequestedIpTestRequestedIp("123", "The requested [IPv4 address='123'] is not a valid IP address", true); +} + +private void testConfigureNicProfileBasedOnRequestedIpTestRequestedIp(String requestedIpv4Address, String exceptionAssert, boolean expectException) { +Network network = mock(Network.class); +NicProfile requestedNicProfile = new NicProfile(); +NicProfile nicProfile = Mockito.spy(new NicProfile()); + +configureTestConfigureNicProfileBasedOnRequestedIpTests(nicProfile, 0l, false, IPAddressVO.State.Free, "192.168.100.1", "255.255.255.0", "00-88-14-4D-4C-FB", +requestedNicProfile, null, requestedIpv4Address); +try { + testOrchastrator.configureNicProfileBasedOnRequestedIp(requestedNicProfile, nicProfile, network); +} catch (InvalidParameterValueException e) { +assertEquals(exceptionAssert, e.getMessage()); Review comment: I always use @Test(expected=Exception); however, it is not working here now, I will check again what might be causing it. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2621: Backports for 4.11 branch
blueorangutan commented on issue #2621: Backports for 4.11 branch URL: https://github.com/apache/cloudstack/pull/2621#issuecomment-386278062 @borisstoyanov a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] borisstoyanov commented on issue #2621: Backports for 4.11 branch
borisstoyanov commented on issue #2621: Backports for 4.11 branch URL: https://github.com/apache/cloudstack/pull/2621#issuecomment-386278034 @blueorangutan test This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2621: Backports for 4.11 branch
blueorangutan commented on issue #2621: Backports for 4.11 branch URL: https://github.com/apache/cloudstack/pull/2621#issuecomment-386277850 Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2002 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rhtyd commented on issue #2508: CLOUDSTACK-9114: Reduce VR downtime during network restart
rhtyd commented on issue #2508: CLOUDSTACK-9114: Reduce VR downtime during network restart URL: https://github.com/apache/cloudstack/pull/2508#issuecomment-386272855 Ping - @ustcweizhou @resmo @rafaelweingartner @wido @nitin-maharana @nvazquez @NuxRo review and testing is requested. Packages of this PR are mirrored here: https://lab.yadav.cloud/testing/vr-downtime SystemVM template can be used from here: https://lab.yadav.cloud/systemvmtemplates/4.11/ This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rhtyd commented on issue #2508: CLOUDSTACK-9114: Reduce VR downtime during network restart
rhtyd commented on issue #2508: CLOUDSTACK-9114: Reduce VR downtime during network restart URL: https://github.com/apache/cloudstack/pull/2508#issuecomment-385358259 @ustcweizhou @resmo @DaanHoogland @rafaelweingartner @wido @nitin-maharana @nvazquez @NuxRo this is ready for review, please help review and test. Packages of this PR are mirrored here: https://lab.yadav.cloud/testing/vr-downtime I'll open up test/stabilization fixes in a separate FR for 4.11 branch. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2621: Backports for 4.11 branch
blueorangutan commented on issue #2621: Backports for 4.11 branch URL: https://github.com/apache/cloudstack/pull/2621#issuecomment-386270257 Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2001 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2621: Backports for 4.11 branch
blueorangutan commented on issue #2621: Backports for 4.11 branch URL: https://github.com/apache/cloudstack/pull/2621#issuecomment-386264158 @borisstoyanov a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2621: Backports for 4.11 branch
blueorangutan commented on issue #2621: Backports for 4.11 branch URL: https://github.com/apache/cloudstack/pull/2621#issuecomment-386270586 @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rhtyd commented on issue #2621: Backports for 4.11 branch
rhtyd commented on issue #2621: Backports for 4.11 branch URL: https://github.com/apache/cloudstack/pull/2621#issuecomment-386270517 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rhtyd commented on issue #2511: [CLOUDSTACK-10344] bug when moving ACL rules (change order with drag and drop)
rhtyd commented on issue #2511: [CLOUDSTACK-10344] bug when moving ACL rules (change order with drag and drop) URL: https://github.com/apache/cloudstack/pull/2511#issuecomment-386270351 @rafaelweingartner I think you're trying to solve the ordering problem. Here's another problem to this: if two admins are trying to change the order in different browsers/cli. I think the simplest solution is that every change in the UI (drag/drop) should send an update to backend which updates when the old list (provided by the api) matches the db, otherwise an error can be shown to the user that the list was changed (by someone else). An alternative could be that in the UI, you drag+drop to change order and there is an apply button that pops up to apply the final order. I faced a similar issue for drag+drop to reorder rule permissions of a role, I used this to solve it: https://github.com/apache/cloudstack/blob/master/ui/scripts/roles.js#L196 https://github.com/apache/cloudstack/blob/master/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/UpdateRolePermissionCmd.java#L55 Therefore, yes it can be done via the update API adding a new arg. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2621: Backports for 4.11 branch
blueorangutan commented on issue #2621: Backports for 4.11 branch URL: https://github.com/apache/cloudstack/pull/2621#issuecomment-386270257 Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2001 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rafaelweingartner commented on issue #2511: [CLOUDSTACK-10344] bug when moving ACL rules (change order with drag and drop)
rafaelweingartner commented on issue #2511: [CLOUDSTACK-10344] bug when moving ACL rules (change order with drag and drop) URL: https://github.com/apache/cloudstack/pull/2511#issuecomment-386267109 I did not understand what you mean. Are you saying we keep in javascript a list with the state of the original ACL list, and then when we change, we create another list, we then send these two lists to the server so the server can move the ACLs that changed places? So, you would like to add a new parameters to the update method? Is that it? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2619: Remove "self-injection" of AccountManagerImpl
blueorangutan commented on issue #2619: Remove "self-injection" of AccountManagerImpl URL: https://github.com/apache/cloudstack/pull/2619#issuecomment-386269263 @rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rhtyd commented on issue #2619: Remove "self-injection" of AccountManagerImpl
rhtyd commented on issue #2619: Remove "self-injection" of AccountManagerImpl URL: https://github.com/apache/cloudstack/pull/2619#issuecomment-386269134 Okay @rafaelweingartner, I saw a force push I thought something changed. I'll kick tests now. @blueorangutan test This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rafaelweingartner commented on issue #2511: [CLOUDSTACK-10344] bug when moving ACL rules (change order with drag and drop)
rafaelweingartner commented on issue #2511: [CLOUDSTACK-10344] bug when moving ACL rules (change order with drag and drop) URL: https://github.com/apache/cloudstack/pull/2511#issuecomment-386267109 I did not understand what you mean. Are you saying we keep in javascript a list with the state of the original ACL list, and then when we change, we send these two lists to the server so the server can move the ACLs that changed places? So, you would like to add a new parameters to the update method? Is that it? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2619: Remove "self-injection" of AccountManagerImpl
blueorangutan commented on issue #2619: Remove "self-injection" of AccountManagerImpl URL: https://github.com/apache/cloudstack/pull/2619#issuecomment-386266325 Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2000 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rhtyd commented on issue #2511: [CLOUDSTACK-10344] bug when moving ACL rules (change order with drag and drop)
rhtyd commented on issue #2511: [CLOUDSTACK-10344] bug when moving ACL rules (change order with drag and drop) URL: https://github.com/apache/cloudstack/pull/2511#issuecomment-386265921 @rafaelweingartner instead of catering to individual change, a fix could be to simply provide the update API the new list and old list, on the backend a comparison could be done to check and update the list only if old list is the same as in db. The same logic was used in Roles (drag+drop for order). Would you like to reconsider the implemenation and avoid adding a new API? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] borisstoyanov commented on issue #2621: Backports for 4.11 branch
borisstoyanov commented on issue #2621: Backports for 4.11 branch URL: https://github.com/apache/cloudstack/pull/2621#issuecomment-386264136 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2621: Backports for 4.11 branch
blueorangutan commented on issue #2621: Backports for 4.11 branch URL: https://github.com/apache/cloudstack/pull/2621#issuecomment-386264158 @borisstoyanov a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rafaelweingartner commented on issue #2619: Remove "self-injection" of AccountManagerImpl
rafaelweingartner commented on issue #2619: Remove "self-injection" of AccountManagerImpl URL: https://github.com/apache/cloudstack/pull/2619#issuecomment-386260661 @rhtyd you did not need to package again. I forced a new commit only to push Jenkins to build again. BTW, do you know why we keep getting this constant Jenkins failures. Quite often I get a 404 when accessing Jenkins builds that failed. It looks like the builds are being deleted. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rafaelweingartner commented on issue #2619: Remove "self-injection" of AccountManagerImpl
rafaelweingartner commented on issue #2619: Remove "self-injection" of AccountManagerImpl URL: https://github.com/apache/cloudstack/pull/2619#issuecomment-386260661 @rhtyd you did not need to package again. I forced a new commit only to push Jenkins to build again. BTW, do you know why we keep getting this constant Jenkins failures. Quite often I get a 404 when accessing Jenkins build that failed. It looks like the builds are being deleted. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rhtyd opened a new pull request #2621: Backports for 4.11 branch
rhtyd opened a new pull request #2621: Backports for 4.11 branch URL: https://github.com/apache/cloudstack/pull/2621 ## Description This PR has backported changes/PRs merged on master that we can consider for 4.11, limiting to fixes and no features. ## Types of changes - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [ ] New feature (non-breaking change which adds functionality) - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] Enhancement (improves an existing feature and functionality) - [ ] Cleanup (Code refactoring and cleanup, that may add test cases) ## GitHub Issue/PRs ## Screenshots (if appropriate): ## How Has This Been Tested? ## Checklist: - [ ] I have read the [CONTRIBUTING](https://github.com/apache/cloudstack/blob/master/CONTRIBUTING.md) document. - [ ] My code follows the code style of this project. - [ ] My change requires a change to the documentation. - [ ] I have updated the documentation accordingly. Testing - [ ] I have added tests to cover my changes. - [ ] All relevant new and existing integration tests have passed. - [ ] A full integration testsuite with all test that can run on my environment has passed. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2619: Remove "self-injection" of AccountManagerImpl
blueorangutan commented on issue #2619: Remove "self-injection" of AccountManagerImpl URL: https://github.com/apache/cloudstack/pull/2619#issuecomment-386259939 @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rhtyd commented on issue #2619: Remove "self-injection" of AccountManagerImpl
rhtyd commented on issue #2619: Remove "self-injection" of AccountManagerImpl URL: https://github.com/apache/cloudstack/pull/2619#issuecomment-386259715 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rhtyd closed pull request #1940: CLOUDSTACK-9781:ACS records ID in events tables instead of UUID.
rhtyd closed pull request #1940: CLOUDSTACK-9781:ACS records ID in events tables instead of UUID. URL: https://github.com/apache/cloudstack/pull/1940 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java index 10cf00f987b..4bb6d9066c7 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java @@ -106,7 +106,7 @@ public long getEntityOwnerId() { @Override public void execute() { -CallContext.current().setEventDetails("Virtual router element Id: " + getEntityId()); +CallContext.current().setEventDetails("Virtual router element Id: " + getEntityUuid()); VirtualRouterProvider result = _service.get(0).getCreatedElement(getEntityId()); if (result != null) { VirtualRouterProviderResponse response = _responseGenerator.createVirtualRouterProviderResponse(result); @@ -137,6 +137,6 @@ public String getEventType() { @Override public String getEventDescription() { -return "Adding physical network ServiceProvider Virtual Router: " + getEntityId(); +return "Adding physical network ServiceProvider Virtual Router: " + getEntityUuid(); } } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java index 4513e2e85e2..c460c6665e7 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java @@ -82,7 +82,7 @@ public String getEventType() { @Override public String getEventDescription() { -return "destroying router: " + getId(); +return "destroying router: " + this._uuidMgr.getUuid(VirtualMachine.class,getId()); } @Override @@ -98,7 +98,7 @@ public Long getInstanceId() { @Override public void execute() throws ConcurrentOperationException, ResourceUnavailableException { CallContext ctx = CallContext.current(); -ctx.setEventDetails("Router Id: " + getId()); +ctx.setEventDetails("Router Id: " + this._uuidMgr.getUuid(VirtualMachine.class,getId())); VirtualRouter result = _routerService.destroyRouter(getId(), ctx.getCallingAccount(), ctx.getCallingUserId()); if (result != null) { diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java index 4b138f3cfc1..802e3df3dcf 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java @@ -83,7 +83,7 @@ public String getEventType() { @Override public String getEventDescription() { -return "rebooting router: " + getId(); +return "rebooting router: " + this._uuidMgr.getUuid(VirtualMachine.class,getId()); } @Override @@ -98,7 +98,7 @@ public Long getInstanceId() { @Override public void execute() throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { -CallContext.current().setEventDetails("Router Id: " + getId()); +CallContext.current().setEventDetails("Router Id: " + this._uuidMgr.getUuid(VirtualMachine.class,getId())); VirtualRouter result = _routerService.rebootRouter(getId(), true); if (result != null) { DomainRouterResponse response = _responseGenerator.createDomainRouterResponse(result); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java index 173833cb42c..6d36a3c801e 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java @@ -89,7 +89,7 @@ public String getEventType() { @Override public String getEventDescription() { -return "starting router: " + getId(); +return "starting router: " + this._uuidMgr.getUuid(VirtualMachine.class, getId()); } @Override @@ -104,7 +104,7 @@ public Long getInstanceId() { @Override public void
[cloudstack] branch master updated: CLOUDSTACK-9781: record resource uuid in events instead of integer id (#1940)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git The following commit(s) were added to refs/heads/master by this push: new 1ff171d CLOUDSTACK-9781: record resource uuid in events instead of integer id (#1940) 1ff171d is described below commit 1ff171db902b98df5d172ae468c33a07ea1204d5 Author: jayantpatil1234AuthorDate: Thu May 3 16:32:00 2018 +0530 CLOUDSTACK-9781: record resource uuid in events instead of integer id (#1940) This changes several event logging to use uuid of resource than integer id when creating API events. --- .../admin/router/CreateVirtualRouterElementCmd.java | 4 ++-- .../api/command/admin/router/DestroyRouterCmd.java | 4 ++-- .../api/command/admin/router/RebootRouterCmd.java| 4 ++-- .../api/command/admin/router/StartRouterCmd.java | 4 ++-- .../api/command/admin/router/StopRouterCmd.java | 4 ++-- .../command/admin/systemvm/DestroySystemVmCmd.java | 4 ++-- .../command/admin/systemvm/MigrateSystemVMCmd.java | 4 ++-- .../command/admin/systemvm/RebootSystemVmCmd.java| 4 ++-- .../api/command/admin/systemvm/ScaleSystemVMCmd.java | 4 ++-- .../api/command/admin/systemvm/StartSystemVMCmd.java | 4 ++-- .../api/command/admin/systemvm/StopSystemVmCmd.java | 4 ++-- .../command/admin/systemvm/UpgradeSystemVMCmd.java | 2 +- .../admin/template/CreateTemplateCmdByAdmin.java | 4 +++- .../api/command/admin/vm/AddNicToVMCmdByAdmin.java | 3 ++- .../api/command/admin/vm/DeployVMCmdByAdmin.java | 2 +- .../api/command/admin/vm/DestroyVMCmdByAdmin.java| 2 +- .../api/command/admin/vm/ExpungeVMCmd.java | 4 ++-- .../api/command/admin/vm/MigrateVMCmd.java | 12 +--- .../admin/vm/MigrateVirtualMachineWithVolumeCmd.java | 2 +- .../api/command/admin/vm/RebootVMCmdByAdmin.java | 2 +- .../command/admin/vm/RemoveNicFromVMCmdByAdmin.java | 3 ++- .../api/command/admin/vm/RestoreVMCmdByAdmin.java| 2 +- .../api/command/admin/vm/StartVMCmdByAdmin.java | 2 +- .../api/command/admin/vm/StopVMCmdByAdmin.java | 2 +- .../admin/vm/UpdateDefaultNicForVMCmdByAdmin.java| 3 ++- .../api/command/admin/vm/UpdateVMCmdByAdmin.java | 2 +- .../api/command/admin/vm/UpgradeVMCmdByAdmin.java| 2 +- .../vmsnapshot/RevertToVMSnapshotCmdByAdmin.java | 3 ++- .../command/admin/volume/AttachVolumeCmdByAdmin.java | 2 +- .../command/admin/volume/CreateVolumeCmdByAdmin.java | 2 +- .../command/admin/volume/DetachVolumeCmdByAdmin.java | 2 +- .../command/admin/volume/ResizeVolumeCmdByAdmin.java | 2 +- .../command/admin/volume/UpdateVolumeCmdByAdmin.java | 2 +- .../api/command/user/snapshot/CreateSnapshotCmd.java | 10 +- .../snapshot/CreateSnapshotFromVMSnapshotCmd.java| 4 ++-- .../api/command/user/snapshot/DeleteSnapshotCmd.java | 4 ++-- .../api/command/user/snapshot/RevertSnapshotCmd.java | 4 ++-- .../api/command/user/template/CopyTemplateCmd.java | 20 ++-- .../api/command/user/template/CreateTemplateCmd.java | 2 +- .../api/command/user/template/DeleteTemplateCmd.java | 4 ++-- .../command/user/template/ExtractTemplateCmd.java| 3 ++- .../api/command/user/vm/AddIpToVmNicCmd.java | 6 +++--- .../api/command/user/vm/AddNicToVMCmd.java | 5 +++-- .../cloudstack/api/command/user/vm/DeployVMCmd.java | 4 ++-- .../cloudstack/api/command/user/vm/DestroyVMCmd.java | 4 ++-- .../cloudstack/api/command/user/vm/RebootVMCmd.java | 4 ++-- .../api/command/user/vm/RemoveNicFromVMCmd.java | 5 +++-- .../cloudstack/api/command/user/vm/RestoreVMCmd.java | 2 +- .../cloudstack/api/command/user/vm/ScaleVMCmd.java | 5 +++-- .../cloudstack/api/command/user/vm/StartVMCmd.java | 4 ++-- .../cloudstack/api/command/user/vm/StopVMCmd.java| 4 ++-- .../command/user/vm/UpdateDefaultNicForVMCmd.java| 5 +++-- .../cloudstack/api/command/user/vm/UpdateVMCmd.java | 2 +- .../api/command/user/vm/UpdateVmNicIpCmd.java| 2 +- .../cloudstack/api/command/user/vm/UpgradeVMCmd.java | 2 +- .../command/user/vmsnapshot/CreateVMSnapshotCmd.java | 5 +++-- .../command/user/vmsnapshot/DeleteVMSnapshotCmd.java | 4 ++-- .../user/vmsnapshot/RevertToVMSnapshotCmd.java | 4 ++-- .../api/command/user/volume/AttachVolumeCmd.java | 4 ++-- .../api/command/user/volume/CreateVolumeCmd.java | 4 ++-- .../api/command/user/volume/DeleteVolumeCmd.java | 2 +- .../api/command/user/volume/DetachVolumeCmd.java | 6 +++--- .../api/command/user/volume/ExtractVolumeCmd.java| 2 +- .../api/command/user/volume/MigrateVolumeCmd.java| 3 ++- .../api/command/user/volume/ResizeVolumeCmd.java | 4 ++-- .../api/command/user/volume/UpdateVolumeCmd.java | 2 +- .../api/command/user/volume/UploadVolumeCmd.java | 3
[GitHub] rhtyd commented on issue #1940: CLOUDSTACK-9781:ACS records ID in events tables instead of UUID.
rhtyd commented on issue #1940: CLOUDSTACK-9781:ACS records ID in events tables instead of UUID. URL: https://github.com/apache/cloudstack/pull/1940#issuecomment-386258945 Merging this based on code reviews and test results. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[cloudstack] branch master updated: api: Fixes #2528 move ostypeid from id to uuid (#2608)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git The following commit(s) were added to refs/heads/master by this push: new d94a5be api: Fixes #2528 move ostypeid from id to uuid (#2608) d94a5be is described below commit d94a5bea3c3f826fc53d8a555bd69714546e025d Author: Marc-Aurèle BrothierAuthorDate: Thu May 3 13:00:26 2018 +0200 api: Fixes #2528 move ostypeid from id to uuid (#2608) This moves the ostypeid in api response to uuid instead of integer id. --- .../java/org/apache/cloudstack/api/response/UserVmResponse.java | 6 +++--- server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java index 2ff1eaa..8db4f85 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java @@ -284,7 +284,7 @@ public class UserVmResponse extends BaseResponseWithTagInformation implements Co @SerializedName(ApiConstants.OS_TYPE_ID) @Param(description = "OS type id of the vm", since = "4.4") -private Long osTypeId; +private String osTypeId; public UserVmResponse() { securityGroupList = new LinkedHashSet(); @@ -810,7 +810,7 @@ public class UserVmResponse extends BaseResponseWithTagInformation implements Co this.details = details; } -public void setOsTypeId(Long osTypeId) { +public void setOsTypeId(String osTypeId) { this.osTypeId = osTypeId; } @@ -834,7 +834,7 @@ public class UserVmResponse extends BaseResponseWithTagInformation implements Co isDynamicallyScalable = dynamicallyScalable; } -public Long getOsTypeId() { +public String getOsTypeId() { return osTypeId; } } diff --git a/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java index f0a0a56..00ec61a 100644 --- a/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java +++ b/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java @@ -196,7 +196,7 @@ public class UserVmJoinDaoImpl extends GenericDaoBaseWithTagInformation
[GitHub] rhtyd closed issue #2528: listVirtualMachines response ostypeid is foreign DB ID, not UUID
rhtyd closed issue #2528: listVirtualMachines response ostypeid is foreign DB ID, not UUID URL: https://github.com/apache/cloudstack/issues/2528 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rhtyd closed pull request #2608: API: move ostypeid from DB id to DB uuid
rhtyd closed pull request #2608: API: move ostypeid from DB id to DB uuid URL: https://github.com/apache/cloudstack/pull/2608 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java index 2ff1eaa717b..8db4f853243 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java @@ -284,7 +284,7 @@ @SerializedName(ApiConstants.OS_TYPE_ID) @Param(description = "OS type id of the vm", since = "4.4") -private Long osTypeId; +private String osTypeId; public UserVmResponse() { securityGroupList = new LinkedHashSet(); @@ -810,7 +810,7 @@ public void setDetails(Map details) { this.details = details; } -public void setOsTypeId(Long osTypeId) { +public void setOsTypeId(String osTypeId) { this.osTypeId = osTypeId; } @@ -834,7 +834,7 @@ public void setDynamicallyScalable(Boolean dynamicallyScalable) { isDynamicallyScalable = dynamicallyScalable; } -public Long getOsTypeId() { +public String getOsTypeId() { return osTypeId; } } diff --git a/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java index f0a0a56e3c6..00ec61ad846 100644 --- a/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java +++ b/server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java @@ -196,7 +196,7 @@ public UserVmResponse newUserVmResponse(ResponseView view, String objectName, Us userVmResponse.setPublicIpId(userVm.getPublicIpUuid()); userVmResponse.setPublicIp(userVm.getPublicIpAddress()); userVmResponse.setKeyPairName(userVm.getKeypairName()); -userVmResponse.setOsTypeId(userVm.getGuestOsId()); +userVmResponse.setOsTypeId(userVm.getGuestOsUuid()); if (details.contains(VMDetails.all) || details.contains(VMDetails.stats)) { // stats calculation This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rhtyd commented on issue #2608: API: move ostypeid from DB id to DB uuid
rhtyd commented on issue #2608: API: move ostypeid from DB id to DB uuid URL: https://github.com/apache/cloudstack/pull/2608#issuecomment-386258672 Test LGTM, comparing last two runs. Merging this based on reviews and tests. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rafaelweingartner commented on a change in pull request #2616: 4.11.1.0: Stabilization and blocker/issues fixes
rafaelweingartner commented on a change in pull request #2616: 4.11.1.0: Stabilization and blocker/issues fixes URL: https://github.com/apache/cloudstack/pull/2616#discussion_r185754918 ## File path: systemvm/debian/opt/cloud/bin/setup/patchsystemvm.sh ## @@ -37,6 +37,8 @@ patch_systemvm() { echo "Restored keystore file and certs using backup" >> $logfile fi rm -fr $backupfolder + # Import global cacerts into 'cloud' service's keystore + keytool -importkeystore -srckeystore /etc/ssl/certs/java/cacerts -destkeystore /usr/local/cloud/systemvm/certs/realhostip.keystore -srcstorepass changeit -deststorepass vmops.com -noprompt || true Review comment: ok, got it. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2382: CLOUDSTACK-4045 IP address acquired with associateIpAddress is marked as source NAT
blueorangutan commented on issue #2382: CLOUDSTACK-4045 IP address acquired with associateIpAddress is marked as source NAT URL: https://github.com/apache/cloudstack/pull/2382#issuecomment-386246094 Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1999 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2619: Remove "self-injection" of AccountManagerImpl
blueorangutan commented on issue #2619: Remove "self-injection" of AccountManagerImpl URL: https://github.com/apache/cloudstack/pull/2619#issuecomment-386245824 Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1998 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2382: CLOUDSTACK-4045 IP address acquired with associateIpAddress is marked as source NAT
blueorangutan commented on issue #2382: CLOUDSTACK-4045 IP address acquired with associateIpAddress is marked as source NAT URL: https://github.com/apache/cloudstack/pull/2382#issuecomment-386237167 @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rhtyd commented on issue #2382: CLOUDSTACK-4045 IP address acquired with associateIpAddress is marked as source NAT
rhtyd commented on issue #2382: CLOUDSTACK-4045 IP address acquired with associateIpAddress is marked as source NAT URL: https://github.com/apache/cloudstack/pull/2382#issuecomment-386237029 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2619: Remove "self-injection" of AccountManagerImpl
blueorangutan commented on issue #2619: Remove "self-injection" of AccountManagerImpl URL: https://github.com/apache/cloudstack/pull/2619#issuecomment-386236260 @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rhtyd commented on issue #2619: Remove "self-injection" of AccountManagerImpl
rhtyd commented on issue #2619: Remove "self-injection" of AccountManagerImpl URL: https://github.com/apache/cloudstack/pull/2619#issuecomment-386236009 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes
blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes URL: https://github.com/apache/cloudstack/pull/2616#issuecomment-386236019 @rhtyd a Trillian-Jenkins matrix job (centos6 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rhtyd commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes
rhtyd commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes URL: https://github.com/apache/cloudstack/pull/2616#issuecomment-386235840 @blueorangutan test matrix This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes
blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes URL: https://github.com/apache/cloudstack/pull/2616#issuecomment-386232445 Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1997 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes
blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes URL: https://github.com/apache/cloudstack/pull/2616#issuecomment-386087674 Trillian test result (tid-2578) Environment: xcpng74 (x2), Advanced Networking with Mgmt server 7 Total time taken: 24113 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2616-t2578-xcpng74.zip Intermitten failure detected: /marvin/tests/smoke/test_deploy_vm_iso.py Intermitten failure detected: /marvin/tests/smoke/test_primary_storage.py Smoke tests completed. 66 look OK, 1 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_01_primary_storage_iscsi | `Error` | 3.10 | test_primary_storage.py ** the iscsi test failed due to env issue This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes
blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes URL: https://github.com/apache/cloudstack/pull/2616#issuecomment-386075457 Trillian test result (tid-2577) Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7 Total time taken: 21450 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2616-t2577-xenserver-71.zip Intermitten failure detected: /marvin/tests/smoke/test_scale_vm.py Smoke tests completed. 66 look OK, 1 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_01_scale_vm | `Error` | 14.39 | test_scale_vm.py ** the scale test failed, as this is a pro/paid feature not available in test env. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes
blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes URL: https://github.com/apache/cloudstack/pull/2616#issuecomment-386225886 @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rhtyd commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes
rhtyd commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes URL: https://github.com/apache/cloudstack/pull/2616#issuecomment-386225794 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rhtyd commented on a change in pull request #2616: 4.11.1.0: Stabilization and blocker/issues fixes
rhtyd commented on a change in pull request #2616: 4.11.1.0: Stabilization and blocker/issues fixes URL: https://github.com/apache/cloudstack/pull/2616#discussion_r185726831 ## File path: systemvm/debian/opt/cloud/bin/setup/patchsystemvm.sh ## @@ -37,6 +37,8 @@ patch_systemvm() { echo "Restored keystore file and certs using backup" >> $logfile fi rm -fr $backupfolder + # Import global cacerts into 'cloud' service's keystore + keytool -importkeystore -srckeystore /etc/ssl/certs/java/cacerts -destkeystore /usr/local/cloud/systemvm/certs/realhostip.keystore -srcstorepass changeit -deststorepass vmops.com -noprompt || true Review comment: For historic reasons, the keystore used by agent is at /usr/local/cloud/systemvm/cert in systemvm. This code/change ensures that the global ca cert (java) is imported into that local keystore. The reason `|| true` is used to ensure that this does not fail patching in case the keystore already has certs imported (say an already patched systemvm stopped and started). The letsencrypt cacert is imported during systemvmtemplate building, the change in patchsystemvm.sh will ensure that we import cacerts during systemvm patching. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rhtyd commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes
rhtyd commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes URL: https://github.com/apache/cloudstack/pull/2616#issuecomment-385981744 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes
blueorangutan commented on issue #2616: 4.11.1.0: Stabilization and blocker/issues fixes URL: https://github.com/apache/cloudstack/pull/2616#issuecomment-385990102 Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1996 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rhtyd commented on a change in pull request #2616: 4.11.1.0: Stabilization and blocker/issues fixes
rhtyd commented on a change in pull request #2616: 4.11.1.0: Stabilization and blocker/issues fixes URL: https://github.com/apache/cloudstack/pull/2616#discussion_r185726059 ## File path: tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh ## @@ -31,6 +31,16 @@ function configure_apache2() { sed -i 's/SSLProtocol .*$/SSLProtocol TLSv1.2/g' /etc/apache2/mods-available/ssl.conf } +function configure_cacerts() { + CDIR=$(pwd) + cd /tmp + # Add LetsEncrypt ca-cert + wget https://letsencrypt.org/certs/lets-encrypt-x3-cross-signed.der + keytool -trustcacerts -keystore /etc/ssl/certs/java/cacerts -storepass changeit -noprompt -importcert -alias letsencryptauthorityx3cross -file lets-encrypt-x3-cross-signed.der || true Review comment: Removed, the general idea was to make this fail-safe cmd. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rhtyd commented on a change in pull request #2616: 4.11.1.0: Stabilization and blocker/issues fixes
rhtyd commented on a change in pull request #2616: 4.11.1.0: Stabilization and blocker/issues fixes URL: https://github.com/apache/cloudstack/pull/2616#discussion_r185724447 ## File path: systemvm/debian/opt/cloud/bin/setup/cloud-early-config ## @@ -71,16 +71,16 @@ config_guest() { get_boot_params() { case $HYPERVISOR in - xen-pv) + xen-pv|xen-domU) Review comment: @khos2ow I've replied here, for reference - https://github.com/apache/cloudstack/pull/2465#discussion_r185519409 The `virt-what` output and changes in cloud-early-config should be tested against 4.11+ systemvm template. The changes are specifically for systemvmtemplate that is Debian9 based whose /boot is ext2 so as to allow for PyGrub to work both by 6.x and 7.x XS versions, therefore even if we get into `xen-domU` case, the pv cmdline args will be still available and patched to boot `vmlinuz` with those args, irrespective to whether the systemvm boots as pv or hvm they will all get the cmdline option via /proc/cmdline. My change assumes that virt-what will return the correct output (also tested on 6.x, 7.x versions), and therefore for pv and domU cases the patching approach should read from /proc/cmdline. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rhtyd commented on a change in pull request #2616: 4.11.1.0: Stabilization and blocker/issues fixes
rhtyd commented on a change in pull request #2616: 4.11.1.0: Stabilization and blocker/issues fixes URL: https://github.com/apache/cloudstack/pull/2616#discussion_r185724447 ## File path: systemvm/debian/opt/cloud/bin/setup/cloud-early-config ## @@ -71,16 +71,16 @@ config_guest() { get_boot_params() { case $HYPERVISOR in - xen-pv) + xen-pv|xen-domU) Review comment: @khos2ow I've replied here, for reference - https://github.com/apache/cloudstack/pull/2465#discussion_r185519409 The `virt-what` output and changes in cloud-early-config should be tested against 4.11+ systemvm template. The changes are specifically for systemvmtemplate that is Debian9 based whose /boot is ext2 so as to allow for PyGrub to work both by 6.x and 7.x XS versions, therefore even if we get into `xen-domU` case, the pv cmdline args will be still available and patched to boot `vmlinuz` with those args, irrespective to whether the systemvm boots as pv or hvm they will all get the cmdline option via /proc/cmdline. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rhtyd commented on a change in pull request #2465: CLOUDSTACK-10232: SystemVMs and VR to run as HVM on XenServer
rhtyd commented on a change in pull request #2465: CLOUDSTACK-10232: SystemVMs and VR to run as HVM on XenServer URL: https://github.com/apache/cloudstack/pull/2465#discussion_r185723416 ## File path: systemvm/debian/opt/cloud/bin/setup/cloud-early-config ## @@ -64,10 +71,17 @@ config_guest() { get_boot_params() { case $HYPERVISOR in - xen-domU|xen-hvm) + xen-pv) cat /proc/cmdline > $CMDLINE sed -i "s/%/ /g" $CMDLINE ;; + xen-hvm) + if [ ! -f /usr/sbin/xenstore-read ]; then +log_it "ERROR: xentools not installed, cannot found xenstore-read" && exit 5 + fi + /usr/sbin/xenstore-read vm-data/cloudstack/init > /var/cache/cloud/cmdline Review comment: @khos2ow I think you're missing a big point and I'm wondering how you're testing your changes. This script runs inside CloudStack's systemvmtemplate that is based on Debian 9 for 4.11+. For the change in 4.11 branch, the test/changes must be performed on Debian9 based guest vm only. In our built template, the path to `xenstore-read` is at `/usr/bin`. Regarding the `virt-what` comment, again the version of virt-what is specific to the Debian 9 based systemvmtemplate that would return xen-hvm in my tests across XenServer 6.5-7.x versions. I'll therefore keep my changes that are tested against 4.11 systemvmtemplate. Temporarily hosted here are latest 4.11 templates if you want to try them: https://lab.yadav.cloud/systemvmtemplates/4.11/ This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2473: CLOUDSTACK-10309 Add option on if to VM HA power-on a OOB-shut-off-VM
blueorangutan commented on issue #2473: CLOUDSTACK-10309 Add option on if to VM HA power-on a OOB-shut-off-VM URL: https://github.com/apache/cloudstack/pull/2473#issuecomment-386201594 @borisstoyanov a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] borisstoyanov commented on issue #2473: CLOUDSTACK-10309 Add option on if to VM HA power-on a OOB-shut-off-VM
borisstoyanov commented on issue #2473: CLOUDSTACK-10309 Add option on if to VM HA power-on a OOB-shut-off-VM URL: https://github.com/apache/cloudstack/pull/2473#issuecomment-386201460 @blueorangutan test This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services