[GitHub] blueorangutan commented on issue #2538: Remove deprecated tomcat configuration file instead of moving it, sin…

2018-04-09 Thread GitBox
blueorangutan commented on issue #2538: Remove deprecated tomcat configuration 
file instead of moving it, sin…
URL: https://github.com/apache/cloudstack/pull/2538#issuecomment-379966200
 
 
   Trillian test result (tid-2476)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 47921 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2538-t2476-kvm-centos7.zip
   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_reset_vm_on_reboot.py
   Intermitten failure detected: /marvin/tests/smoke/test_router_dhcphosts.py
   Intermitten failure detected: /marvin/tests/smoke/test_router_dns.py
   Intermitten failure detected: /marvin/tests/smoke/test_router_dnsservice.py
   Intermitten failure detected: 
/marvin/tests/smoke/test_routers_iptables_default_policy.py
   Intermitten failure detected: /marvin/tests/smoke/test_routers_network_ops.py
   Intermitten failure detected: /marvin/tests/smoke/test_routers.py
   Intermitten failure detected: /marvin/tests/smoke/test_secondary_storage.py
   Intermitten failure detected: /marvin/tests/smoke/test_service_offerings.py
   Intermitten failure detected: /marvin/tests/smoke/test_snapshots.py
   Intermitten failure detected: /marvin/tests/smoke/test_ssvm.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_vm_life_cycle.py
   Intermitten failure detected: /marvin/tests/smoke/test_vm_snapshots.py
   Intermitten failure detected: /marvin/tests/smoke/test_volumes.py
   Intermitten failure detected: /marvin/tests/smoke/test_vpc_redundant.py
   Intermitten failure detected: /marvin/tests/smoke/test_vpc_router_nics.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. 46 look OK, 21 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   ContextSuite context=TestResetVmOnReboot>:setup | `Error` | 0.00 | 
test_reset_vm_on_reboot.py
   ContextSuite context=TestRouterDHCPHosts>:setup | `Error` | 0.00 | 
test_router_dhcphosts.py
   ContextSuite context=TestRouterDHCPOpts>:setup | `Error` | 0.00 | 
test_router_dhcphosts.py
   ContextSuite context=TestRouterDns>:setup | `Error` | 0.00 | 
test_router_dns.py
   ContextSuite context=TestVmSnapshot>:setup | `Error` | 0.04 | 
test_vm_snapshots.py
   ContextSuite context=TestRouterDnsService>:setup | `Error` | 0.00 | 
test_router_dnsservice.py
   ContextSuite context=TestRouterIpTablesPolicies>:setup | `Error` | 0.00 | 
test_routers_iptables_default_policy.py
   ContextSuite context=TestVPCIpTablesPolicies>:setup | `Error` | 0.00 | 
test_routers_iptables_default_policy.py
   test_01_isolate_network_FW_PF_default_routes_egress_true | `Error` | 0.10 | 
test_routers_network_ops.py
   test_02_isolate_network_FW_PF_default_routes_egress_false | `Error` | 0.10 | 
test_routers_network_ops.py
   ContextSuite context=TestRedundantIsolateNetworks>:setup | `Error` | 1.20 | 
test_routers_network_ops.py
   ContextSuite context=TestRouterServices>:setup | `Error` | 0.00 | 
test_routers.py
   test_01_sys_vm_start | `Failure` | 0.06 | test_secondary_storage.py
   test_02_sys_template_ready | `Failure` | 0.05 | test_secondary_storage.py
   ContextSuite context=TestCpuCapServiceOfferings>:setup | `Error` | 0.00 | 
test_service_offerings.py
   ContextSuite context=TestServiceOfferings>:setup | `Error` | 0.11 | 
test_service_offerings.py
   ContextSuite context=TestSnapshotRootDisk>:setup | `Error` | 0.00 | 
test_snapshots.py
   test_01_list_sec_storage_vm | `Failure` | 0.03 | test_ssvm.py
   test_02_list_cpvm_vm | `Failure` | 0.02 | test_ssvm.py
   test_03_ssvm_internals | `Failure` | 0.02 | test_ssvm.py
   test_04_cpvm_internals | `Failure` | 0.02 | test_ssvm.py
   test_05_stop_ssvm | `Failure` | 0.02 | test_ssvm.py
   test_06_stop_cpvm | `Failure` | 0.02 | test_ssvm.py
   test_07_reboot_ssvm | `Failure` | 0.02 | test_ssvm.py
   test_08_reboot_cpvm | `Failure` | 0.02 | test_ssvm.py
   test_09_destroy_ssvm | `Failure` | 0.02 | test_ssvm.py
   test_10_destroy_cpvm | `Failure` | 0.02 | test_ssvm.py
   test_02_create_template_with_checksum_sha1 | `Error` | 65.29 | 
test_templates.py
   test_03_create_template_with_checksum_sha256 | `Error` | 65.30 | 
test_templates.py
   test_04_create_template_with_checksum_md5 | `Error` | 65.29 | 
test_templates.py
   test_05_create_template_with_no_checksum | `Error` | 65.29 | 
test_templates.py
   test_02_deploy_vm_from_direct_download_template | `Error` | 5.23 | 
test_templates.py
 

[GitHub] eligorio commented on issue #2548: Upgrade to 4.11 and pre-existent saml2 authentication settings

2018-04-09 Thread GitBox
eligorio commented on issue #2548: Upgrade to 4.11 and pre-existent saml2 
authentication settings
URL: https://github.com/apache/cloudstack/issues/2548#issuecomment-379907315
 
 
   We reproduced the issue using the recipe of your last comment.


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 #2401: [CLOUDSTACK-10226] CloudStack is not importing Local storage properly

2018-04-09 Thread GitBox
rafaelweingartner commented on issue #2401: [CLOUDSTACK-10226] CloudStack is 
not importing Local storage properly
URL: https://github.com/apache/cloudstack/pull/2401#issuecomment-379898361
 
 
   @borisstoyanov now I believe that the test result is ok. These failures seem 
to be intermittent, not just here, but in other PRs as well.


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 #2401: [CLOUDSTACK-10226] CloudStack is not importing Local storage properly

2018-04-09 Thread GitBox
blueorangutan commented on issue #2401: [CLOUDSTACK-10226] CloudStack is not 
importing Local storage properly
URL: https://github.com/apache/cloudstack/pull/2401#issuecomment-379896164
 
 
   Trillian test result (tid-2478)
   Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 22757 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2401-t2478-xenserver-71.zip
   Intermitten failure detected: /marvin/tests/smoke/test_certauthority_root.py
   Intermitten failure detected: /marvin/tests/smoke/test_scale_vm.py
   Intermitten failure detected: /marvin/tests/smoke/test_service_offerings.py
   Intermitten failure detected: /marvin/tests/smoke/test_ssvm.py
   Intermitten failure detected: /marvin/tests/smoke/test_vpc_redundant.py
   Smoke tests completed. 64 look OK, 3 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_01_scale_vm | `Error` | 9.23 | test_scale_vm.py
   ContextSuite context=TestCpuCapServiceOfferings>:teardown | `Error` | 0.00 | 
test_service_offerings.py
   test_04_rvpc_network_garbage_collector_nics | `Failure` | 518.16 | 
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] rafaelweingartner commented on issue #2486: [CLOUDSTACK-10323] Allow changing disk offering during volume migration

2018-04-09 Thread GitBox
rafaelweingartner commented on issue #2486: [CLOUDSTACK-10323] Allow changing 
disk offering during volume migration 
URL: https://github.com/apache/cloudstack/pull/2486#issuecomment-379883955
 
 
   @borisstoyanov with that change in the test case, now the test we created 
for this PR passed. Some tests failed, but they are different from the last run.


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 #2486: [CLOUDSTACK-10323] Allow changing disk offering during volume migration

2018-04-09 Thread GitBox
blueorangutan commented on issue #2486: [CLOUDSTACK-10323] Allow changing disk 
offering during volume migration 
URL: https://github.com/apache/cloudstack/pull/2486#issuecomment-379883393
 
 
   Trillian test result (tid-2471)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 91858 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2486-t2471-kvm-centos7.zip
   Intermitten failure detected: /marvin/tests/smoke/test_certauthority_root.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_routers.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_host_maintenance.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_add_primary_storage_disabled_host | `Error` | 0.61 | 
test_primary_storage.py
   test_01_primary_storage_nfs | `Error` | 0.13 | test_primary_storage.py
   ContextSuite context=TestStorageTags>:setup | `Error` | 0.24 | 
test_primary_storage.py
   test_04_restart_network_wo_cleanup | `Failure` | 3.27 | test_routers.py
   test_02_list_snapshots_with_removed_data_store | `Error` | 1.15 | 
test_snapshots.py
   test_08_migrate_vm | `Error` | 17.79 | test_vm_life_cycle.py
   test_01_cancel_host_maintenace_with_no_migration_jobs | `Failure` | 6.34 | 
test_host_maintenance.py
   test_02_cancel_host_maintenace_with_migration_jobs | `Error` | 2.29 | 
test_host_maintenance.py
   test_hostha_kvm_host_fencing | `Failure` | 1491.43 | test_hostha_kvm.py
   test_hostha_kvm_host_recovering | `Failure` | 616.59 | 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] asfgit closed issue #2537: Fix Jetty configuration file bugs during Upgrade from 4.x to 4.11

2018-04-09 Thread GitBox
asfgit closed issue #2537: Fix Jetty configuration file bugs during Upgrade 
from 4.x to 4.11
URL: https://github.com/apache/cloudstack/issues/2537
 
 
   


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 (44da757 -> 5004268)

2018-04-09 Thread rohit
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


from 44da757  Merge branch '4.11'
 add 2756d41  manual mapped ldap fix (#2517)
 add bb09caf  packaging: remove deprecated tomcat based sysconfig file for 
centos (#2538)
 new 5004268  Merge branch '4.11'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 packaging/centos63/cloud.spec  |  4 +
 packaging/centos7/cloud.spec   |  4 +-
 .../cloudstack/ldap/ADLdapUserManagerImpl.java |  2 +-
 .../apache/cloudstack/ldap/LdapAuthenticator.java  |  6 +-
 .../api/command/LdapConfigurationChanger.java  |  2 +-
 .../cloudstack/ldap/ADLdapUserManagerImplTest.java | 91 ++
 .../cloudstack/ldap/LdapAuthenticatorTest.java | 77 ++
 7 files changed, 180 insertions(+), 6 deletions(-)
 create mode 100644 
plugins/user-authenticators/ldap/test/org/apache/cloudstack/ldap/ADLdapUserManagerImplTest.java
 create mode 100644 
plugins/user-authenticators/ldap/test/org/apache/cloudstack/ldap/LdapAuthenticatorTest.java

-- 
To stop receiving notification emails like this one, please contact
ro...@apache.org.


[cloudstack] 01/01: Merge branch '4.11'

2018-04-09 Thread rohit
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

commit 50042680b00d3ed9baabf17c6b6a53764a9b3603
Merge: 44da757 bb09caf
Author: Rohit Yadav 
AuthorDate: Tue Apr 10 00:31:38 2018 +0530

Merge branch '4.11'

 packaging/centos63/cloud.spec  |  4 +
 packaging/centos7/cloud.spec   |  4 +-
 .../cloudstack/ldap/ADLdapUserManagerImpl.java |  2 +-
 .../apache/cloudstack/ldap/LdapAuthenticator.java  |  6 +-
 .../api/command/LdapConfigurationChanger.java  |  2 +-
 .../cloudstack/ldap/ADLdapUserManagerImplTest.java | 91 ++
 .../cloudstack/ldap/LdapAuthenticatorTest.java | 77 ++
 7 files changed, 180 insertions(+), 6 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
ro...@apache.org.


[GitHub] rhtyd closed pull request #2538: Remove deprecated tomcat configuration file instead of moving it, sin…

2018-04-09 Thread GitBox
rhtyd closed pull request #2538: Remove deprecated tomcat configuration file 
instead of moving it, sin…
URL: https://github.com/apache/cloudstack/pull/2538
 
 
   

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/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 062e511966e..87d2c1ec578 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -454,6 +454,10 @@ if [ -f 
"%{_sysconfdir}/cloud.rpmsave/management/db.properties" ]; then
 mv %{_sysconfdir}/cloud.rpmsave/management/db.properties 
%{_sysconfdir}/cloud.rpmsave/management/db.properties.rpmsave
 fi
 
+if [ -f %{_sysconfdir}/sysconfig/%{name}-management ] ; then
+rm -f %{_sysconfdir}/sysconfig/%{name}-management
+fi
+
 chown -R cloud:cloud /var/log/cloudstack/management
 
 %preun agent
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 6ed36915ac9..525421c0108 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -398,11 +398,13 @@ if [ ! -f 
%{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util
 fi
 
 if [ -f %{_sysconfdir}/sysconfig/%{name}-management ] ; then
-mv %{_sysconfdir}/sysconfig/%{name}-management  
%{_sysconfdir}/default/%{name}-management
+rm -f %{_sysconfdir}/sysconfig/%{name}-management
 fi
 
 chown -R cloud:cloud /var/log/cloudstack/management
 
+systemctl daemon-reload
+
 %preun agent
 /sbin/service cloudstack-agent stop || true
 if [ "$1" == "0" ] ; then


 


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: packaging: remove deprecated tomcat based sysconfig file for centos (#2538)

2018-04-09 Thread rohit
This is an automated email from the ASF dual-hosted git repository.

rohit 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 bb09caf  packaging: remove deprecated tomcat based sysconfig file for 
centos (#2538)
bb09caf is described below

commit bb09caf8dcbee1a3ce9429cf60e3ab07c51f9da5
Author: ernjvr 
AuthorDate: Mon Apr 9 21:01:09 2018 +0200

packaging: remove deprecated tomcat based sysconfig file for centos (#2538)

Remove deprecated tomcat configuration file instead of moving it, since 
moving it prevented the 4.11 upgrade from overwriting it with the new jetty 
configurations. Also added systemctl daemon-reload to refresh daemon services 
so that management server can start up seamlessly after the upgrade.

Fixes #2537
---
 packaging/centos63/cloud.spec | 4 
 packaging/centos7/cloud.spec  | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 062e511..87d2c1e 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -454,6 +454,10 @@ if [ -f 
"%{_sysconfdir}/cloud.rpmsave/management/db.properties" ]; then
 mv %{_sysconfdir}/cloud.rpmsave/management/db.properties 
%{_sysconfdir}/cloud.rpmsave/management/db.properties.rpmsave
 fi
 
+if [ -f %{_sysconfdir}/sysconfig/%{name}-management ] ; then
+rm -f %{_sysconfdir}/sysconfig/%{name}-management
+fi
+
 chown -R cloud:cloud /var/log/cloudstack/management
 
 %preun agent
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 6ed3691..525421c 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -398,11 +398,13 @@ if [ ! -f 
%{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util
 fi
 
 if [ -f %{_sysconfdir}/sysconfig/%{name}-management ] ; then
-mv %{_sysconfdir}/sysconfig/%{name}-management  
%{_sysconfdir}/default/%{name}-management
+rm -f %{_sysconfdir}/sysconfig/%{name}-management
 fi
 
 chown -R cloud:cloud /var/log/cloudstack/management
 
+systemctl daemon-reload
+
 %preun agent
 /sbin/service cloudstack-agent stop || true
 if [ "$1" == "0" ] ; then

-- 
To stop receiving notification emails like this one, please contact
ro...@apache.org.


[GitHub] rhtyd commented on issue #2538: Remove deprecated tomcat configuration file instead of moving it, sin…

2018-04-09 Thread GitBox
rhtyd commented on issue #2538: Remove deprecated tomcat configuration file 
instead of moving it, sin…
URL: https://github.com/apache/cloudstack/pull/2538#issuecomment-379858326
 
 
   LGTM, travis okay. I'll merge this.


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 #2556: List template with id no longer works as domain admin

2018-04-09 Thread GitBox
blueorangutan commented on issue #2556: List template with id no longer works 
as domain admin
URL: https://github.com/apache/cloudstack/pull/2556#issuecomment-379839280
 
 
   Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1895


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 a change in pull request #2557: Add "Fixes: number" to PR template for auto-closing issues

2018-04-09 Thread GitBox
khos2ow commented on a change in pull request #2557: Add "Fixes: number" to PR 
template for auto-closing issues
URL: https://github.com/apache/cloudstack/pull/2557#discussion_r18017
 
 

 ##
 File path: PULL_REQUEST_TEMPLATE.md
 ##
 @@ -12,6 +12,12 @@
 - [ ] Enhancement (improves an existing feature and functionality)
 - [ ] Cleanup (Code refactoring and cleanup, that may add test cases)
 
+
+
+
 
 Review comment:
   That's true, it can (and should) even be in the commit description as well. 
I only added another section since we already have some other sections for 
different purposes, and make it more unified (in terms of placement of `Fixes: 
#`)


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 #2556: List template with id no longer works as domain admin

2018-04-09 Thread GitBox
blueorangutan commented on issue #2556: List template with id no longer works 
as domain admin
URL: https://github.com/apache/cloudstack/pull/2556#issuecomment-379830149
 
 
   @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 #2556: List template with id no longer works as domain admin

2018-04-09 Thread GitBox
khos2ow commented on issue #2556: List template with id no longer works as 
domain admin
URL: https://github.com/apache/cloudstack/pull/2556#issuecomment-379829781
 
 
   I have completely missed that this is already fixed in #2144 on 4.11! 
Closing this PR.


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 #2555: Remove 'md5Hashed' variable from Javascript.

2018-04-09 Thread GitBox
rafaelweingartner commented on a change in pull request #2555: Remove 
'md5Hashed' variable from Javascript.
URL: https://github.com/apache/cloudstack/pull/2555#discussion_r180169955
 
 

 ##
 File path: ui/scripts/sharedFunctions.js
 ##
 @@ -45,10 +45,6 @@ var ERROR_INTERNET_NAME_NOT_RESOLVED = 12007;
 var ERROR_INTERNET_CANNOT_CONNECT = 12029;
 var ERROR_VMOPS_ACCOUNT_ERROR = 531;
 
-// Default password is MD5 hashed.  Set the following variable to false to 
disable this.
-var md5Hashed = false;
 
 Review comment:
   I will ask people in the mailing list then. If there is no objections there, 
I think we can proceed.


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 closed pull request #2556: List template with id no longer works as domain admin

2018-04-09 Thread GitBox
khos2ow closed pull request #2556: List template with id no longer works as 
domain admin
URL: https://github.com/apache/cloudstack/pull/2556
 
 
   

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/server/src/com/cloud/api/query/QueryManagerImpl.java 
b/server/src/com/cloud/api/query/QueryManagerImpl.java
index be165bae813..07b976978e9 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -3147,15 +3147,16 @@ private boolean isPermissible(Long accountDomainId, 
Long offeringDomainId) {
 ex.addProxyObject(template.getUuid(), "templateId");
 throw ex;
 }
-if (caller.getType() == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) {
-Account template_acc = 
_accountMgr.getAccount(template.getAccountId());
-DomainVO domain = 
_domainDao.findById(template_acc.getDomainId());
-_accountMgr.checkAccess(caller, domain);
-
 
-}// if template is not public, perform permission check here
-else if (!template.isPublicTemplate() && caller.getType() != 
Account.ACCOUNT_TYPE_ADMIN) {
-_accountMgr.checkAccess(caller, null, false, template);
+// if template is not public, perform permission check here
+if (!template.isPublicTemplate()) {
+if (caller.getType() == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) {
+Account template_acc = 
_accountMgr.getAccount(template.getAccountId());
+DomainVO domain = 
_domainDao.findById(template_acc.getDomainId());
+_accountMgr.checkAccess(caller, domain);
+} else if (caller.getType() != Account.ACCOUNT_TYPE_ADMIN) {
+_accountMgr.checkAccess(caller, null, false, template);
+}
 }
 
 // if templateId is specified, then we will just use the id to


 


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 #2555: Remove 'md5Hashed' variable from Javascript.

2018-04-09 Thread GitBox
rhtyd commented on a change in pull request #2555: Remove 'md5Hashed' variable 
from Javascript.
URL: https://github.com/apache/cloudstack/pull/2555#discussion_r180169076
 
 

 ##
 File path: ui/scripts/sharedFunctions.js
 ##
 @@ -45,10 +45,6 @@ var ERROR_INTERNET_NAME_NOT_RESOLVED = 12007;
 var ERROR_INTERNET_CANNOT_CONNECT = 12029;
 var ERROR_VMOPS_ACCOUNT_ERROR = 531;
 
-// Default password is MD5 hashed.  Set the following variable to false to 
disable this.
-var md5Hashed = false;
 
 Review comment:
   @rafaelweingartner while this PR LGTM, we may need to discuss with user/dev@ 
as this variable may be set by a UI plugin that is not opensource or with the 
upstream tree? Certain parts of the code may exist and appear to be not used at 
all, but may be used by an external UI/backend plugin.


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 #2556: List template with id no longer works as domain admin

2018-04-09 Thread GitBox
khos2ow commented on issue #2556: List template with id no longer works as 
domain admin
URL: https://github.com/apache/cloudstack/pull/2556#issuecomment-379813264
 
 
   Correct, I wasn't sure how far back we're supposed to _support_ if the bug 
fixes aren't security related. I'm going to rebase against 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] rafaelweingartner commented on a change in pull request #2556: List template with id no longer works as domain admin

2018-04-09 Thread GitBox
rafaelweingartner commented on a change in pull request #2556: List template 
with id no longer works as domain admin
URL: https://github.com/apache/cloudstack/pull/2556#discussion_r180141926
 
 

 ##
 File path: server/src/com/cloud/api/query/QueryManagerImpl.java
 ##
 @@ -3147,15 +3147,16 @@ private boolean isPermissible(Long accountDomainId, 
Long offeringDomainId) {
 ex.addProxyObject(template.getUuid(), "templateId");
 throw ex;
 }
-if (caller.getType() == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) {
-Account template_acc = 
_accountMgr.getAccount(template.getAccountId());
-DomainVO domain = 
_domainDao.findById(template_acc.getDomainId());
-_accountMgr.checkAccess(caller, domain);
-
 
-}// if template is not public, perform permission check here
-else if (!template.isPublicTemplate() && caller.getType() != 
Account.ACCOUNT_TYPE_ADMIN) {
-_accountMgr.checkAccess(caller, null, false, template);
+// if template is not public, perform permission check here
+if (!template.isPublicTemplate()) {
 
 Review comment:
   Would you mind extracting this block 3151-3159 to a method, document it, and 
write unit 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 issue #2556: List template with id no longer works as domain admin

2018-04-09 Thread GitBox
rafaelweingartner commented on issue #2556: List template with id no longer 
works as domain admin
URL: https://github.com/apache/cloudstack/pull/2556#issuecomment-379800328
 
 
   @khos2ow you are the contributor. So, in my opinion you should decide. At 
most, we can suggest what might be better.
   
   I do not think we need to go that far back (4.10), I do not think we will 
create extra releases for it. As you probably noticed, a lot of issues (if not 
all) that went to 4.11.1.0 so far, have not gone to 4.10.


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 opened a new pull request #2557: Add "Fixes: number" to PR template for auto-closing issues

2018-04-09 Thread GitBox
khos2ow opened a new pull request #2557: Add "Fixes: number" to PR template for 
auto-closing issues
URL: https://github.com/apache/cloudstack/pull/2557
 
 
   ## Description
   
   Added GitHub issue section to `PULL_REQUEST_TEMPLATE.md` with `Fixes: 
#` format. With this addition, the referenced issue will 
automatically be closed when PR gets merged.
   
   
   
   
   ## 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)
   - [x] Enhancement (improves an existing feature and functionality)
   - [ ] Cleanup (Code refactoring and cleanup, that may add test cases)
   
   ## Screenshots (if appropriate):
   
   ## How Has This Been Tested?
   
   
   
   
   
   ## Checklist:
   
   
   - [ ] 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] blueorangutan commented on issue #2556: List template with id no longer works as domain admin

2018-04-09 Thread GitBox
blueorangutan commented on issue #2556: List template with id no longer works 
as domain admin
URL: https://github.com/apache/cloudstack/pull/2556#issuecomment-379796593
 
 
   Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1894


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 #2556: List template with id no longer works as domain admin

2018-04-09 Thread GitBox
khos2ow commented on issue #2556: List template with id no longer works as 
domain admin
URL: https://github.com/apache/cloudstack/pull/2556#issuecomment-379786252
 
 
   @DaanHoogland @rhtyd @rafaelweingartner The original ticket in Jira was 
filed against 4.10 so I based this PR against that version and merge it 
forward. If you think we should not do this please advise.


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: manual mapped ldap fix (#2517)

2018-04-09 Thread dahn
This is an automated email from the ASF dual-hosted git repository.

dahn 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 2756d41  manual mapped ldap fix (#2517)
2756d41 is described below

commit 2756d410393bd9c35c6141d98112cb9b91c5bc3f
Author: dahn 
AuthorDate: Mon Apr 9 17:38:49 2018 +0200

manual mapped ldap fix (#2517)

* translate groovy test for ADLdapUserManagerImpl to java

* fixed by returning the actual result instead of false

* unit test case for manual mapped user in ldap
---
 .../cloudstack/ldap/ADLdapUserManagerImpl.java |  2 +-
 .../apache/cloudstack/ldap/LdapAuthenticator.java  |  6 +-
 .../api/command/LdapConfigurationChanger.java  |  2 +-
 .../cloudstack/ldap/ADLdapUserManagerImplTest.java | 91 ++
 .../cloudstack/ldap/LdapAuthenticatorTest.java | 77 ++
 5 files changed, 173 insertions(+), 5 deletions(-)

diff --git 
a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/ADLdapUserManagerImpl.java
 
b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/ADLdapUserManagerImpl.java
index e844df5..a8f14df 100644
--- 
a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/ADLdapUserManagerImpl.java
+++ 
b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/ADLdapUserManagerImpl.java
@@ -59,7 +59,7 @@ public class ADLdapUserManagerImpl extends 
OpenLdapUserManagerImpl implements Ld
 return users;
 }
 
-private String generateADGroupSearchFilter(String groupName, Long 
domainId) {
+String generateADGroupSearchFilter(String groupName, Long domainId) {
 final StringBuilder userObjectFilter = new StringBuilder();
 userObjectFilter.append("(objectClass=");
 userObjectFilter.append(_ldapConfiguration.getUserObject(domainId));
diff --git 
a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java
 
b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java
index cd4ed3d..517c718 100644
--- 
a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java
+++ 
b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java
@@ -215,7 +215,7 @@ public class LdapAuthenticator extends AdapterBase 
implements UserAuthenticator
  * @param user cloudstack user object
  * @return false if either user object does not exist or authenitication 
fails
  */
-private Pair authenticate(String 
username, String password, Long domainId, UserAccount user) {
+Pair authenticate(String username, 
String password, Long domainId, UserAccount user) {
 boolean result = false;
 
 if(user != null ) {
@@ -231,8 +231,8 @@ public class LdapAuthenticator extends AdapterBase 
implements UserAuthenticator
 }
 }
 return (!result && user != null) ?
-new Pair(false, 
ActionOnFailedAuthentication.INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT):
-new Pair(false, null);
+new Pair(result, 
ActionOnFailedAuthentication.INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT):
+new Pair(result, null);
 }
 
 private void enableUserInCloudStack(UserAccount user) {
diff --git 
a/plugins/user-authenticators/ldap/test/org/apache/cloudstack/api/command/LdapConfigurationChanger.java
 
b/plugins/user-authenticators/ldap/test/org/apache/cloudstack/api/command/LdapConfigurationChanger.java
index 61aa959..38f7c9b 100644
--- 
a/plugins/user-authenticators/ldap/test/org/apache/cloudstack/api/command/LdapConfigurationChanger.java
+++ 
b/plugins/user-authenticators/ldap/test/org/apache/cloudstack/api/command/LdapConfigurationChanger.java
@@ -38,7 +38,7 @@ interface LdapConfigurationChanger {
  * the first field found by this name in the class "klas" or any of it's 
superclasses except for {@code Object}. Implementers of this interface can 
decide to also return any field in implemented interfaces or in {@code Object}.
  *
  * @param name of the field to find
- * @param klas class to gat a field by name "name" from
+ * @param klas class to get a field by name "name" from
  * @return a {@code Field} by the name "name"
  * @throws NoSuchFieldException
  */
diff --git 
a/plugins/user-authenticators/ldap/test/org/apache/cloudstack/ldap/ADLdapUserManagerImplTest.java
 
b/plugins/user-authenticators/ldap/test/org/apache/cloudstack/ldap/ADLdapUserManagerImplTest.java
new file mode 100644
index 000..c2fc7ee
--- /dev/null
+++ 

[GitHub] DaanHoogland closed pull request #2517: manual mapped ldap fix

2018-04-09 Thread GitBox
DaanHoogland closed pull request #2517: manual mapped ldap fix
URL: https://github.com/apache/cloudstack/pull/2517
 
 
   

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/user-authenticators/ldap/src/org/apache/cloudstack/ldap/ADLdapUserManagerImpl.java
 
b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/ADLdapUserManagerImpl.java
index e844df57c1c..a8f14dfcd54 100644
--- 
a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/ADLdapUserManagerImpl.java
+++ 
b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/ADLdapUserManagerImpl.java
@@ -59,7 +59,7 @@
 return users;
 }
 
-private String generateADGroupSearchFilter(String groupName, Long 
domainId) {
+String generateADGroupSearchFilter(String groupName, Long domainId) {
 final StringBuilder userObjectFilter = new StringBuilder();
 userObjectFilter.append("(objectClass=");
 userObjectFilter.append(_ldapConfiguration.getUserObject(domainId));
diff --git 
a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java
 
b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java
index cd4ed3d5cea..517c7185e29 100644
--- 
a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java
+++ 
b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java
@@ -215,7 +215,7 @@ private void processLdapUser(String password, Long 
domainId, UserAccount user, P
  * @param user cloudstack user object
  * @return false if either user object does not exist or authenitication 
fails
  */
-private Pair authenticate(String 
username, String password, Long domainId, UserAccount user) {
+Pair authenticate(String username, 
String password, Long domainId, UserAccount user) {
 boolean result = false;
 
 if(user != null ) {
@@ -231,8 +231,8 @@ private void processLdapUser(String password, Long 
domainId, UserAccount user, P
 }
 }
 return (!result && user != null) ?
-new Pair(false, 
ActionOnFailedAuthentication.INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT):
-new Pair(false, null);
+new Pair(result, 
ActionOnFailedAuthentication.INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT):
+new Pair(result, null);
 }
 
 private void enableUserInCloudStack(UserAccount user) {
diff --git 
a/plugins/user-authenticators/ldap/test/org/apache/cloudstack/api/command/LdapConfigurationChanger.java
 
b/plugins/user-authenticators/ldap/test/org/apache/cloudstack/api/command/LdapConfigurationChanger.java
index 61aa959e81a..38f7c9ba3ed 100644
--- 
a/plugins/user-authenticators/ldap/test/org/apache/cloudstack/api/command/LdapConfigurationChanger.java
+++ 
b/plugins/user-authenticators/ldap/test/org/apache/cloudstack/api/command/LdapConfigurationChanger.java
@@ -38,7 +38,7 @@ default void setHiddenField(Object target, final String name, 
final Object o) th
  * the first field found by this name in the class "klas" or any of it's 
superclasses except for {@code Object}. Implementers of this interface can 
decide to also return any field in implemented interfaces or in {@code Object}.
  *
  * @param name of the field to find
- * @param klas class to gat a field by name "name" from
+ * @param klas class to get a field by name "name" from
  * @return a {@code Field} by the name "name"
  * @throws NoSuchFieldException
  */
diff --git 
a/plugins/user-authenticators/ldap/test/org/apache/cloudstack/ldap/ADLdapUserManagerImplTest.java
 
b/plugins/user-authenticators/ldap/test/org/apache/cloudstack/ldap/ADLdapUserManagerImplTest.java
new file mode 100644
index 000..c2fc7ee4b5e
--- /dev/null
+++ 
b/plugins/user-authenticators/ldap/test/org/apache/cloudstack/ldap/ADLdapUserManagerImplTest.java
@@ -0,0 +1,91 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is 

[GitHub] DaanHoogland commented on issue #2556: List template with id no longer works as domain admin

2018-04-09 Thread GitBox
DaanHoogland commented on issue #2556: List template with id no longer works as 
domain admin
URL: https://github.com/apache/cloudstack/pull/2556#issuecomment-379794217
 
 
   @khos2ow I am fine with that. I don't know if we ever voted in a policy 
against that but if so, let's revert that.


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


[GitH b] rhtyd commented on iss e #2541: Add "Lets Encrypt CA" Certpath to SSVM Keystore (for cdimage.debian.org)

2018-04-09 Thread GitBox
rhtyd commented on issue #2541: Add "Lets Encrypt CA" Certpath to SSVM Keystore 
(for cdimage.debian.org)
URL: https://github.com/apache/cloudstack/issues/2541#issuecomment-379791370
 
 
   @s-seitz We cannot assume that systemvms may have access to public network 
when they start, so the best solution is to fix this during systemvmtemplate 
generation and ensure that the agent/java process uses the system keystore file 
instead of the custom/old one. This creates an issue to regression test custom 
ssl certificate(s) upload feature in CloudStack on both ssvm and cpvm. I'm busy 
this week, but I can revisit this in next 2 weeks, certainly before the next 
release milestone 4.11.1.0.


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] 01/01: Merge branch '4.11'

2018-04-09 Thread rohit
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

commit 44da7575b82d5fd7e005ec54fe2e27b2bf27fcbb
Merge: e198ff2 9cf1532f
Author: Rohit Yadav 
AuthorDate: Mon Apr 9 20:47:06 2018 +0530

Merge branch '4.11'

 debian/cloudstack-usage.preinst | 25 +
 1 file changed, 25 insertions(+)

-- 
To stop receiving notification emails like this one, please contact
ro...@apache.org.


[cloudstack] branch master updated (e198ff2 -> 44da757)

2018-04-09 Thread rohit
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


from e198ff2  Create an easy way to enable the Java remote Debug for ACS 
(#2535)
 add 9cf1532f debian: remove old usage jars during upgrade (#2552)
 new 44da757  Merge branch '4.11'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../centos63/cloudstack-sccs => debian/cloudstack-usage.preinst| 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
 copy packaging/centos63/cloudstack-sccs => debian/cloudstack-usage.preinst 
(87%)
 mode change 100644 => 100755

-- 
To stop receiving notification emails like this one, please contact
ro...@apache.org.


[GitH b] khos2ow commented on iss e #2556: CLOUDSTACK-9862: list template with id no longer works as domain admin

2018-04-09 Thread GitBox
khos2ow commented on issue #2556: CLOUDSTACK-9862: list template with id no 
longer works as domain admin
URL: https://github.com/apache/cloudstack/pull/2556#issuecomment-379786252
 
 
   @DaanHoogland @rhtyd @rafaelweingartner The original ticket in Jira filed 
against 4.10 so I based this PR against that version and merge it forward. If 
you think we should not do this please advise.


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


[GitH b] bl eorang tan commented on iss e #2556: CLOUDSTACK-9862: list template with id no longer works as domain admin

2018-04-09 Thread GitBox
blueorangutan commented on issue #2556: CLOUDSTACK-9862: list template with id 
no longer works as domain admin
URL: https://github.com/apache/cloudstack/pull/2556#issuecomment-379786137
 
 
   @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


[GitH b] khos2ow opened a new p ll req est #2556: CLOUDSTACK-9862: list template with id no longer works as domain admin

2018-04-09 Thread GitBox
khos2ow opened a new pull request #2556: CLOUDSTACK-9862: list template with id 
no longer works as domain admin
URL: https://github.com/apache/cloudstack/pull/2556
 
 
   ## Description
   
   As domain admin, listTemplates templatefilter=featured no longer work if id= 
is specified.
   
   Using cloudmonkey with domain-admin credential:
   
   ```
   (beta2r1-ninja) > list templates templatefilter=featured filter=name,id
   count = 9
   template:
   +--+-+
   |  id  |   name  |
   +--+-+
   | 513b3a6d-c011-46f0-a4a3-2a954cadb673 |  CoreOS Alpha 1367.5.0  |
   | 0c04d876-1f85-45a7-b6f4-504de435bf12 |Debian 8.5 PV base (64bit)   |
   | 285f2203-449a-428f-997a-1ffbebbf1382 |   CoreOS Alpha  |
   | 332b6ca8-b3d6-42c7-83e5-60fe87be6576 |  CoreOS Stable  |
   | 3b705008-c186-464d-ad59-312d902420af |   Windows Server 2016 std SPLA  |
   | 4256aebe-a1c1-4b49-9993-de2bc712d521 |   Ubuntu 16.04.01 HVM   |
   | 59e6b00a-b88e-4539-aa3c-75c9c7e9fa6c | Ubuntu 14.04.5 HVM base (64bit) |
   | 3ab936eb-d8c2-44d8-a64b-17ad5adf8a51 |  CentOS 6.8 PV  |
   | 7de5d423-c91e-49cc-86e8-9d6ed6abd997 |  CentOS 7.2 HVM |
   +--+-+
   (beta2r1-ninja) > list templates templatefilter=featured 
id=7de5d423-c91e-49cc-86e8-9d6ed6abd997 filter=name,id
   Error 531: Acct[b285d62e-0ec2-4a7c-b773-961595ec6356-Ninja-5664] does not 
have permission to operate within domain id=c9b4f83d-16eb-11e7-a8b9-367e6fe958a9
   cserrorcode = 4365
   errorcode = 531
   errortext = Acct[b285d62e-0ec2-4a7c-b773-961595ec6356-Ninja-5664] does not 
have permission to operate within domain id=c9b4f83d-16eb-11e7-a8b9-367e6fe958a9
   uuidList:
   (beta2r1-ninja) > list templates templatefilter=featured 
ids=7de5d423-c91e-49cc-86e8-9d6ed6abd997 filter=name,id
   count = 1
   template:
   +--++
   |  id  |  name  |
   +--++
   | 7de5d423-c91e-49cc-86e8-9d6ed6abd997 | CentOS 7.2 HVM |
   +--++
   ```
   
   
   
   
   ## 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)
   
   ## Screenshots (if appropriate):
   
   ## How Has This Been Tested?
   
   
   
   
   
   ## 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.
   
   
   @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


[GitH b] bl eorang tan commented on iss e #2555: Remove 'md5Hashed' variable from Javascript.

2018-04-09 Thread GitBox
blueorangutan commented on issue #2555: Remove 'md5Hashed' variable from 
Javascript.
URL: https://github.com/apache/cloudstack/pull/2555#issuecomment-379784498
 
 
   Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1893


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 #2517: manual mapped ldap fix

2018-04-09 Thread GitBox
PaulAngus commented on issue #2517: manual mapped ldap fix
URL: https://github.com/apache/cloudstack/pull/2517#issuecomment-379777403
 
 
   LGTM
   Tested with login to Active Directory on Windows 2012r2 Server.
   Could log in with user account, where previously could not.


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


[GitH b] bl eorang tan commented on iss e #2555: Remove 'md5Hashed' variable from Javascript.

2018-04-09 Thread GitBox
blueorangutan commented on issue #2555: Remove 'md5Hashed' variable from 
Javascript.
URL: https://github.com/apache/cloudstack/pull/2555#issuecomment-379774668
 
 
   @rafaelweingartner 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


[GitH b] rafaelweingartner opened a new p ll req est #2555: Remove 'md5Hashed' variable from Javascript.

2018-04-09 Thread GitBox
rafaelweingartner opened a new pull request #2555: Remove 'md5Hashed' variable 
from Javascript.
URL: https://github.com/apache/cloudstack/pull/2555
 
 
   ## Description
   
   We no longer hash password in the user side. All of the password processing 
is executed in the server side according to the priority of hashing mechanism 
defined by the administrator.
   
   
   
   ## 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)
   - [X] Cleanup (Code refactoring and cleanup, that may add test cases)
   
   ## How Has This Been Tested?
   Locally.
   
   
   
   
   
   ## Checklist:
   
   
   - [ ] 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.
   - [X] All relevant new and existing integration tests have passed.
   - [ ] A full integration testsuite with all test that can run on my 
environment has passed.
   
   
   @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 #2538: Remove deprecated tomcat configuration file instead of moving it, sin…

2018-04-09 Thread GitBox
blueorangutan commented on issue #2538: Remove deprecated tomcat configuration 
file instead of moving it, sin…
URL: https://github.com/apache/cloudstack/pull/2538#issuecomment-379764605
 
 
   @ernjvr 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] ernjvr commented on issue #2538: Remove deprecated tomcat configuration file instead of moving it, sin…

2018-04-09 Thread GitBox
ernjvr commented on issue #2538: Remove deprecated tomcat configuration file 
instead of moving it, sin…
URL: https://github.com/apache/cloudstack/pull/2538#issuecomment-379764336
 
 
   @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 #2538: Remove deprecated tomcat configuration file instead of moving it, sin…

2018-04-09 Thread GitBox
blueorangutan commented on issue #2538: Remove deprecated tomcat configuration 
file instead of moving it, sin…
URL: https://github.com/apache/cloudstack/pull/2538#issuecomment-379762275
 
 
   Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1892


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 #2538: Remove deprecated tomcat configuration file instead of moving it, sin…

2018-04-09 Thread GitBox
blueorangutan commented on issue #2538: Remove deprecated tomcat configuration 
file instead of moving it, sin…
URL: https://github.com/apache/cloudstack/pull/2538#issuecomment-379752665
 
 
   @ernjvr 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] ernjvr commented on issue #2538: Remove deprecated tomcat configuration file instead of moving it, sin…

2018-04-09 Thread GitBox
ernjvr commented on issue #2538: Remove deprecated tomcat configuration file 
instead of moving it, sin…
URL: https://github.com/apache/cloudstack/pull/2538#issuecomment-379752474
 
 
   @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 #2538: Remove deprecated tomcat configuration file instead of moving it, sin…

2018-04-09 Thread GitBox
blueorangutan commented on issue #2538: Remove deprecated tomcat configuration 
file instead of moving it, sin…
URL: https://github.com/apache/cloudstack/pull/2538#issuecomment-379731876
 
 
   Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1891


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] s-seitz commented on issue #2541: Add "Lets Encrypt CA" Certpath to SSVM Keystore (for cdimage.debian.org)

2018-04-09 Thread GitBox
s-seitz commented on issue #2541: Add "Lets Encrypt CA" Certpath to SSVM 
Keystore (for cdimage.debian.org)
URL: https://github.com/apache/cloudstack/issues/2541#issuecomment-379731692
 
 
   @rhtyd Thank's for your response on how to hot fix this. But I'ld like to 
start a discussion if the SSVM wouldn't be better instanciated with recent (or 
updated) root CA's trusted by the project and/or the respective admins.
   Maybe that wget could do an initial first-boot job pointing to a configured 
or hardwired path on the storage?
   


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 #2554: agent: Add logging to libvirt qemu hook and cleanup

2018-04-09 Thread GitBox
blueorangutan commented on issue #2554: agent: Add logging to libvirt qemu hook 
and cleanup
URL: https://github.com/apache/cloudstack/pull/2554#issuecomment-379727185
 
 
   Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1890


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 #2550: debian: Use only `-l` for libvirtd default file on debian

2018-04-09 Thread GitBox
blueorangutan commented on issue #2550: debian: Use only `-l` for libvirtd 
default file on debian
URL: https://github.com/apache/cloudstack/pull/2550#issuecomment-379725961
 
 
   @rhtyd a Trillian-Jenkins test job (ubuntu mgmt + kvm-ubuntu) 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 #2550: debian: Use only `-l` for libvirtd default file on debian

2018-04-09 Thread GitBox
rhtyd commented on issue #2550: debian: Use only `-l` for libvirtd default file 
on debian
URL: https://github.com/apache/cloudstack/pull/2550#issuecomment-379725809
 
 
   @blueorangutan test ubuntu kvm-ubuntu


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 #2542: CloudStack-Usage Broken after Upgrade from 4.9 to 4.11

2018-04-09 Thread GitBox
rhtyd commented on issue #2542: CloudStack-Usage Broken after Upgrade from 4.9 
to 4.11
URL: https://github.com/apache/cloudstack/issues/2542#issuecomment-379725490
 
 
   Fixed in https://github.com/apache/cloudstack/pull/2552


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 #2552: debian: remove old usage jars during upgrade

2018-04-09 Thread GitBox
rhtyd closed pull request #2552: debian: remove old usage jars during upgrade
URL: https://github.com/apache/cloudstack/pull/2552
 
 
   

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/debian/cloudstack-usage.preinst b/debian/cloudstack-usage.preinst
new file mode 100755
index 000..26af9f8dd2b
--- /dev/null
+++ b/debian/cloudstack-usage.preinst
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+set -e
+
+if [ "$1" = upgrade ]; then
+# Remove old usage jars
+rm -f /usr/share/cloudstack-usage/lib/*.jar
+fi


 


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 issue #2542: CloudStack-Usage Broken after Upgrade from 4.9 to 4.11

2018-04-09 Thread GitBox
rhtyd closed issue #2542: CloudStack-Usage Broken after Upgrade from 4.9 to 4.11
URL: https://github.com/apache/cloudstack/issues/2542
 
 
   


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 #2552: debian: remove old usage jars during upgrade

2018-04-09 Thread GitBox
rhtyd commented on issue #2552: debian: remove old usage jars during upgrade
URL: https://github.com/apache/cloudstack/pull/2552#issuecomment-379725354
 
 
   Upgrade test is not done by Trillian, tested upgrade manually on Ubuntu 
xenial 16.04. Seems working okay for me. I'll merge this based on reviews and 
manual upgrade 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


[cloudstack] branch 4.11 updated: debian: remove old usage jars during upgrade (#2552)

2018-04-09 Thread rohit
This is an automated email from the ASF dual-hosted git repository.

rohit 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 9cf1532f debian: remove old usage jars during upgrade (#2552)
9cf1532f is described below

commit 9cf1532f0ef5e3f75423a38deb54587d9135d7af
Author: Rohit Yadav 
AuthorDate: Mon Apr 9 17:21:06 2018 +0530

debian: remove old usage jars during upgrade (#2552)

This removes old cloudstack-usage jars during upgrade as part of
the pre-install step of cloudstack-usage deb package.

This fixes #2542.

Signed-off-by: Rohit Yadav 
---
 debian/cloudstack-usage.preinst | 25 +
 1 file changed, 25 insertions(+)

diff --git a/debian/cloudstack-usage.preinst b/debian/cloudstack-usage.preinst
new file mode 100755
index 000..26af9f8
--- /dev/null
+++ b/debian/cloudstack-usage.preinst
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+set -e
+
+if [ "$1" = upgrade ]; then
+# Remove old usage jars
+rm -f /usr/share/cloudstack-usage/lib/*.jar
+fi

-- 
To stop receiving notification emails like this one, please contact
ro...@apache.org.


[GitHub] rhtyd commented on a change in pull request #2538: Remove deprecated tomcat configuration file instead of moving it, sin…

2018-04-09 Thread GitBox
rhtyd commented on a change in pull request #2538: Remove deprecated tomcat 
configuration file instead of moving it, sin…
URL: https://github.com/apache/cloudstack/pull/2538#discussion_r180068521
 
 

 ##
 File path: packaging/centos63/cloud.spec
 ##
 @@ -454,8 +454,14 @@ if [ -f 
"%{_sysconfdir}/cloud.rpmsave/management/db.properties" ]; then
 mv %{_sysconfdir}/cloud.rpmsave/management/db.properties 
%{_sysconfdir}/cloud.rpmsave/management/db.properties.rpmsave
 fi
 
+if [ -f %{_sysconfdir}/sysconfig/%{name}-management ] ; then
+rm -f %{_sysconfdir}/sysconfig/%{name}-management
+fi
+
 chown -R cloud:cloud /var/log/cloudstack/management
 
+systemctl daemon-reload
 
 Review comment:
   @ernjvr remove the systemctl thing, CentOS6/el6 does not have systemd. No 
need to reload anything here. Rest is LGTM.


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 #2538: Remove deprecated tomcat configuration file instead of moving it, sin…

2018-04-09 Thread GitBox
blueorangutan commented on issue #2538: Remove deprecated tomcat configuration 
file instead of moving it, sin…
URL: https://github.com/apache/cloudstack/pull/2538#issuecomment-379724833
 
 
   @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] DaanHoogland commented on a change in pull request #2554: agent: Add logging to libvirt qemu hook and cleanup

2018-04-09 Thread GitBox
DaanHoogland commented on a change in pull request #2554: agent: Add logging to 
libvirt qemu hook and cleanup
URL: https://github.com/apache/cloudstack/pull/2554#discussion_r180068030
 
 

 ##
 File path: agent/bindir/libvirtqemuhook.in
 ##
 @@ -6,59 +6,78 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-import sys
+
+import logging
 import re
+import sys
 from xml.dom.minidom import parse
 from cloudutils.configFileOps import configFileOps
 from cloudutils.networkConfig import networkConfig
+
+logging.basicConfig(filename='/var/log/libvirt/qemu-hook.log',
+filemode='a',
+format='%(asctime)s,%(msecs)d %(name)s %(levelname)s 
%(message)s',
+datefmt='%H:%M:%S',
+level=logging.INFO)
+logger = logging.getLogger('qemu-hook')
+
 def isOldStyleBridge(brName):
 if brName.find("cloudVirBr") == 0:
return True
 else:
return False
+
 def isNewStyleBridge(brName):
 if brName.startswith('brvx-'):
 return False
 if re.match(r"br(\w+)-(\d+)", brName) == None:
return False
 else:
return True
+
 def getGuestNetworkDevice():
-netlib = networkConfig() 
+netlib = networkConfig()
 cfo = configFileOps("/etc/cloudstack/agent/agent.properties")
 guestDev = cfo.getEntry("guest.network.device")
 enslavedDev = netlib.getEnslavedDev(guestDev, 1)
 return enslavedDev.split(".")[0]
+
 def handleMigrateBegin():
 try:
 domain = parse(sys.stdin)
 for interface in domain.getElementsByTagName("interface"):
 source = interface.getElementsByTagName("source")[0]
 bridge = source.getAttribute("bridge")
 if isOldStyleBridge(bridge):
-vlanId = bridge.replace("cloudVirBr","")
+vlanId = bridge.replace("cloudVirBr", "")
 elif isNewStyleBridge(bridge):
-vlanId = re.sub(r"br(\w+)-","",bridge)
+vlanId = re.sub(r"br(\w+)-", "", bridge)
 else:
 continue
 phyDev = getGuestNetworkDevice()
-newBrName="br" + phyDev + "-" + vlanId
+newBrName = "br" + phyDev + "-" + vlanId
 source.setAttribute("bridge", newBrName)
 print(domain.toxml())
 except:
 pass
+
+
 if __name__ == '__main__':
 if len(sys.argv) != 5:
 sys.exit(0)
 
-if sys.argv[2] == "migrate" and sys.argv[3] == "begin":
-handleMigrateBegin() 
+# For docs refer https://libvirt.org/hooks.html#qemu
+logger.debug("Executing qemu hook with args: %s" % sys.argv)
+guest_name, action, status = sys.argv[1:4]
 
 Review comment:
   guest_name seems to drown, though.
   action, status = sys.argv[2:4]
   would suffice.


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 #2538: Remove deprecated tomcat configuration file instead of moving it, sin…

2018-04-09 Thread GitBox
rhtyd commented on issue #2538: Remove deprecated tomcat configuration file 
instead of moving it, sin…
URL: https://github.com/apache/cloudstack/pull/2538#issuecomment-379724665
 
 
   @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] DaanHoogland commented on a change in pull request #2554: agent: Add logging to libvirt qemu hook and cleanup

2018-04-09 Thread GitBox
DaanHoogland commented on a change in pull request #2554: agent: Add logging to 
libvirt qemu hook and cleanup
URL: https://github.com/apache/cloudstack/pull/2554#discussion_r180067666
 
 

 ##
 File path: agent/bindir/libvirtqemuhook.in
 ##
 @@ -6,59 +6,78 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-import sys
+
+import logging
 import re
+import sys
 from xml.dom.minidom import parse
 from cloudutils.configFileOps import configFileOps
 from cloudutils.networkConfig import networkConfig
+
+logging.basicConfig(filename='/var/log/libvirt/qemu-hook.log',
+filemode='a',
+format='%(asctime)s,%(msecs)d %(name)s %(levelname)s 
%(message)s',
+datefmt='%H:%M:%S',
+level=logging.INFO)
+logger = logging.getLogger('qemu-hook')
+
 def isOldStyleBridge(brName):
 if brName.find("cloudVirBr") == 0:
return True
 else:
return False
+
 def isNewStyleBridge(brName):
 if brName.startswith('brvx-'):
 return False
 if re.match(r"br(\w+)-(\d+)", brName) == None:
return False
 else:
return True
+
 def getGuestNetworkDevice():
-netlib = networkConfig() 
+netlib = networkConfig()
 cfo = configFileOps("/etc/cloudstack/agent/agent.properties")
 guestDev = cfo.getEntry("guest.network.device")
 enslavedDev = netlib.getEnslavedDev(guestDev, 1)
 return enslavedDev.split(".")[0]
+
 def handleMigrateBegin():
 try:
 domain = parse(sys.stdin)
 for interface in domain.getElementsByTagName("interface"):
 source = interface.getElementsByTagName("source")[0]
 bridge = source.getAttribute("bridge")
 if isOldStyleBridge(bridge):
-vlanId = bridge.replace("cloudVirBr","")
+vlanId = bridge.replace("cloudVirBr", "")
 elif isNewStyleBridge(bridge):
-vlanId = re.sub(r"br(\w+)-","",bridge)
+vlanId = re.sub(r"br(\w+)-", "", bridge)
 else:
 continue
 phyDev = getGuestNetworkDevice()
-newBrName="br" + phyDev + "-" + vlanId
+newBrName = "br" + phyDev + "-" + vlanId
 source.setAttribute("bridge", newBrName)
 print(domain.toxml())
 except:
 pass
+
+
 if __name__ == '__main__':
 if len(sys.argv) != 5:
 sys.exit(0)
 
-if sys.argv[2] == "migrate" and sys.argv[3] == "begin":
-handleMigrateBegin() 
+# For docs refer https://libvirt.org/hooks.html#qemu
+logger.debug("Executing qemu hook with args: %s" % sys.argv)
+guest_name, action, status = sys.argv[1:4]
 
 Review comment:
   nice cleanup/readability improvement


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 #2554: agent: Add logging to libvirt qemu hook and cleanup

2018-04-09 Thread GitBox
DaanHoogland commented on a change in pull request #2554: agent: Add logging to 
libvirt qemu hook and cleanup
URL: https://github.com/apache/cloudstack/pull/2554#discussion_r180067494
 
 

 ##
 File path: agent/bindir/libvirtqemuhook.in
 ##
 @@ -6,59 +6,78 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-import sys
+
+import logging
 import re
+import sys
 from xml.dom.minidom import parse
 from cloudutils.configFileOps import configFileOps
 from cloudutils.networkConfig import networkConfig
+
+logging.basicConfig(filename='/var/log/libvirt/qemu-hook.log',
 
 Review comment:
   so, you mean no safe guard needed?


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 #2554: agent: Add logging to libvirt qemu hook and cleanup

2018-04-09 Thread GitBox
rhtyd commented on a change in pull request #2554: agent: Add logging to 
libvirt qemu hook and cleanup
URL: https://github.com/apache/cloudstack/pull/2554#discussion_r180064481
 
 

 ##
 File path: agent/bindir/libvirtqemuhook.in
 ##
 @@ -6,59 +6,78 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-import sys
+
+import logging
 import re
+import sys
 from xml.dom.minidom import parse
 from cloudutils.configFileOps import configFileOps
 from cloudutils.networkConfig import networkConfig
+
+logging.basicConfig(filename='/var/log/libvirt/qemu-hook.log',
 
 Review comment:
   FYI - the directory `/var/log/libvirt/` exists if libvirt is installed.


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 #2554: agent: Add logging to libvirt qemu hook and cleanup

2018-04-09 Thread GitBox
blueorangutan commented on issue #2554: agent: Add logging to libvirt qemu hook 
and cleanup
URL: https://github.com/apache/cloudstack/pull/2554#issuecomment-379720655
 
 
   @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 opened a new pull request #2554: agent: Add logging to libvirt qemu hook and cleanup

2018-04-09 Thread GitBox
rhtyd opened a new pull request #2554: agent: Add logging to libvirt qemu hook 
and cleanup
URL: https://github.com/apache/cloudstack/pull/2554
 
 
   This allows logging to the default libvirt qemu hook and cleans up the 
script.
   
   
   
   ## 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)
   
   ## 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.
   
   
   @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] DaanHoogland commented on issue #2552: debian: remove old usage jars during upgrade

2018-04-09 Thread GitBox
DaanHoogland commented on issue #2552: debian: remove old usage jars during 
upgrade
URL: https://github.com/apache/cloudstack/pull/2552#issuecomment-379651266
 
 
   ok, @rhtyd


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