date:20171204

[cloudstack] branch debian9-systemvmtemplate updated: fix template build

2017-12-04 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/debian9-systemvmtemplate by 
this push:
 new 5e5c97e  fix template build
5e5c97e is described below

commit 5e5c97e17b0a34d0d5db79fe3b93484f4b4c7093
Author: Rohit Yadav 
AuthorDate: Tue Dec 5 13:06:31 2017 +0530

fix template build

Signed-off-by: Rohit Yadav 
---
 tools/appliance/definitions/systemvmtemplate/cleanup.sh  | 1 -
 tools/appliance/definitions/systemvmtemplate/finalize.sh | 5 +++--
 tools/appliance/definitions/systemvmtemplate/zerodisk.sh | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/appliance/definitions/systemvmtemplate/cleanup.sh 
b/tools/appliance/definitions/systemvmtemplate/cleanup.sh
index 4f5fccf..99ee5b5 100644
--- a/tools/appliance/definitions/systemvmtemplate/cleanup.sh
+++ b/tools/appliance/definitions/systemvmtemplate/cleanup.sh
@@ -45,7 +45,6 @@ function cleanup_dev() {
 
 function cleanup_misc() {
   # Scripts
-  rm -fv /home/cloud/*.sh
   rm -fr /home/cloud/cloud_scripts*
   rm -f /root/.rnd
   rm -f /var/www/html/index.html
diff --git a/tools/appliance/definitions/systemvmtemplate/finalize.sh 
b/tools/appliance/definitions/systemvmtemplate/finalize.sh
index 10cb048..d8b2bb5 100644
--- a/tools/appliance/definitions/systemvmtemplate/finalize.sh
+++ b/tools/appliance/definitions/systemvmtemplate/finalize.sh
@@ -19,7 +19,8 @@
 set -e
 set -x
 
-function randomize_password() {
+function configure_misc() {
+  rm -fv /home/cloud/*.sh
   echo "cloud:`openssl rand -base64 32`" | chpasswd
 }
 
@@ -39,7 +40,7 @@ END
 }
 
 function finalize() {
-  randomize_password
+  configure_misc
   configure_sudoers
   sync
   halt -p
diff --git a/tools/appliance/definitions/systemvmtemplate/zerodisk.sh 
b/tools/appliance/definitions/systemvmtemplate/zerodisk.sh
index 0b72363..544bfa8 100644
--- a/tools/appliance/definitions/systemvmtemplate/zerodisk.sh
+++ b/tools/appliance/definitions/systemvmtemplate/zerodisk.sh
@@ -24,7 +24,8 @@ function cleanup_veewee() {
   # this has to be here since it is the last file to run (and we remove 
ourselves)
   cd /home/cloud
   rm -fv *.iso
-  rm -fv *.sh
+  rm -fv 
{apt_upgrade,authorized_keys,cleanup,install_systemvm_packages,zerodisk}.sh
+  rm -fv 
configure_{acpid,conntrack,grub,locale,networking,persistent_config,systemvm_services}.sh
 /home/cloud/install_systemvm_packages.sh
   rm -fv .veewee_version .veewee_params .vbox_version
   df -h
 }

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" '].

[cloudstack] branch debian9-systemvmtemplate updated: Fix system script path

2017-12-04 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/debian9-systemvmtemplate by 
this push:
 new 6027974  Fix system script path
6027974 is described below

commit 602797485ac40ea92b122ebb7f890a3a16bbfc2c
Author: Rohit Yadav 
AuthorDate: Tue Dec 5 12:49:15 2017 +0530

Fix system script path

Signed-off-by: Rohit Yadav 
---
 systemvm/debian/etc/systemd/system/cloud-early-config.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/systemvm/debian/etc/systemd/system/cloud-early-config.service 
b/systemvm/debian/etc/systemd/system/cloud-early-config.service
index 263fe53..2af5276 100644
--- a/systemvm/debian/etc/systemd/system/cloud-early-config.service
+++ b/systemvm/debian/etc/systemd/system/cloud-early-config.service
@@ -13,6 +13,6 @@ WantedBy=multi-user.target
 
 [Service]
 Type=oneshot
-ExecStart=/etc/init.d/cloud-early-config
+ExecStart=/opt/cloud/bin/setup/cloud-early-config
 RemainAfterExit=true
 TimeoutStartSec=5min

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" '].

[cloudstack] 01/01: Fix cleanup and halting of template

2017-12-04 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit be06f2f29fc8428f2da0f6d005491b4c95c99678
Author: Rohit Yadav 
AuthorDate: Tue Dec 5 12:22:07 2017 +0530

Fix cleanup and halting of template

Signed-off-by: Rohit Yadav 
---
 .../definitions/systemvmtemplate/cleanup.sh|  2 +-
 .../systemvmtemplate/configure_login.sh| 21 
 .../definitions/systemvmtemplate/definition.rb |  5 ++--
 .../{configure_login.sh => finalize.sh}| 29 +++---
 .../definitions/systemvmtemplate/zerodisk.sh   | 14 +--
 5 files changed, 15 insertions(+), 56 deletions(-)

diff --git a/tools/appliance/definitions/systemvmtemplate/cleanup.sh 
b/tools/appliance/definitions/systemvmtemplate/cleanup.sh
index ab911f3..4f5fccf 100644
--- a/tools/appliance/definitions/systemvmtemplate/cleanup.sh
+++ b/tools/appliance/definitions/systemvmtemplate/cleanup.sh
@@ -45,6 +45,7 @@ function cleanup_dev() {
 
 function cleanup_misc() {
   # Scripts
+  rm -fv /home/cloud/*.sh
   rm -fr /home/cloud/cloud_scripts*
   rm -f /root/.rnd
   rm -f /var/www/html/index.html
@@ -65,7 +66,6 @@ function cleanup_misc() {
   rm -fr /usr/share/man
   rm -fr /usr/share/info
   rm -fr /usr/share/lintian
-  rm -fr /usr/share/vim
 }
 
 function cleanup() {
diff --git a/tools/appliance/definitions/systemvmtemplate/configure_login.sh 
b/tools/appliance/definitions/systemvmtemplate/configure_login.sh
index 743d7ef..1d9de06 100644
--- a/tools/appliance/definitions/systemvmtemplate/configure_login.sh
+++ b/tools/appliance/definitions/systemvmtemplate/configure_login.sh
@@ -27,25 +27,9 @@ function configure_user() {
   usermod -a -G admin cloud
   mkdir -p /home/cloud/.ssh
   chmod 700 /home/cloud/.ssh
-  echo "cloud:`openssl rand -base64 32`" | chpasswd
   echo "root:password" | chpasswd
 }
 
-function configure_sudoers() {
-  cat >/etc/sudoers < /etc/sudoers.d/cloud
-}
-
 function configure_inittab() {
   # Fix inittab
   cat >> /etc/inittab << EOF
@@ -56,14 +40,9 @@ EOF
 }
 
 function configure_login() {
-  # configure_sshd
   configure_inittab
   add_admin_group
-  configure_sudoers
   configure_user
-  rm -fv /home/cloud/configure_login.sh
-  sync
-  halt -p
 }
 
 return 2>/dev/null || configure_login
diff --git a/tools/appliance/definitions/systemvmtemplate/definition.rb 
b/tools/appliance/definitions/systemvmtemplate/definition.rb
index 33c8e8b..9e4faef 100644
--- a/tools/appliance/definitions/systemvmtemplate/definition.rb
+++ b/tools/appliance/definitions/systemvmtemplate/definition.rb
@@ -81,11 +81,12 @@ config = {
 'configure_systemvm_services.sh',
 'authorized_keys.sh',
 'configure_persistent_config.sh',
+# setup login stuff
+'configure_login.sh',
 # cleanup & space-saving
 'cleanup.sh',
 'zerodisk.sh',
-# setup login stuff
-'configure_login.sh'
+'finalize.sh'
 ],
 :postinstall_timeout => '1'
 }
diff --git a/tools/appliance/definitions/systemvmtemplate/configure_login.sh 
b/tools/appliance/definitions/systemvmtemplate/finalize.sh
similarity index 71%
copy from tools/appliance/definitions/systemvmtemplate/configure_login.sh
copy to tools/appliance/definitions/systemvmtemplate/finalize.sh
index 743d7ef..10cb048 100644
--- a/tools/appliance/definitions/systemvmtemplate/configure_login.sh
+++ b/tools/appliance/definitions/systemvmtemplate/finalize.sh
@@ -19,16 +19,8 @@
 set -e
 set -x
 
-function add_admin_group() {
-  groupadd -f -r admin
-}
-
-function configure_user() {
-  usermod -a -G admin cloud
-  mkdir -p /home/cloud/.ssh
-  chmod 700 /home/cloud/.ssh
+function randomize_password() {
   echo "cloud:`openssl rand -base64 32`" | chpasswd
-  echo "root:password" | chpasswd
 }
 
 function configure_sudoers() {
@@ -46,24 +38,11 @@ END
   echo 'cloud ALL=NOPASSWD:/bin/chmod, /bin/cp, /bin/mkdir, /bin/mount, 
/bin/umount, /sbin/halt' > /etc/sudoers.d/cloud
 }
 
-function configure_inittab() {
-  # Fix inittab
-  cat >> /etc/inittab << EOF
-
-0:2345:respawn:/sbin/getty -L 115200 ttyS0 vt102
-vc:2345:respawn:/sbin/getty 38400 hvc0
-EOF
-}
-
-function configure_login() {
-  # configure_sshd
-  configure_inittab
-  add_admin_group
+function finalize() {
+  randomize_password
   configure_sudoers
-  configure_user
-  rm -fv /home/cloud/configure_login.sh
   sync
   halt -p
 }
 
-return 2>/dev/null || configure_login
+return 2>/dev/null || finalize
diff --git a/tools/appliance/definitions/systemvmtemplate/zerodisk.sh 
b/tools/appliance/definitions/systemvmtemplate/zerodisk.sh
index d002316..0b72363 100644
--- a/tools/appliance/definitions/systemvmtemplate/zerodisk.sh
+++ b/tools/appliance/definitions/systemvmtemplate/zerodisk.sh
@@ -24,26 +24,26 @@ function cleanup_veewee() {
   # this has

[cloudstack] branch debian9-systemvmtemplate updated (210f2cf -> be06f2f)

2017-12-04 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a change to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


 discard 210f2cf  Fix cleanup and halting of template
 new be06f2f  Fix cleanup and halting of template

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (210f2cf)
\
 N -- N -- N   refs/heads/debian9-systemvmtemplate (be06f2f)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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:
 .../systemvmtemplate/configure_login.sh| 17 -
 .../definitions/systemvmtemplate/definition.rb |  2 +-
 .../systemvmtemplate/{halt.sh => finalize.sh}  | 22 +-
 3 files changed, 22 insertions(+), 19 deletions(-)
 rename tools/appliance/definitions/systemvmtemplate/{halt.sh => finalize.sh} 
(63%)

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" '].

[cloudstack] branch debian9-systemvmtemplate updated: Fix cleanup and halting of template

2017-12-04 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/debian9-systemvmtemplate by 
this push:
 new 210f2cf  Fix cleanup and halting of template
210f2cf is described below

commit 210f2cf05e9bf875e8776fb79c2b30cd188caa9a
Author: Rohit Yadav 
AuthorDate: Tue Dec 5 12:22:07 2017 +0530

Fix cleanup and halting of template

Signed-off-by: Rohit Yadav 
---
 .../definitions/systemvmtemplate/cleanup.sh|  2 +-
 .../systemvmtemplate/configure_login.sh|  4 
 .../definitions/systemvmtemplate/definition.rb |  5 ++--
 .../appliance/definitions/systemvmtemplate/halt.sh | 28 ++
 .../definitions/systemvmtemplate/zerodisk.sh   | 14 +--
 5 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/tools/appliance/definitions/systemvmtemplate/cleanup.sh 
b/tools/appliance/definitions/systemvmtemplate/cleanup.sh
index ab911f3..4f5fccf 100644
--- a/tools/appliance/definitions/systemvmtemplate/cleanup.sh
+++ b/tools/appliance/definitions/systemvmtemplate/cleanup.sh
@@ -45,6 +45,7 @@ function cleanup_dev() {
 
 function cleanup_misc() {
   # Scripts
+  rm -fv /home/cloud/*.sh
   rm -fr /home/cloud/cloud_scripts*
   rm -f /root/.rnd
   rm -f /var/www/html/index.html
@@ -65,7 +66,6 @@ function cleanup_misc() {
   rm -fr /usr/share/man
   rm -fr /usr/share/info
   rm -fr /usr/share/lintian
-  rm -fr /usr/share/vim
 }
 
 function cleanup() {
diff --git a/tools/appliance/definitions/systemvmtemplate/configure_login.sh 
b/tools/appliance/definitions/systemvmtemplate/configure_login.sh
index 743d7ef..b25ea73 100644
--- a/tools/appliance/definitions/systemvmtemplate/configure_login.sh
+++ b/tools/appliance/definitions/systemvmtemplate/configure_login.sh
@@ -27,7 +27,6 @@ function configure_user() {
   usermod -a -G admin cloud
   mkdir -p /home/cloud/.ssh
   chmod 700 /home/cloud/.ssh
-  echo "cloud:`openssl rand -base64 32`" | chpasswd
   echo "root:password" | chpasswd
 }
 
@@ -61,9 +60,6 @@ function configure_login() {
   add_admin_group
   configure_sudoers
   configure_user
-  rm -fv /home/cloud/configure_login.sh
-  sync
-  halt -p
 }
 
 return 2>/dev/null || configure_login
diff --git a/tools/appliance/definitions/systemvmtemplate/definition.rb 
b/tools/appliance/definitions/systemvmtemplate/definition.rb
index 33c8e8b..ead9d09 100644
--- a/tools/appliance/definitions/systemvmtemplate/definition.rb
+++ b/tools/appliance/definitions/systemvmtemplate/definition.rb
@@ -81,11 +81,12 @@ config = {
 'configure_systemvm_services.sh',
 'authorized_keys.sh',
 'configure_persistent_config.sh',
+# setup login stuff
+'configure_login.sh',
 # cleanup & space-saving
 'cleanup.sh',
 'zerodisk.sh',
-# setup login stuff
-'configure_login.sh'
+'halt.sh'
 ],
 :postinstall_timeout => '1'
 }
diff --git a/tools/appliance/definitions/systemvmtemplate/halt.sh 
b/tools/appliance/definitions/systemvmtemplate/halt.sh
new file mode 100644
index 000..e51531a
--- /dev/null
+++ b/tools/appliance/definitions/systemvmtemplate/halt.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+# 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
+set -x
+
+function finalize() {
+  echo "cloud:`openssl rand -base64 32`" | chpasswd
+  sync
+  halt -p
+}
+
+return 2>/dev/null || finalize
diff --git a/tools/appliance/definitions/systemvmtemplate/zerodisk.sh 
b/tools/appliance/definitions/systemvmtemplate/zerodisk.sh
index d002316..0b72363 100644
--- a/tools/appliance/definitions/systemvmtemplate/zerodisk.sh
+++ b/tools/appliance/definitions/systemvmtemplate/zerodisk.sh
@@ -24,26 +24,26 @@ function cleanup_veewee() {
   # this has to be here since it is the last file to run (and we remove 
ourselves)
   cd /home/cloud
   rm -fv *.iso
-  rm -fv 
{apt_upgrade,authorized_keys,cleanup,install_systemvm_packages,zerodisk}.sh
-  rm -fv 
configure_{acpid,conntrack,grub,locale,networking,persistent_config,systemvm_services}.sh

[GitHub] blueorangutan commented on issue #2211: CLOUDSTACK-10013: Migrate systemvmtemplate to Debian9

2017-12-04 Thread GitBox

blueorangutan commented on issue #2211: CLOUDSTACK-10013: Migrate 
systemvmtemplate to Debian9
URL: https://github.com/apache/cloudstack/pull/2211#issuecomment-349208265
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1342


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 debian9-systemvmtemplate updated: fix path bug

2017-12-04 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/debian9-systemvmtemplate by 
this push:
 new 3eb4169  fix path bug
3eb4169 is described below

commit 3eb41694e8a99fd6cff5d078b93942560a6cc74e
Author: Rohit Yadav 
AuthorDate: Tue Dec 5 11:46:19 2017 +0530

fix path bug

Signed-off-by: Rohit Yadav 
---
 .../definitions/systemvmtemplate/configure_systemvm_services.sh| 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git 
a/tools/appliance/definitions/systemvmtemplate/configure_systemvm_services.sh 
b/tools/appliance/definitions/systemvmtemplate/configure_systemvm_services.sh
index 4789e65..84cb590 100644
--- 
a/tools/appliance/definitions/systemvmtemplate/configure_systemvm_services.sh
+++ 
b/tools/appliance/definitions/systemvmtemplate/configure_systemvm_services.sh
@@ -34,9 +34,8 @@ function configure_apache2() {
 function install_cloud_scripts() {
   # ./cloud_scripts/ has been put there by ../../cloud_scripts_shar_archive.sh
   rsync -av ./cloud_scripts/ /
-  chmod +x /opt/cloud/bin/* \
+  chmod +x /opt/cloud/bin/* /opt/cloud/bin/setup/* \
 /root/{clearUsageRules.sh,reconfigLB.sh,monitorServices.py} \
-/etc/init.d/cloud-early-config \
 /etc/profile.d/cloud.sh
 
   chmod -x /etc/systemd/system/*

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" '].

[GitHub] bwsw commented on issue #2350: Cloudstack 10170 - fixes resource tags security bugs and adds account tags support

2017-12-04 Thread GitBox

bwsw commented on issue #2350: Cloudstack 10170 - fixes resource tags security 
bugs and adds account tags support
URL: https://github.com/apache/cloudstack/pull/2350#issuecomment-349204932
 
 
   @rafaelweingartner Confluence page modified:
   https://cwiki.apache.org/confluence/display/CLOUDSTACK/Resource+Tags
   - synced all resource types from source code (from master)
   - added a note about account tags with PR reference
   - added getting started, implementation details notes for developers.


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] bwsw commented on issue #2350: Cloudstack 10170 - fixes resource tags security bugs and adds account tags support

2017-12-04 Thread GitBox

bwsw commented on issue #2350: Cloudstack 10170 - fixes resource tags security 
bugs and adds account tags support
URL: https://github.com/apache/cloudstack/pull/2350#issuecomment-349204932
 
 
   @rafaelweingartner Confluence page modified:
   https://cwiki.apache.org/confluence/display/CLOUDSTACK/Resource+Tags


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 #2211: CLOUDSTACK-10013: Migrate systemvmtemplate to Debian9

2017-12-04 Thread GitBox

blueorangutan commented on issue #2211: CLOUDSTACK-10013: Migrate 
systemvmtemplate to Debian9
URL: https://github.com/apache/cloudstack/pull/2211#issuecomment-349005378
 
 
   Trillian test result (tid-1727)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 33092 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2211-t1727-kvm-centos7.zip
   Test /marvin/tests/smoke/test_accounts.py took 805 seconds
   Test /marvin/tests/smoke/test_affinity_groups_projects.py took 143 seconds
   Test /marvin/tests/smoke/test_affinity_groups.py took 82 seconds
   Test /marvin/tests/smoke/test_certauthority_root.py took 45 seconds
   Test /marvin/tests/smoke/test_deploy_vgpu_enabled_vm.py took 6 seconds
   Test /marvin/tests/smoke/test_deploy_virtio_scsi_vm.py took 823 seconds
   Test /marvin/tests/smoke/test_deploy_vm_iso.py took 63 seconds
   Test /marvin/tests/smoke/test_deploy_vm_root_resize.py took 83 seconds
   Test /marvin/tests/smoke/test_deploy_vms_with_varied_deploymentplanners.py 
took 119 seconds
   Test /marvin/tests/smoke/test_deploy_vm_with_userdata.py took 94 seconds
   Test /marvin/tests/smoke/test_disk_offerings.py took 7 seconds
   Test /marvin/tests/smoke/test_dynamicroles.py took 119 seconds
   Test /marvin/tests/smoke/test_global_settings.py took 7 seconds
   Test /marvin/tests/smoke/test_guest_vlan_range.py took 28 seconds
   Test /marvin/tests/smoke/test_host_annotations.py took 15 seconds
   Test /marvin/tests/smoke/test_hostha_simulator.py took 7 seconds
   Test /marvin/tests/smoke/test_host_maintenance.py took 231 seconds
   Test /marvin/tests/smoke/test_hosts.py took 7 seconds
   Test /marvin/tests/smoke/test_internal_lb.py took 1522 seconds
   Test /marvin/tests/smoke/test_iso.py took 276 seconds
   Test /marvin/tests/smoke/test_list_ids_parameter.py took 573 seconds
   Test /marvin/tests/smoke/test_loadbalance.py took 386 seconds
   Test /marvin/tests/smoke/test_login.py took 24 seconds
   Test /marvin/tests/smoke/test_metrics_api.py took 60 seconds
   Test /marvin/tests/smoke/test_multipleips_per_nic.py took 98 seconds
   Test /marvin/tests/smoke/test_nested_virtualization.py took 12 seconds
   Test /marvin/tests/smoke/test_network_acl.py took 73 seconds
   Test /marvin/tests/smoke/test_network.py took 1249 seconds
   Test /marvin/tests/smoke/test_nic_adapter_type.py took 14 seconds
   Test /marvin/tests/smoke/test_nic.py took 458 seconds
   Test /marvin/tests/smoke/test_non_contigiousvlan.py took 23 seconds
   Test /marvin/tests/smoke/test_outofbandmanagement_nestedplugin.py took 85 
seconds
   Test /marvin/tests/smoke/test_outofbandmanagement.py took 217 seconds
   Test /marvin/tests/smoke/test_over_provisioning.py took 8 seconds
   Test /marvin/tests/smoke/test_password_server.py took 175 seconds
   Test /marvin/tests/smoke/test_portable_publicip.py took 50 seconds
   Test /marvin/tests/smoke/test_portforwardingrules.py took 110 seconds
   Test /marvin/tests/smoke/test_primary_storage.py took 503 seconds
   Test /marvin/tests/smoke/test_privategw_acl.py took 617 seconds
   Test /marvin/tests/smoke/test_projects.py took 4148 seconds
   Test /marvin/tests/smoke/test_public_ip_range.py took 12 seconds
   Test /marvin/tests/smoke/test_pvlan.py took 10 seconds
   Test /marvin/tests/smoke/test_regions.py took 6 seconds
   Test /marvin/tests/smoke/test_reset_vm_on_reboot.py took 259 seconds
   Test /marvin/tests/smoke/test_resource_detail.py took 22 seconds
   Test /marvin/tests/smoke/test_router_dhcphosts.py took 339 seconds
   Test /marvin/tests/smoke/test_router_dns.py took 164 seconds
   Test /marvin/tests/smoke/test_router_dnsservice.py took 187 seconds
   Test /marvin/tests/smoke/test_routers_iptables_default_policy.py took 268 
seconds
   Test /marvin/tests/smoke/test_routers_network_ops.py took 1224 seconds
   Test /marvin/tests/smoke/test_routers.py took 3739 seconds
   Test /marvin/tests/smoke/test_scale_vm.py took 7 seconds
   Test /marvin/tests/smoke/test_secondary_storage.py took 8 seconds
   Test /marvin/tests/smoke/test_service_offerings.py took 316 seconds
   Test /marvin/tests/smoke/test_snapshots.py took 191 seconds
   Test /marvin/tests/smoke/test_ssvm.py took 320 seconds
   Test /marvin/tests/smoke/test_staticroles.py took 5 seconds
   Test /marvin/tests/smoke/test_templates.py took 1141 seconds
   Test /marvin/tests/smoke/test_usage_events.py took 5 seconds
   Test /marvin/tests/smoke/test_usage.py took 1452 seconds
   Test /marvin/tests/smoke/test_vm_life_cycle.py took 737 seconds
   Test /marvin/tests/smoke/test_vm_snapshots.py took 613 seconds
   Test /marvin/tests/smoke/test_volumes.py took 2114 seconds
   Test /marvin/tests/smoke/test_vpc_redundant.py took 863 seconds
   Test /marvin/tests/smoke/test_vpc_router_nics.py took 579 seconds
   Test /marvin/tests/smoke/test_vpc_vpn.py took 1847 seconds
   Test /marvin/tests/smoke/test_hostha_kvm.py took 1284 seconds
   Test completed. 60

[cloudstack] branch debian9-systemvmtemplate updated: further fixes

2017-12-04 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/debian9-systemvmtemplate by 
this push:
 new 7118f59  further fixes
7118f59 is described below

commit 7118f599e34649d1badfebf718430ba9b4b46c91
Author: Rohit Yadav 
AuthorDate: Tue Dec 5 11:26:04 2017 +0530

further fixes

Signed-off-by: Rohit Yadav 
---
 systemvm/debian/etc/ssh/sshd_config |  1 -
 .../{etc/init.d => opt/cloud/bin/setup}/cloud-early-config  |  0
 .../definitions/systemvmtemplate/configure_login.sh | 13 +
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/systemvm/debian/etc/ssh/sshd_config 
b/systemvm/debian/etc/ssh/sshd_config
index 4931cdb..f277574 100644
--- a/systemvm/debian/etc/ssh/sshd_config
+++ b/systemvm/debian/etc/ssh/sshd_config
@@ -57,7 +57,6 @@ AuthorizedKeysFile .ssh/authorized_keys
 #IgnoreRhosts yes
 
 # To disable tunneled clear text passwords, change to no here!
-#PasswordAuthentication yes
 #PermitEmptyPasswords no
 PasswordAuthentication no
 
diff --git a/systemvm/debian/etc/init.d/cloud-early-config 
b/systemvm/debian/opt/cloud/bin/setup/cloud-early-config
similarity index 100%
rename from systemvm/debian/etc/init.d/cloud-early-config
rename to systemvm/debian/opt/cloud/bin/setup/cloud-early-config
diff --git a/tools/appliance/definitions/systemvmtemplate/configure_login.sh 
b/tools/appliance/definitions/systemvmtemplate/configure_login.sh
index d5f80b1..743d7ef 100644
--- a/tools/appliance/definitions/systemvmtemplate/configure_login.sh
+++ b/tools/appliance/definitions/systemvmtemplate/configure_login.sh
@@ -46,22 +46,11 @@ END
   echo 'cloud ALL=NOPASSWD:/bin/chmod, /bin/cp, /bin/mkdir, /bin/mount, 
/bin/umount, /sbin/halt' > /etc/sudoers.d/cloud
 }
 
-# sshd_config is overwritten from cloud_scripts
-#function configure_sshd() {
-#  grep "UseDNS no" /etc/ssh/sshd_config && \
-#  grep "PasswordAuthentication no" /etc/ssh/sshd_config && \
-#  return
-#  # Tweak sshd to prevent DNS resolution (speed up logins)
-#  echo 'UseDNS no' >> /etc/ssh/sshd_config
-#
-#  # Require ssh keys for login
-#  sed -i -e 's/^.*PasswordAuthentication .*$/PasswordAuthentication no/g' 
/etc/ssh/sshd_config
-#}
-
 function configure_inittab() {
   # Fix inittab
   cat >> /etc/inittab << EOF
 
+0:2345:respawn:/sbin/getty -L 115200 ttyS0 vt102
 vc:2345:respawn:/sbin/getty 38400 hvc0
 EOF
 }

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" '].

[cloudstack] branch debian9-systemvmtemplate updated: Fix paths

2017-12-04 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/debian9-systemvmtemplate by 
this push:
 new 2b7dca0  Fix paths
2b7dca0 is described below

commit 2b7dca0c44ebd8144e6de7601525442497f2cdd0
Author: Rohit Yadav 
AuthorDate: Tue Dec 5 11:07:26 2017 +0530

Fix paths

Signed-off-by: Rohit Yadav 
---
 LICENSE| 8 
 pom.xml| 3 +--
 tools/appliance/shar_cloud_scripts.sh  | 4 ++--
 tools/whisker/LICENSE  | 8 
 tools/whisker/descriptor-for-packaging.xml | 8 
 tools/whisker/descriptor.xml   | 8 
 6 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/LICENSE b/LICENSE
index 982b158..c30d859 100644
--- a/LICENSE
+++ b/LICENSE
@@ -208,7 +208,7 @@ Within the console-proxy/js directory
 jquery.js 
 
 
-Within the patches/systemvm/debian/config/etc directory
+Within the systemvm/debian/etc directory
 placed in the public domain
 by Adiscon GmbH  http://www.adiscon.com/ 
 rsyslog.conf 
@@ -216,14 +216,14 @@ Within the patches/systemvm/debian/config/etc directory
 dnsmasq.conf 
 vpcdnsmasq.conf 
 
-Within the patches/systemvm/debian/config/etc/apache2 directory
+Within the systemvm/debian/etc/apache2 directory
 licensed under the Apache License, Version 2 
http://www.apache.org/licenses/LICENSE-2.0.txt  (as above)
 Copyright (c) 2012 The Apache Software Foundation
 from The Apache Software Foundation  http://www.apache.org/ 
 httpd.conf 
 vhost.template
 
-Within the patches/systemvm/debian/config/etc/ssh/ directory
+Within the systemvm/debian/etc/ssh/ directory
 licensed under the BSD (2-clause) 
http://www.opensource.org/licenses/BSD-2-Clause  (as follows)
  
 
@@ -254,7 +254,7 @@ Within the patches/systemvm/debian/config/etc/ssh/ directory
 from OpenSSH Project  http://www.openssh.org/ 
 sshd_config 
 
-Within the patches/systemvm/debian/config/root/redundant_router directory
+Within the systemvm/debian/root/redundant_router directory
 placed in the public domain
 by The netfilter.org project  http://www.netfilter.org/ 
 conntrackd.conf.templ 
diff --git a/pom.xml b/pom.xml
index d4d1a37..57e3adf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -929,8 +929,7 @@
   systemvm/agent/conf/environment.properties
   systemvm/agent/js/jquery.js
   systemvm/agent/js/jquery.flot.navigate.js
-  systemvm/patches/debian/**
-  systemvm/patches/vpn/**
+  systemvm/debian/**
   tools/transifex/.tx/config
   tools/logo/apache_cloudstack.png
   
tools/marvin/marvin/sandbox/advanced/sandbox.cfg
diff --git a/tools/appliance/shar_cloud_scripts.sh 
b/tools/appliance/shar_cloud_scripts.sh
index d67f889..30ae2cb 100755
--- a/tools/appliance/shar_cloud_scripts.sh
+++ b/tools/appliance/shar_cloud_scripts.sh
@@ -37,10 +37,10 @@ TEMP_DIR=`mktemp -d ${TMPDIR}/shar_cloud.`
 cd ${TEMP_DIR}
 mkdir cloud_scripts
 mkdir -p cloud_scripts/opt/cloudstack
-cp -r ${CLOUDSTACK_DIR}/systemvm/patches/debian/* cloud_scripts/
+cp -r ${CLOUDSTACK_DIR}/systemvm/debian/* cloud_scripts/
 
 mkdir -p cloud_scripts/usr/share/cloud
-cd ${CLOUDSTACK_DIR}/systemvm/patches/debian
+cd ${CLOUDSTACK_DIR}/systemvm/debian
 tar -cf ${TEMP_DIR}/cloud_scripts/usr/share/cloud/cloud-scripts.tar *
 
 cd ${TEMP_DIR}
diff --git a/tools/whisker/LICENSE b/tools/whisker/LICENSE
index d14a974..e107c4f 100644
--- a/tools/whisker/LICENSE
+++ b/tools/whisker/LICENSE
@@ -2758,7 +2758,7 @@ Within the deps/awsapi-lib directory
 from VMware, Inc  http://www.vmware.com/ 
 rabbitmq-client.jar  from http://www.rabbitmq.com/java-client.html
 
-Within the patches/systemvm/debian/config/etc directory
+Within the systemvm/debian/etc directory
 placed in the public domain
 by Adiscon GmbH  http://www.adiscon.com/ 
 rsyslog.conf 
@@ -2766,14 +2766,14 @@ Within the patches/systemvm/debian/config/etc directory
 dnsmasq.conf 
 vpcdnsmasq.conf 
 
-Within the patches/systemvm/debian/config/etc/apache2 directory
+Within the systemvm/debian/config/etc/apache2 directory
 licensed under the Apache License, Version 2 
http://www.apache.org/licenses/LICENSE-2.0.txt  (as above)
 Copyright (c) 2012 The Apache Software Foundation
 from The Apache Software Foundation  http://www.apache.org/ 
 httpd.conf 
 vhost.template
 
-Within the patches/systemvm/debian/config/etc/ssh/ directory
+Within the systemvm/debian/etc/ssh/ directory
 licensed under

[cloudstack] branch debian9-systemvmtemplate updated: template improvements

2017-12-04 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/debian9-systemvmtemplate by 
this push:
 new 3152e69  template improvements
3152e69 is described below

commit 3152e690cab6aea5994e86a9fe640307cda62651
Author: Rohit Yadav 
AuthorDate: Tue Dec 5 10:54:29 2017 +0530

template improvements

Signed-off-by: Rohit Yadav 
---
 .../{patches => }/debian/etc/apache2/httpd.conf|  0
 .../debian/etc/apache2/vhost.template  |  0
 systemvm/{patches => }/debian/etc/cloud-nic.rules  |  0
 .../{patches => }/debian/etc/dnsmasq.conf.tmpl |  0
 .../{patches => }/debian/etc/haproxy/haproxy.cfg   |  0
 .../debian/etc/init.d/cloud-early-config   | 48 ++
 systemvm/{patches => }/debian/etc/ipsec.conf   |  0
 .../{patches => }/debian/etc/ipsec.d/l2tp.conf |  0
 systemvm/{patches => }/debian/etc/ipsec.secrets|  0
 .../debian/etc/iptables/iptables-consoleproxy  |  0
 .../debian/etc/iptables/iptables-dhcpsrvr  |  0
 .../debian/etc/iptables/iptables-elbvm |  0
 .../debian/etc/iptables/iptables-ilbvm |  0
 .../debian/etc/iptables/iptables-router|  0
 .../debian/etc/iptables/iptables-secstorage|  0
 .../debian/etc/iptables/iptables-vpcrouter |  0
 .../debian/etc/iptables/rt_tables_init |  0
 systemvm/{patches => }/debian/etc/iptables/rules   |  0
 systemvm/{patches => }/debian/etc/issue|  0
 systemvm/{patches => }/debian/etc/logrotate.conf   |  0
 .../{patches => }/debian/etc/logrotate.d/apache2   |  0
 .../{patches => }/debian/etc/logrotate.d/cloud |  0
 .../debian/etc/logrotate.d/conntrackd  |  0
 .../{patches => }/debian/etc/logrotate.d/dnsmasq   |  0
 .../{patches => }/debian/etc/logrotate.d/haproxy   |  0
 systemvm/{patches => }/debian/etc/logrotate.d/ppp  |  0
 .../{patches => }/debian/etc/logrotate.d/rsyslog   |  0
 .../debian/etc/modprobe.d/aesni_intel.conf |  0
 .../debian/etc/modprobe.d/pcspkr.conf  |  0
 .../{patches => }/debian/etc/ppp/options.xl2tpd|  0
 .../{patches => }/debian/etc/profile.d/cloud.sh|  0
 systemvm/{patches => }/debian/etc/rc.local |  0
 systemvm/{patches => }/debian/etc/rsyslog.conf |  0
 systemvm/{patches => }/debian/etc/ssh/sshd_config  |  0
 systemvm/{patches => }/debian/etc/sysctl.conf  |  0
 .../etc/systemd/system/cloud-early-config.service  | 18 
 .../systemd/system/cloud-password-server@.service  |  0
 .../etc/systemd/system/cloud-postinit.service  |  0
 .../debian/etc/systemd/system/cloud.service|  0
 systemvm/{patches => }/debian/etc/vpcdnsmasq.conf  |  0
 .../{patches => }/debian/etc/xl2tpd/xl2tpd.conf|  0
 .../debian/opt/cloud/bin/baremetal-vr.py   |  0
 .../debian/opt/cloud/bin/baremetal_snat.sh |  0
 .../debian/opt/cloud/bin/bumpup_priority.sh|  0
 .../debian/opt/cloud/bin/checkbatchs2svpn.sh   |  0
 .../debian/opt/cloud/bin/checkrouter.sh|  0
 .../debian/opt/cloud/bin/checks2svpn.sh|  0
 .../debian/opt/cloud/bin/cloud-nic.sh  |  0
 .../debian/opt/cloud/bin/configure.py  |  0
 .../debian/opt/cloud/bin/cs/CsAddress.py   |  0
 .../{patches => }/debian/opt/cloud/bin/cs/CsApp.py |  0
 .../debian/opt/cloud/bin/cs/CsConfig.py|  0
 .../debian/opt/cloud/bin/cs/CsDatabag.py   |  0
 .../debian/opt/cloud/bin/cs/CsDhcp.py  |  0
 .../debian/opt/cloud/bin/cs/CsFile.py  |  0
 .../debian/opt/cloud/bin/cs/CsGuestNetwork.py  |  0
 .../debian/opt/cloud/bin/cs/CsHelper.py|  0
 .../debian/opt/cloud/bin/cs/CsLoadBalancer.py  |  0
 .../debian/opt/cloud/bin/cs/CsMonitor.py   |  0
 .../debian/opt/cloud/bin/cs/CsNetfilter.py |  0
 .../debian/opt/cloud/bin/cs/CsProcess.py   |  0
 .../debian/opt/cloud/bin/cs/CsRedundant.py |  0
 .../debian/opt/cloud/bin/cs/CsRoute.py |  0
 .../debian/opt/cloud/bin/cs/CsRule.py  |  0
 .../debian/opt/cloud/bin/cs/CsStaticRoutes.py  |  0
 .../debian/opt/cloud/bin/cs/__init__.py|  0
 .../debian/opt/cloud/bin/cs_cmdline.py |  0
 .../{patches => }/debian/opt/cloud/bin/cs_dhcp.py  |  0
 .../debian/opt/cloud/bin/cs_firewallrules.py   |  0
 .../debian/opt/cloud/bin/cs_forwardingrules.py |  0
 .../debian/opt/cloud/bin/cs_guestnetwork.py|  0
 .../{patches => }/debian/opt/cloud/bin/cs_ip.py|  0
 .../debian/opt/cloud/bin/cs_loadbalancer.py|  0
 .../debian/opt/cloud/bin/cs_monitorservice.py  |  0
 .../debian/opt/cloud/bin/cs_network_acl.py |  0
 .../debian/opt/cloud/bin/cs_remoteaccessvpn.py |  0
 .../debian/opt/cloud/bin/cs_site2sitevpn.py

[GitHub] blueorangutan commented on issue #2211: CLOUDSTACK-10013: Migrate systemvmtemplate to Debian9

2017-12-04 Thread GitBox

blueorangutan commented on issue #2211: CLOUDSTACK-10013: Migrate 
systemvmtemplate to Debian9
URL: https://github.com/apache/cloudstack/pull/2211#issuecomment-349189649
 
 
   Trillian test result (tid-1729)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 29495 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2211-t1729-kvm-centos7.zip
   Test /marvin/tests/smoke/test_accounts.py took 864 seconds
   Test /marvin/tests/smoke/test_affinity_groups_projects.py took 213 seconds
   Test /marvin/tests/smoke/test_affinity_groups.py took 61 seconds
   Test /marvin/tests/smoke/test_certauthority_root.py took 42 seconds
   Test /marvin/tests/smoke/test_deploy_vgpu_enabled_vm.py took 5 seconds
   Test /marvin/tests/smoke/test_deploy_virtio_scsi_vm.py took 1261 seconds
   Test /marvin/tests/smoke/test_deploy_vm_iso.py took 52 seconds
   Test /marvin/tests/smoke/test_deploy_vm_root_resize.py took 112 seconds
   Test /marvin/tests/smoke/test_deploy_vms_with_varied_deploymentplanners.py 
took 142 seconds
   Test /marvin/tests/smoke/test_deploy_vm_with_userdata.py took 72 seconds
   Test /marvin/tests/smoke/test_disk_offerings.py took 6 seconds
   Test /marvin/tests/smoke/test_dynamicroles.py took 109 seconds
   Test /marvin/tests/smoke/test_global_settings.py took 6 seconds
   Test /marvin/tests/smoke/test_guest_vlan_range.py took 27 seconds
   Test /marvin/tests/smoke/test_host_annotations.py took 14 seconds
   Test /marvin/tests/smoke/test_hostha_simulator.py took 6 seconds
   Test /marvin/tests/smoke/test_host_maintenance.py took 268 seconds
   Test /marvin/tests/smoke/test_internal_lb.py took 1586 seconds
   Test /marvin/tests/smoke/test_iso.py took 234 seconds
   Test /marvin/tests/smoke/test_list_ids_parameter.py took 621 seconds
   Test /marvin/tests/smoke/test_loadbalance.py took 415 seconds
   Test /marvin/tests/smoke/test_login.py took 23 seconds
   Test /marvin/tests/smoke/test_metrics_api.py took 59 seconds
   Test /marvin/tests/smoke/test_multipleips_per_nic.py took 92 seconds
   Test /marvin/tests/smoke/test_nested_virtualization.py took 11 seconds
   Test /marvin/tests/smoke/test_network_acl.py took 97 seconds
   Test /marvin/tests/smoke/test_network.py took 1193 seconds
   Test /marvin/tests/smoke/test_nic_adapter_type.py took 11 seconds
   Test /marvin/tests/smoke/test_nic.py took 454 seconds
   Test /marvin/tests/smoke/test_non_contigiousvlan.py took 20 seconds
   Test /marvin/tests/smoke/test_outofbandmanagement_nestedplugin.py took 77 
seconds
   Test /marvin/tests/smoke/test_outofbandmanagement.py took 233 seconds
   Test /marvin/tests/smoke/test_over_provisioning.py took 5 seconds
   Test /marvin/tests/smoke/test_password_server.py took 243 seconds
   Test /marvin/tests/smoke/test_portable_publicip.py took 58 seconds
   Test /marvin/tests/smoke/test_portforwardingrules.py took 93 seconds
   Test /marvin/tests/smoke/test_primary_storage.py took 509 seconds
   Test /marvin/tests/smoke/test_privategw_acl.py took 991 seconds
   Test /marvin/tests/smoke/test_projects.py took 563 seconds
   Test /marvin/tests/smoke/test_public_ip_range.py took 12 seconds
   Test /marvin/tests/smoke/test_pvlan.py took 10 seconds
   Test /marvin/tests/smoke/test_regions.py took 6 seconds
   Test /marvin/tests/smoke/test_reset_vm_on_reboot.py took 263 seconds
   Test /marvin/tests/smoke/test_resource_detail.py took 16 seconds
   Test /marvin/tests/smoke/test_router_dhcphosts.py took 393 seconds
   Test /marvin/tests/smoke/test_router_dns.py took 141 seconds
   Test /marvin/tests/smoke/test_router_dnsservice.py took 158 seconds
   Test /marvin/tests/smoke/test_routers_iptables_default_policy.py took 221 
seconds
   Test /marvin/tests/smoke/test_routers_network_ops.py took 1749 seconds
   Test /marvin/tests/smoke/test_routers.py took 190 seconds
   Test /marvin/tests/smoke/test_scale_vm.py took 5 seconds
   Test /marvin/tests/smoke/test_secondary_storage.py took 6 seconds
   Test /marvin/tests/smoke/test_service_offerings.py took 375 seconds
   Test /marvin/tests/smoke/test_snapshots.py took 175 seconds
   Test /marvin/tests/smoke/test_ssvm.py took 812 seconds
   Test /marvin/tests/smoke/test_staticroles.py took 6 seconds
   Test /marvin/tests/smoke/test_templates.py took 1349 seconds
   Test /marvin/tests/smoke/test_usage_events.py took 5 seconds
   Test /marvin/tests/smoke/test_usage.py took 2047 seconds
   Test /marvin/tests/smoke/test_vm_life_cycle.py took 791 seconds
   Test /marvin/tests/smoke/test_vm_snapshots.py took 597 seconds
   Test /marvin/tests/smoke/test_volumes.py took 2172 seconds
   Test /marvin/tests/smoke/test_vpc_redundant.py took 1736 seconds
   Test /marvin/tests/smoke/test_vpc_router_nics.py took 572 seconds
   Test /marvin/tests/smoke/test_vpc_vpn.py took 2140 seconds
   Test /marvin/tests/smoke/test_hostha_kvm.py took 812 seconds
   Test completed. 60 look OK, 5 have error(s)
   
   
   Test | Result | Time

[GitHub] blueorangutan commented on issue #2211: CLOUDSTACK-10013: Migrate systemvmtemplate to Debian9

2017-12-04 Thread GitBox

blueorangutan commented on issue #2211: CLOUDSTACK-10013: Migrate 
systemvmtemplate to Debian9
URL: https://github.com/apache/cloudstack/pull/2211#issuecomment-349075774
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1341


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 debian9-systemvmtemplate updated (40e2b8a -> 52b2210)

2017-12-04 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a change to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


 discard 40e2b8a  Fix double-patching, apply iptables rules on non-VR systemvms
 new 52b2210  Fix double-patching, apply iptables rules on non-VR systemvms

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (40e2b8a)
\
 N -- N -- N   refs/heads/debian9-systemvmtemplate (52b2210)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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:
 systemvm/patches/debian/etc/init.d/cloud-early-config   | 2 --
 systemvm/patches/debian/opt/cloud/bin/setup/common.sh   | 9 -
 systemvm/patches/debian/opt/cloud/bin/setup/postinit.sh | 3 ---
 3 files changed, 14 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" '].

[cloudstack] 01/01: Fix double-patching, apply iptables rules on non-VR systemvms

2017-12-04 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 52b2210d4974039f771bc99cd1ff6a49353f5542
Author: Rohit Yadav 
AuthorDate: Mon Dec 4 23:43:15 2017 +0530

Fix double-patching, apply iptables rules on non-VR systemvms

Signed-off-by: Rohit Yadav 
---
 .../patches/debian/etc/init.d/cloud-early-config   |  7 +--
 systemvm/patches/debian/etc/issue  |  7 ++-
 systemvm/patches/debian/etc/rc.local   | 60 +++---
 systemvm/patches/debian/opt/cloud/bin/configure.py |  4 +-
 .../patches/debian/opt/cloud/bin/cs/CsRedundant.py |  1 -
 .../patches/debian/opt/cloud/bin/setup/common.sh   |  1 -
 .../debian/opt/cloud/bin/setup/consoleproxy.sh |  1 -
 .../patches/debian/opt/cloud/bin/setup/dhcpsrvr.sh |  3 --
 .../patches/debian/opt/cloud/bin/setup/elbvm.sh|  1 -
 .../patches/debian/opt/cloud/bin/setup/ilbvm.sh|  1 -
 .../patches/debian/opt/cloud/bin/setup/postinit.sh | 20 +++-
 .../patches/debian/opt/cloud/bin/setup/router.sh   |  4 --
 .../debian/opt/cloud/bin/setup/secstorage.sh   |  1 -
 .../debian/opt/cloud/bin/setup/vpcrouter.sh|  1 -
 14 files changed, 44 insertions(+), 68 deletions(-)

diff --git a/systemvm/patches/debian/etc/init.d/cloud-early-config 
b/systemvm/patches/debian/etc/init.d/cloud-early-config
index 5e3f7b6..139e61b 100755
--- a/systemvm/patches/debian/etc/init.d/cloud-early-config
+++ b/systemvm/patches/debian/etc/init.d/cloud-early-config
@@ -30,6 +30,7 @@ 
PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
 CMDLINE=/var/cache/cloud/cmdline
 
 # Clear boot up flag, it would be created by rc.local after boot up done
+mkdir -p /var/cache/cloud
 rm -f /var/cache/cloud/boot_up_done
 
 [ -x /sbin/ifup ] || exit 0
@@ -62,12 +63,6 @@ config_guest() {
 # Configure hot-plug
 modprobe acpiphp || true
 modprobe pci_hotplug || true
-# Configure serial console FIXME: remove during build we enable it?
-#sed -i -e "/^serial.*/d" /boot/grub/grub.conf
-#sed -i -e "/^terminal.*/d" /boot/grub/grub.conf
-#sed -i -e "/^default.*/a\serial --unit=0 --speed=115200 --parity=no 
--stop=1" /boot/grub/grub.conf
-#sed -i -e "/^serial.*/a\terminal --timeout=0 serial console" 
/boot/grub/grub.conf
-#sed -i -e "s/\(^kernel.* ro\) \(console.*\)/\1 console=tty0 
console=ttyS0,115200n8/" /boot/grub/grub.conf
 sed -i -e "/^s0:2345:respawn.*/d" /etc/inittab
 sed -i -e "/6:23:respawn/a\s0:2345:respawn:/sbin/getty -L 115200 ttyS0 
vt102" /etc/inittab
   fi
diff --git a/systemvm/patches/debian/etc/issue 
b/systemvm/patches/debian/etc/issue
index aa32be1..94e8f84 100644
--- a/systemvm/patches/debian/etc/issue
+++ b/systemvm/patches/debian/etc/issue
@@ -1,5 +1,4 @@
-   _ `.o/*  Apache CloudStack
-  (  )# d...@cloudstack.apache.org
- (___(_)https://cloudstack.apache.org
+   __?.o/  Apache CloudStack SystemVM 4.11
+  (  )#https://cloudstack.apache.org
+ (___(_)   \s \r \n \l
 
-CloudStack SystemVM 4.11 \n \l
diff --git a/systemvm/patches/debian/etc/rc.local 
b/systemvm/patches/debian/etc/rc.local
index 895c120..94c6466 100755
--- a/systemvm/patches/debian/etc/rc.local
+++ b/systemvm/patches/debian/etc/rc.local
@@ -1,45 +1,43 @@
 #!/bin/bash
-
-#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
+# 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
+#   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.
+# 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

[cloudstack] branch debian9-systemvmtemplate updated: Fix double-patching, apply iptables rules on non-VR systemvms

2017-12-04 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/debian9-systemvmtemplate by 
this push:
 new 40e2b8a  Fix double-patching, apply iptables rules on non-VR systemvms
40e2b8a is described below

commit 40e2b8abda865fcdccf7a92a0b089cd4de877b42
Author: Rohit Yadav 
AuthorDate: Mon Dec 4 23:43:15 2017 +0530

Fix double-patching, apply iptables rules on non-VR systemvms

Signed-off-by: Rohit Yadav 
---
 .../patches/debian/etc/init.d/cloud-early-config   |  9 ++--
 systemvm/patches/debian/etc/issue  |  7 ++-
 systemvm/patches/debian/etc/rc.local   | 60 +++---
 systemvm/patches/debian/opt/cloud/bin/configure.py |  4 +-
 .../patches/debian/opt/cloud/bin/cs/CsRedundant.py |  1 -
 .../patches/debian/opt/cloud/bin/setup/common.sh   | 10 +++-
 .../debian/opt/cloud/bin/setup/consoleproxy.sh |  1 -
 .../patches/debian/opt/cloud/bin/setup/dhcpsrvr.sh |  3 --
 .../patches/debian/opt/cloud/bin/setup/elbvm.sh|  1 -
 .../patches/debian/opt/cloud/bin/setup/ilbvm.sh|  1 -
 .../patches/debian/opt/cloud/bin/setup/postinit.sh | 23 -
 .../patches/debian/opt/cloud/bin/setup/router.sh   |  4 --
 .../debian/opt/cloud/bin/setup/secstorage.sh   |  1 -
 .../debian/opt/cloud/bin/setup/vpcrouter.sh|  1 -
 14 files changed, 58 insertions(+), 68 deletions(-)

diff --git a/systemvm/patches/debian/etc/init.d/cloud-early-config 
b/systemvm/patches/debian/etc/init.d/cloud-early-config
index 5e3f7b6..327ae76 100755
--- a/systemvm/patches/debian/etc/init.d/cloud-early-config
+++ b/systemvm/patches/debian/etc/init.d/cloud-early-config
@@ -30,6 +30,7 @@ 
PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
 CMDLINE=/var/cache/cloud/cmdline
 
 # Clear boot up flag, it would be created by rc.local after boot up done
+mkdir -p /var/cache/cloud
 rm -f /var/cache/cloud/boot_up_done
 
 [ -x /sbin/ifup ] || exit 0
@@ -62,12 +63,6 @@ config_guest() {
 # Configure hot-plug
 modprobe acpiphp || true
 modprobe pci_hotplug || true
-# Configure serial console FIXME: remove during build we enable it?
-#sed -i -e "/^serial.*/d" /boot/grub/grub.conf
-#sed -i -e "/^terminal.*/d" /boot/grub/grub.conf
-#sed -i -e "/^default.*/a\serial --unit=0 --speed=115200 --parity=no 
--stop=1" /boot/grub/grub.conf
-#sed -i -e "/^serial.*/a\terminal --timeout=0 serial console" 
/boot/grub/grub.conf
-#sed -i -e "s/\(^kernel.* ro\) \(console.*\)/\1 console=tty0 
console=ttyS0,115200n8/" /boot/grub/grub.conf
 sed -i -e "/^s0:2345:respawn.*/d" /etc/inittab
 sed -i -e "/6:23:respawn/a\s0:2345:respawn:/sbin/getty -L 115200 ttyS0 
vt102" /etc/inittab
   fi
@@ -195,6 +190,8 @@ patch() {
 
   log_it "Patching cloud service"
   /opt/cloud/bin/setup/patchsystemvm.sh $PATCH_MOUNT $TYPE
+
+  rm -f /var/cache/cloud/patched
 fi
 
 [ -f $privkey ] && cp -f $privkey /root/.ssh/ && chmod go-rwx 
/root/.ssh/authorized_keys
diff --git a/systemvm/patches/debian/etc/issue 
b/systemvm/patches/debian/etc/issue
index aa32be1..94e8f84 100644
--- a/systemvm/patches/debian/etc/issue
+++ b/systemvm/patches/debian/etc/issue
@@ -1,5 +1,4 @@
-   _ `.o/*  Apache CloudStack
-  (  )# d...@cloudstack.apache.org
- (___(_)https://cloudstack.apache.org
+   __?.o/  Apache CloudStack SystemVM 4.11
+  (  )#https://cloudstack.apache.org
+ (___(_)   \s \r \n \l
 
-CloudStack SystemVM 4.11 \n \l
diff --git a/systemvm/patches/debian/etc/rc.local 
b/systemvm/patches/debian/etc/rc.local
index 895c120..94c6466 100755
--- a/systemvm/patches/debian/etc/rc.local
+++ b/systemvm/patches/debian/etc/rc.local
@@ -1,45 +1,43 @@
 #!/bin/bash
-
-#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
+# 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
+#   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

[GitHub] rafaelweingartner commented on issue #2350: Cloudstack 10170 - fixes resource tags security bugs and adds account tags support

2017-12-04 Thread GitBox

rafaelweingartner commented on issue #2350: Cloudstack 10170 - fixes resource 
tags security bugs and adds account tags support
URL: https://github.com/apache/cloudstack/pull/2350#issuecomment-349046284
 
 
   Done!


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] bwsw commented on issue #2350: Cloudstack 10170 - fixes resource tags security bugs and adds account tags support

2017-12-04 Thread GitBox

bwsw commented on issue #2350: Cloudstack 10170 - fixes resource tags security 
bugs and adds account tags support
URL: https://github.com/apache/cloudstack/pull/2350#issuecomment-349045289
 
 
   @rafaelweingartner I did right now, the same dignity.


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 #2350: Cloudstack 10170 - fixes resource tags security bugs and adds account tags support

2017-12-04 Thread GitBox

rafaelweingartner commented on issue #2350: Cloudstack 10170 - fixes resource 
tags security bugs and adds account tags support
URL: https://github.com/apache/cloudstack/pull/2350#issuecomment-349044838
 
 
   You need to create an account in the Wiki as well. They are not integrated 
...


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 #2350: Cloudstack 10170 - fixes resource tags security bugs and adds account tags support

2017-12-04 Thread GitBox

rafaelweingartner commented on issue #2350: Cloudstack 10170 - fixes resource 
tags security bugs and adds account tags support
URL: https://github.com/apache/cloudstack/pull/2350#issuecomment-349044838
 
 
   You need to create an account in the Wiki as well. They are not integrated 
systems...


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] bwsw commented on issue #2350: Cloudstack 10170 - fixes resource tags security bugs and adds account tags support

2017-12-04 Thread GitBox

bwsw commented on issue #2350: Cloudstack 10170 - fixes resource tags security 
bugs and adds account tags support
URL: https://github.com/apache/cloudstack/pull/2350#issuecomment-349044535
 
 
   @rafaelweingartner if you are speaking about Jira - it's **dignity**, If I 
need to sign up for confluence separately, let me know and I'll do.


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 #2350: Cloudstack 10170 - fixes resource tags security bugs and adds account tags support

2017-12-04 Thread GitBox

rafaelweingartner commented on issue #2350: Cloudstack 10170 - fixes resource 
tags security bugs and adds account tags support
URL: https://github.com/apache/cloudstack/pull/2350#issuecomment-349042695
 
 
   @bwsw what is your user there?


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] bwsw commented on issue #2350: Cloudstack 10170 - fixes resource tags security bugs and adds account tags support

2017-12-04 Thread GitBox

bwsw commented on issue #2350: Cloudstack 10170 - fixes resource tags security 
bugs and adds account tags support
URL: https://github.com/apache/cloudstack/pull/2350#issuecomment-349041329
 
 
   @rhtyd 
   @rafaelweingartner 
   Necessary to update: 
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Resource+Tags
   Don't have rights for 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

[GitHub] bwsw commented on issue #2350: Cloudstack 10170 - fixes resource tags security bugs and adds account tags support

2017-12-04 Thread GitBox

bwsw commented on issue #2350: Cloudstack 10170 - fixes resource tags security 
bugs and adds account tags support
URL: https://github.com/apache/cloudstack/pull/2350#issuecomment-349036421
 
 
   @borisstoyanov 
   @rhtyd 
   looks like someone broke marvin classes, take a look at 
'configureHAForHost'. A lot of tests fail, nothing is connected to the code of 
PR.
   
   
   ```
   - >> end captured stdout << --
   
   ==
   ERROR: Test that listHostHAResources is returning exception when called with 
invalid data
   --
   Traceback (most recent call last):
 File "/root/cloudstack/test/integration/smoke/test_hostha_simulator.py", 
line 76, in tearDown
   raise Exception("Warning: Exception during cleanup : %s" % e)
   Exception: Warning: Exception during cleanup : 'CloudStackAPIClient' object 
has no attribute 'configureHAForHost'
   
   ==
   ERROR: Valid test for listing a specific host HA resources
   --
   Traceback (most recent call last):
 File "/root/cloudstack/test/integration/smoke/test_hostha_simulator.py", 
line 750, in test_list_ha_for_host_valid
   self.configureHaProvider()
 File "/root/cloudstack/test/integration/smoke/test_hostha_simulator.py", 
line 715, in configureHaProvider
   cmd = self.getHostHaConfigCmd(self.getHaProvider(self.getHost()))
 File "/root/cloudstack/test/integration/smoke/test_hostha_simulator.py", 
line 708, in getHaProvider
   cmd = listHostHAProviders.listHostHAProvidersCmd()
   NameError: global name 'listHostHAProviders' is not defined
    >> begin captured stdout << -
   === TestName: test_list_ha_for_host_valid | Status : EXCEPTION ===
   
   
   - >> end captured stdout << --
   
   ==
   ERROR: Valid test for listing a specific host HA resources
   --
   Traceback (most recent call last):
 File "/root/cloudstack/test/integration/smoke/test_hostha_simulator.py", 
line 76, in tearDown
   raise Exception("Warning: Exception during cleanup : %s" % e)
   Exception: Warning: Exception during cleanup : 'CloudStackAPIClient' object 
has no attribute 'configureHAForHost'
   
   --
   Ran 172 tests in 1387.803s
   ```


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] bwsw commented on issue #2350: Cloudstack 10170 - fixes resource tags security bugs and adds account tags support

2017-12-04 Thread GitBox

bwsw commented on issue #2350: Cloudstack 10170 - fixes resource tags security 
bugs and adds account tags support
URL: https://github.com/apache/cloudstack/pull/2350#issuecomment-349036421
 
 
   @borisstoyanov 
   @rhtyd 
   looks like someone damaged marvin classes, take a look at 
'configureHAForHost'. A lot of tests fail, nothing is connected to the code of 
PR.
   
   
   ```
   - >> end captured stdout << --
   
   ==
   ERROR: Test that listHostHAResources is returning exception when called with 
invalid data
   --
   Traceback (most recent call last):
 File "/root/cloudstack/test/integration/smoke/test_hostha_simulator.py", 
line 76, in tearDown
   raise Exception("Warning: Exception during cleanup : %s" % e)
   Exception: Warning: Exception during cleanup : 'CloudStackAPIClient' object 
has no attribute 'configureHAForHost'
   
   ==
   ERROR: Valid test for listing a specific host HA resources
   --
   Traceback (most recent call last):
 File "/root/cloudstack/test/integration/smoke/test_hostha_simulator.py", 
line 750, in test_list_ha_for_host_valid
   self.configureHaProvider()
 File "/root/cloudstack/test/integration/smoke/test_hostha_simulator.py", 
line 715, in configureHaProvider
   cmd = self.getHostHaConfigCmd(self.getHaProvider(self.getHost()))
 File "/root/cloudstack/test/integration/smoke/test_hostha_simulator.py", 
line 708, in getHaProvider
   cmd = listHostHAProviders.listHostHAProvidersCmd()
   NameError: global name 'listHostHAProviders' is not defined
    >> begin captured stdout << -
   === TestName: test_list_ha_for_host_valid | Status : EXCEPTION ===
   
   
   - >> end captured stdout << --
   
   ==
   ERROR: Valid test for listing a specific host HA resources
   --
   Traceback (most recent call last):
 File "/root/cloudstack/test/integration/smoke/test_hostha_simulator.py", 
line 76, in tearDown
   raise Exception("Warning: Exception during cleanup : %s" % e)
   Exception: Warning: Exception during cleanup : 'CloudStackAPIClient' object 
has no attribute 'configureHAForHost'
   
   --
   Ran 172 tests in 1387.803s
   ```


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 #2211: CLOUDSTACK-10013: Migrate systemvmtemplate to Debian9

2017-12-04 Thread GitBox

blueorangutan commented on issue #2211: CLOUDSTACK-10013: Migrate 
systemvmtemplate to Debian9
URL: https://github.com/apache/cloudstack/pull/2211#issuecomment-349005378
 
 
   Trillian test result (tid-1727)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 33092 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2211-t1727-kvm-centos7.zip
   Test /marvin/tests/smoke/test_accounts.py took 805 seconds
   Test /marvin/tests/smoke/test_affinity_groups_projects.py took 143 seconds
   Test /marvin/tests/smoke/test_affinity_groups.py took 82 seconds
   Test /marvin/tests/smoke/test_certauthority_root.py took 45 seconds
   Test /marvin/tests/smoke/test_deploy_vgpu_enabled_vm.py took 6 seconds
   Test /marvin/tests/smoke/test_deploy_virtio_scsi_vm.py took 823 seconds
   Test /marvin/tests/smoke/test_deploy_vm_iso.py took 63 seconds
   Test /marvin/tests/smoke/test_deploy_vm_root_resize.py took 83 seconds
   Test /marvin/tests/smoke/test_deploy_vms_with_varied_deploymentplanners.py 
took 119 seconds
   Test /marvin/tests/smoke/test_deploy_vm_with_userdata.py took 94 seconds
   Test /marvin/tests/smoke/test_disk_offerings.py took 7 seconds
   Test /marvin/tests/smoke/test_dynamicroles.py took 119 seconds
   Test /marvin/tests/smoke/test_global_settings.py took 7 seconds
   Test /marvin/tests/smoke/test_guest_vlan_range.py took 28 seconds
   Test /marvin/tests/smoke/test_host_annotations.py took 15 seconds
   Test /marvin/tests/smoke/test_hostha_simulator.py took 7 seconds
   Test /marvin/tests/smoke/test_host_maintenance.py took 231 seconds
   Test /marvin/tests/smoke/test_hosts.py took 7 seconds
   Test /marvin/tests/smoke/test_internal_lb.py took 1522 seconds
   Test /marvin/tests/smoke/test_iso.py took 276 seconds
   Test /marvin/tests/smoke/test_list_ids_parameter.py took 573 seconds
   Test /marvin/tests/smoke/test_loadbalance.py took 386 seconds
   Test /marvin/tests/smoke/test_login.py took 24 seconds
   Test /marvin/tests/smoke/test_metrics_api.py took 60 seconds
   Test /marvin/tests/smoke/test_multipleips_per_nic.py took 98 seconds
   Test /marvin/tests/smoke/test_nested_virtualization.py took 12 seconds
   Test /marvin/tests/smoke/test_network_acl.py took 73 seconds
   Test /marvin/tests/smoke/test_network.py took 1249 seconds
   Test /marvin/tests/smoke/test_nic_adapter_type.py took 14 seconds
   Test /marvin/tests/smoke/test_nic.py took 458 seconds
   Test /marvin/tests/smoke/test_non_contigiousvlan.py took 23 seconds
   Test /marvin/tests/smoke/test_outofbandmanagement_nestedplugin.py took 85 
seconds
   Test /marvin/tests/smoke/test_outofbandmanagement.py took 217 seconds
   Test /marvin/tests/smoke/test_over_provisioning.py took 8 seconds
   Test /marvin/tests/smoke/test_password_server.py took 175 seconds
   Test /marvin/tests/smoke/test_portable_publicip.py took 50 seconds
   Test /marvin/tests/smoke/test_portforwardingrules.py took 110 seconds
   Test /marvin/tests/smoke/test_primary_storage.py took 503 seconds
   Test /marvin/tests/smoke/test_privategw_acl.py took 617 seconds
   Test /marvin/tests/smoke/test_projects.py took 4148 seconds
   Test /marvin/tests/smoke/test_public_ip_range.py took 12 seconds
   Test /marvin/tests/smoke/test_pvlan.py took 10 seconds
   Test /marvin/tests/smoke/test_regions.py took 6 seconds
   Test /marvin/tests/smoke/test_reset_vm_on_reboot.py took 259 seconds
   Test /marvin/tests/smoke/test_resource_detail.py took 22 seconds
   Test /marvin/tests/smoke/test_router_dhcphosts.py took 339 seconds
   Test /marvin/tests/smoke/test_router_dns.py took 164 seconds
   Test /marvin/tests/smoke/test_router_dnsservice.py took 187 seconds
   Test /marvin/tests/smoke/test_routers_iptables_default_policy.py took 268 
seconds
   Test /marvin/tests/smoke/test_routers_network_ops.py took 1224 seconds
   Test /marvin/tests/smoke/test_routers.py took 3739 seconds
   Test /marvin/tests/smoke/test_scale_vm.py took 7 seconds
   Test /marvin/tests/smoke/test_secondary_storage.py took 8 seconds
   Test /marvin/tests/smoke/test_service_offerings.py took 316 seconds
   Test /marvin/tests/smoke/test_snapshots.py took 191 seconds
   Test /marvin/tests/smoke/test_ssvm.py took 320 seconds
   Test /marvin/tests/smoke/test_staticroles.py took 5 seconds
   Test /marvin/tests/smoke/test_templates.py took 1141 seconds
   Test /marvin/tests/smoke/test_usage_events.py took 5 seconds
   Test /marvin/tests/smoke/test_usage.py took 1452 seconds
   Test /marvin/tests/smoke/test_vm_life_cycle.py took 737 seconds
   Test /marvin/tests/smoke/test_vm_snapshots.py took 613 seconds
   Test /marvin/tests/smoke/test_volumes.py took 2114 seconds
   Test /marvin/tests/smoke/test_vpc_redundant.py took 863 seconds
   Test /marvin/tests/smoke/test_vpc_router_nics.py took 579 seconds
   Test /marvin/tests/smoke/test_vpc_vpn.py took 1847 seconds
   Test /marvin/tests/smoke/test_hostha_kvm.py took 1284 seconds
   Test completed. 60

[GitHub] DaanHoogland commented on issue #1709: CLOUDSTACK-7982: KVM live migration with local storage

2017-12-04 Thread GitBox

DaanHoogland commented on issue #1709: CLOUDSTACK-7982: KVM live migration with 
local storage
URL: https://github.com/apache/cloudstack/pull/1709#issuecomment-349016175
 
 
   @ustcweizhou @marcaurele will the implementations for local storage and 
shared storage be conflicting?
   @ustcweizhou could you share your implementation? or insights on differences?


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 #2350: Cloudstack 10170 - fixes resource tags security bugs and adds account tags support

2017-12-04 Thread GitBox

rafaelweingartner commented on a change in pull request #2350: Cloudstack 10170 
- fixes resource tags security bugs and adds account tags support
URL: https://github.com/apache/cloudstack/pull/2350#discussion_r154693537
 
 

 ##
 File path: server/src/com/cloud/tags/TaggedResourceManagerImpl.java
 ##
 @@ -276,83 +300,76 @@ public void 
doInTransactionWithoutResult(TransactionStatus status) {
 return resourceTags;
 }
 
-@Override
-public String getUuid(String resourceId, ResourceObjectType resourceType) {
-if (!StringUtils.isNumeric(resourceId)) {
-return resourceId;
-}
-
-Class clazz = s_typeMap.get(resourceType);
-
-Object entity = _entityMgr.findById(clazz, resourceId);
-if (entity != null && entity instanceof Identity) {
-return ((Identity)entity).getUuid();
-   }
-
-   return resourceId;
-   }
-
-@Override
-@DB
-@ActionEvent(eventType = EventTypes.EVENT_TAGS_DELETE, eventDescription = 
"deleting resource tags")
-public boolean deleteTags(List resourceIds, ResourceObjectType 
resourceType, Map tags) {
-Account caller = CallContext.current().getCallingAccount();
-
+private List searchResourceTags(List 
resourceIds, ResourceObjectType resourceType) {
 SearchBuilder sb = 
_resourceTagDao.createSearchBuilder();
-sb.and().op("resourceId", sb.entity().getResourceId(), 
SearchCriteria.Op.IN);
-sb.or("resourceUuid", sb.entity().getResourceUuid(), 
SearchCriteria.Op.IN);
-sb.cp();
+sb.and("resourceUuid", sb.entity().getResourceUuid(), 
SearchCriteria.Op.IN);
 sb.and("resourceType", sb.entity().getResourceType(), 
SearchCriteria.Op.EQ);
 
 SearchCriteria sc = sb.create();
-sc.setParameters("resourceId", resourceIds.toArray());
 sc.setParameters("resourceUuid", resourceIds.toArray());
 sc.setParameters("resourceType", resourceType);
+return _resourceTagDao.search(sc, null);
+}
 
-List resourceTags = _resourceTagDao.search(sc, 
null);
-;
-final List tagsToRemove = new ArrayList();
+@Override
+@DB
+@ActionEvent(eventType = EventTypes.EVENT_TAGS_DELETE, eventDescription = 
"deleting resource tags")
+public boolean deleteTags(List resourceIds, ResourceObjectType 
resourceType, Map tags) {
+Account caller = CallContext.current().getCallingAccount();
+if(s_logger.isDebugEnabled()) {
+s_logger.debug("ResourceIds to Find " + String.join(", ", 
resourceIds));
+}
+List resourceTags = 
searchResourceTags(resourceIds, resourceType);
+final List tagsToDelete = new ArrayList<>();
 
 // Finalize which tags should be removed
 for (ResourceTag resourceTag : resourceTags) {
 //1) validate the permissions
+if(s_logger.isDebugEnabled()) {
+s_logger.debug("Resource Tag Id: " + 
resourceTag.getResourceId());
+s_logger.debug("Resource Tag AccountId: " + 
resourceTag.getAccountId());
+}
 Account owner = _accountMgr.getAccount(resourceTag.getAccountId());
+if(s_logger.isDebugEnabled()) {
+s_logger.debug("Resource Owner: " + owner);
+}
 _accountMgr.checkAccess(caller, null, false, owner);
 //2) Only remove tag if it matches key value pairs
 if (tags != null && !tags.isEmpty()) {
 
 Review comment:
   My bad, I did not check the type of the object `tags`. You can use 
`org.apache.commons.collections.MapUtils.isEmpty(Map)` 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

[GitHub] rafaelweingartner commented on a change in pull request #2350: Cloudstack 10170 - fixes resource tags security bugs and adds account tags support

2017-12-04 Thread GitBox

rafaelweingartner commented on a change in pull request #2350: Cloudstack 10170 
- fixes resource tags security bugs and adds account tags support
URL: https://github.com/apache/cloudstack/pull/2350#discussion_r154691457
 
 

 ##
 File path: server/src/com/cloud/tags/TaggedResourceManagerImpl.java
 ##
 @@ -276,83 +300,76 @@ public void 
doInTransactionWithoutResult(TransactionStatus status) {
 return resourceTags;
 }
 
-@Override
-public String getUuid(String resourceId, ResourceObjectType resourceType) {
-if (!StringUtils.isNumeric(resourceId)) {
-return resourceId;
-}
-
-Class clazz = s_typeMap.get(resourceType);
-
-Object entity = _entityMgr.findById(clazz, resourceId);
-if (entity != null && entity instanceof Identity) {
-return ((Identity)entity).getUuid();
-   }
-
-   return resourceId;
-   }
-
-@Override
-@DB
-@ActionEvent(eventType = EventTypes.EVENT_TAGS_DELETE, eventDescription = 
"deleting resource tags")
-public boolean deleteTags(List resourceIds, ResourceObjectType 
resourceType, Map tags) {
-Account caller = CallContext.current().getCallingAccount();
-
+private List searchResourceTags(List 
resourceIds, ResourceObjectType resourceType) {
 SearchBuilder sb = 
_resourceTagDao.createSearchBuilder();
-sb.and().op("resourceId", sb.entity().getResourceId(), 
SearchCriteria.Op.IN);
-sb.or("resourceUuid", sb.entity().getResourceUuid(), 
SearchCriteria.Op.IN);
-sb.cp();
+sb.and("resourceUuid", sb.entity().getResourceUuid(), 
SearchCriteria.Op.IN);
 sb.and("resourceType", sb.entity().getResourceType(), 
SearchCriteria.Op.EQ);
 
 SearchCriteria sc = sb.create();
-sc.setParameters("resourceId", resourceIds.toArray());
 sc.setParameters("resourceUuid", resourceIds.toArray());
 sc.setParameters("resourceType", resourceType);
+return _resourceTagDao.search(sc, null);
+}
 
-List resourceTags = _resourceTagDao.search(sc, 
null);
-;
-final List tagsToRemove = new ArrayList();
+@Override
+@DB
+@ActionEvent(eventType = EventTypes.EVENT_TAGS_DELETE, eventDescription = 
"deleting resource tags")
+public boolean deleteTags(List resourceIds, ResourceObjectType 
resourceType, Map tags) {
+Account caller = CallContext.current().getCallingAccount();
+if(s_logger.isDebugEnabled()) {
+s_logger.debug("ResourceIds to Find " + String.join(", ", 
resourceIds));
+}
+List resourceTags = 
searchResourceTags(resourceIds, resourceType);
+final List tagsToDelete = new ArrayList<>();
 
 // Finalize which tags should be removed
 for (ResourceTag resourceTag : resourceTags) {
 //1) validate the permissions
+if(s_logger.isDebugEnabled()) {
+s_logger.debug("Resource Tag Id: " + 
resourceTag.getResourceId());
+s_logger.debug("Resource Tag AccountId: " + 
resourceTag.getAccountId());
+}
 Account owner = _accountMgr.getAccount(resourceTag.getAccountId());
+if(s_logger.isDebugEnabled()) {
+s_logger.debug("Resource Owner: " + owner);
+}
 _accountMgr.checkAccess(caller, null, false, owner);
 //2) Only remove tag if it matches key value pairs
 if (tags != null && !tags.isEmpty()) {
 for (String key : tags.keySet()) {
-boolean canBeRemoved = false;
+boolean deleteTag = false;
 if (resourceTag.getKey().equalsIgnoreCase(key)) {
 String value = tags.get(key);
 if (value != null) {
 
 Review comment:
   No problem, it is ok the way it is ;)
   
   When I mentioned I also was in doubt, because of the data that we are 
dealing with (it is not obvious what we are dealing with). 


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 #2211: CLOUDSTACK-10013: Migrate systemvmtemplate to Debian9

2017-12-04 Thread GitBox

blueorangutan commented on issue #2211: CLOUDSTACK-10013: Migrate 
systemvmtemplate to Debian9
URL: https://github.com/apache/cloudstack/pull/2211#issuecomment-349005378
 
 
   Trillian test result (tid-1727)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 33092 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2211-t1727-kvm-centos7.zip
   Test /marvin/tests/smoke/test_accounts.py took 805 seconds
   Test /marvin/tests/smoke/test_affinity_groups_projects.py took 143 seconds
   Test /marvin/tests/smoke/test_affinity_groups.py took 82 seconds
   Test /marvin/tests/smoke/test_certauthority_root.py took 45 seconds
   Test /marvin/tests/smoke/test_deploy_vgpu_enabled_vm.py took 6 seconds
   Test /marvin/tests/smoke/test_deploy_virtio_scsi_vm.py took 823 seconds
   Test /marvin/tests/smoke/test_deploy_vm_iso.py took 63 seconds
   Test /marvin/tests/smoke/test_deploy_vm_root_resize.py took 83 seconds
   Test /marvin/tests/smoke/test_deploy_vms_with_varied_deploymentplanners.py 
took 119 seconds
   Test /marvin/tests/smoke/test_deploy_vm_with_userdata.py took 94 seconds
   Test /marvin/tests/smoke/test_disk_offerings.py took 7 seconds
   Test /marvin/tests/smoke/test_dynamicroles.py took 119 seconds
   Test /marvin/tests/smoke/test_global_settings.py took 7 seconds
   Test /marvin/tests/smoke/test_guest_vlan_range.py took 28 seconds
   Test /marvin/tests/smoke/test_host_annotations.py took 15 seconds
   Test /marvin/tests/smoke/test_hostha_simulator.py took 7 seconds
   Test /marvin/tests/smoke/test_host_maintenance.py took 231 seconds
   Test /marvin/tests/smoke/test_hosts.py took 7 seconds
   Test /marvin/tests/smoke/test_internal_lb.py took 1522 seconds
   Test /marvin/tests/smoke/test_iso.py took 276 seconds
   Test /marvin/tests/smoke/test_list_ids_parameter.py took 573 seconds
   Test /marvin/tests/smoke/test_loadbalance.py took 386 seconds
   Test /marvin/tests/smoke/test_login.py took 24 seconds
   Test /marvin/tests/smoke/test_metrics_api.py took 60 seconds
   Test /marvin/tests/smoke/test_multipleips_per_nic.py took 98 seconds
   Test /marvin/tests/smoke/test_nested_virtualization.py took 12 seconds
   Test /marvin/tests/smoke/test_network_acl.py took 73 seconds
   Test /marvin/tests/smoke/test_network.py took 1249 seconds
   Test /marvin/tests/smoke/test_nic_adapter_type.py took 14 seconds
   Test /marvin/tests/smoke/test_nic.py took 458 seconds
   Test /marvin/tests/smoke/test_non_contigiousvlan.py took 23 seconds
   Test /marvin/tests/smoke/test_outofbandmanagement_nestedplugin.py took 85 
seconds
   Test /marvin/tests/smoke/test_outofbandmanagement.py took 217 seconds
   Test /marvin/tests/smoke/test_over_provisioning.py took 8 seconds
   Test /marvin/tests/smoke/test_password_server.py took 175 seconds
   Test /marvin/tests/smoke/test_portable_publicip.py took 50 seconds
   Test /marvin/tests/smoke/test_portforwardingrules.py took 110 seconds
   Test /marvin/tests/smoke/test_primary_storage.py took 503 seconds
   Test /marvin/tests/smoke/test_privategw_acl.py took 617 seconds
   Test /marvin/tests/smoke/test_projects.py took 4148 seconds
   Test /marvin/tests/smoke/test_public_ip_range.py took 12 seconds
   Test /marvin/tests/smoke/test_pvlan.py took 10 seconds
   Test /marvin/tests/smoke/test_regions.py took 6 seconds
   Test /marvin/tests/smoke/test_reset_vm_on_reboot.py took 259 seconds
   Test /marvin/tests/smoke/test_resource_detail.py took 22 seconds
   Test /marvin/tests/smoke/test_router_dhcphosts.py took 339 seconds
   Test /marvin/tests/smoke/test_router_dns.py took 164 seconds
   Test /marvin/tests/smoke/test_router_dnsservice.py took 187 seconds
   Test /marvin/tests/smoke/test_routers_iptables_default_policy.py took 268 
seconds
   Test /marvin/tests/smoke/test_routers_network_ops.py took 1224 seconds
   Test /marvin/tests/smoke/test_routers.py took 3739 seconds
   Test /marvin/tests/smoke/test_scale_vm.py took 7 seconds
   Test /marvin/tests/smoke/test_secondary_storage.py took 8 seconds
   Test /marvin/tests/smoke/test_service_offerings.py took 316 seconds
   Test /marvin/tests/smoke/test_snapshots.py took 191 seconds
   Test /marvin/tests/smoke/test_ssvm.py took 320 seconds
   Test /marvin/tests/smoke/test_staticroles.py took 5 seconds
   Test /marvin/tests/smoke/test_templates.py took 1141 seconds
   Test /marvin/tests/smoke/test_usage_events.py took 5 seconds
   Test /marvin/tests/smoke/test_usage.py took 1452 seconds
   Test /marvin/tests/smoke/test_vm_life_cycle.py took 737 seconds
   Test /marvin/tests/smoke/test_vm_snapshots.py took 613 seconds
   Test /marvin/tests/smoke/test_volumes.py took 2114 seconds
   Test /marvin/tests/smoke/test_vpc_redundant.py took 863 seconds
   Test /marvin/tests/smoke/test_vpc_router_nics.py took 579 seconds
   Test /marvin/tests/smoke/test_vpc_vpn.py took 1847 seconds
   Test /marvin/tests/smoke/test_hostha_kvm.py took 1284 seconds
   Test completed. 60

[GitHub] bwsw commented on a change in pull request #2350: Cloudstack 10170 - fixes resource tags security bugs and adds account tags support

2017-12-04 Thread GitBox

bwsw commented on a change in pull request #2350: Cloudstack 10170 - fixes 
resource tags security bugs and adds account tags support
URL: https://github.com/apache/cloudstack/pull/2350#discussion_r154687261
 
 

 ##
 File path: server/src/com/cloud/tags/TaggedResourceManagerImpl.java
 ##
 @@ -276,83 +300,76 @@ public void 
doInTransactionWithoutResult(TransactionStatus status) {
 return resourceTags;
 }
 
-@Override
-public String getUuid(String resourceId, ResourceObjectType resourceType) {
-if (!StringUtils.isNumeric(resourceId)) {
-return resourceId;
-}
-
-Class clazz = s_typeMap.get(resourceType);
-
-Object entity = _entityMgr.findById(clazz, resourceId);
-if (entity != null && entity instanceof Identity) {
-return ((Identity)entity).getUuid();
-   }
-
-   return resourceId;
-   }
-
-@Override
-@DB
-@ActionEvent(eventType = EventTypes.EVENT_TAGS_DELETE, eventDescription = 
"deleting resource tags")
-public boolean deleteTags(List resourceIds, ResourceObjectType 
resourceType, Map tags) {
-Account caller = CallContext.current().getCallingAccount();
-
+private List searchResourceTags(List 
resourceIds, ResourceObjectType resourceType) {
 SearchBuilder sb = 
_resourceTagDao.createSearchBuilder();
-sb.and().op("resourceId", sb.entity().getResourceId(), 
SearchCriteria.Op.IN);
-sb.or("resourceUuid", sb.entity().getResourceUuid(), 
SearchCriteria.Op.IN);
-sb.cp();
+sb.and("resourceUuid", sb.entity().getResourceUuid(), 
SearchCriteria.Op.IN);
 sb.and("resourceType", sb.entity().getResourceType(), 
SearchCriteria.Op.EQ);
 
 SearchCriteria sc = sb.create();
-sc.setParameters("resourceId", resourceIds.toArray());
 sc.setParameters("resourceUuid", resourceIds.toArray());
 sc.setParameters("resourceType", resourceType);
+return _resourceTagDao.search(sc, null);
+}
 
-List resourceTags = _resourceTagDao.search(sc, 
null);
-;
-final List tagsToRemove = new ArrayList();
+@Override
+@DB
+@ActionEvent(eventType = EventTypes.EVENT_TAGS_DELETE, eventDescription = 
"deleting resource tags")
+public boolean deleteTags(List resourceIds, ResourceObjectType 
resourceType, Map tags) {
+Account caller = CallContext.current().getCallingAccount();
+if(s_logger.isDebugEnabled()) {
+s_logger.debug("ResourceIds to Find " + String.join(", ", 
resourceIds));
+}
+List resourceTags = 
searchResourceTags(resourceIds, resourceType);
+final List tagsToDelete = new ArrayList<>();
 
 // Finalize which tags should be removed
 for (ResourceTag resourceTag : resourceTags) {
 //1) validate the permissions
+if(s_logger.isDebugEnabled()) {
+s_logger.debug("Resource Tag Id: " + 
resourceTag.getResourceId());
+s_logger.debug("Resource Tag AccountId: " + 
resourceTag.getAccountId());
+}
 Account owner = _accountMgr.getAccount(resourceTag.getAccountId());
+if(s_logger.isDebugEnabled()) {
+s_logger.debug("Resource Owner: " + owner);
+}
 _accountMgr.checkAccess(caller, null, false, owner);
 //2) Only remove tag if it matches key value pairs
 if (tags != null && !tags.isEmpty()) {
 
 Review comment:
   tags is incompatible with CollectionUtils.isEmpty. Ignore this hint.


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] bwsw commented on a change in pull request #2350: Cloudstack 10170 - fixes resource tags security bugs and adds account tags support

2017-12-04 Thread GitBox

bwsw commented on a change in pull request #2350: Cloudstack 10170 - fixes 
resource tags security bugs and adds account tags support
URL: https://github.com/apache/cloudstack/pull/2350#discussion_r154687147
 
 

 ##
 File path: server/src/com/cloud/tags/TaggedResourceManagerImpl.java
 ##
 @@ -204,11 +206,27 @@ public long getResourceId(String resourceId, 
ResourceObjectType resourceType) {
 accountId = Account.ACCOUNT_ID_SYSTEM;
 }
 
-if ((domainId == null) || ((accountId != null) && 
(domainId.longValue() == -1)))
+if (domainId == null || domainId == -1)
 {
 domainId = _accountDao.getDomainIdForGivenAccountId(accountId);
 }
-return new Pair(accountId, domainId);
+return new Pair<>(accountId, domainId);
+}
+
+private void checkResourceAccessible(Long accountId, Long domainId, String 
exceptionMessage) {
+Account caller = CallContext.current().getCallingAccount();
+if ((domainId != null) && (domainId == -1))
 
 Review comment:
   @rafaelweingartner this looks good. Fixed.


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] bwsw commented on a change in pull request #2350: Cloudstack 10170 - fixes resource tags security bugs and adds account tags support

2017-12-04 Thread GitBox

bwsw commented on a change in pull request #2350: Cloudstack 10170 - fixes 
resource tags security bugs and adds account tags support
URL: https://github.com/apache/cloudstack/pull/2350#discussion_r154679724
 
 

 ##
 File path: server/src/com/cloud/tags/TaggedResourceManagerImpl.java
 ##
 @@ -276,83 +300,76 @@ public void 
doInTransactionWithoutResult(TransactionStatus status) {
 return resourceTags;
 }
 
-@Override
-public String getUuid(String resourceId, ResourceObjectType resourceType) {
-if (!StringUtils.isNumeric(resourceId)) {
-return resourceId;
-}
-
-Class clazz = s_typeMap.get(resourceType);
-
-Object entity = _entityMgr.findById(clazz, resourceId);
-if (entity != null && entity instanceof Identity) {
-return ((Identity)entity).getUuid();
-   }
-
-   return resourceId;
-   }
-
-@Override
-@DB
-@ActionEvent(eventType = EventTypes.EVENT_TAGS_DELETE, eventDescription = 
"deleting resource tags")
-public boolean deleteTags(List resourceIds, ResourceObjectType 
resourceType, Map tags) {
-Account caller = CallContext.current().getCallingAccount();
-
+private List searchResourceTags(List 
resourceIds, ResourceObjectType resourceType) {
 SearchBuilder sb = 
_resourceTagDao.createSearchBuilder();
-sb.and().op("resourceId", sb.entity().getResourceId(), 
SearchCriteria.Op.IN);
-sb.or("resourceUuid", sb.entity().getResourceUuid(), 
SearchCriteria.Op.IN);
-sb.cp();
+sb.and("resourceUuid", sb.entity().getResourceUuid(), 
SearchCriteria.Op.IN);
 sb.and("resourceType", sb.entity().getResourceType(), 
SearchCriteria.Op.EQ);
 
 SearchCriteria sc = sb.create();
-sc.setParameters("resourceId", resourceIds.toArray());
 sc.setParameters("resourceUuid", resourceIds.toArray());
 sc.setParameters("resourceType", resourceType);
+return _resourceTagDao.search(sc, null);
+}
 
-List resourceTags = _resourceTagDao.search(sc, 
null);
-;
-final List tagsToRemove = new ArrayList();
+@Override
+@DB
+@ActionEvent(eventType = EventTypes.EVENT_TAGS_DELETE, eventDescription = 
"deleting resource tags")
+public boolean deleteTags(List resourceIds, ResourceObjectType 
resourceType, Map tags) {
+Account caller = CallContext.current().getCallingAccount();
+if(s_logger.isDebugEnabled()) {
+s_logger.debug("ResourceIds to Find " + String.join(", ", 
resourceIds));
+}
+List resourceTags = 
searchResourceTags(resourceIds, resourceType);
+final List tagsToDelete = new ArrayList<>();
 
 // Finalize which tags should be removed
 for (ResourceTag resourceTag : resourceTags) {
 //1) validate the permissions
+if(s_logger.isDebugEnabled()) {
+s_logger.debug("Resource Tag Id: " + 
resourceTag.getResourceId());
+s_logger.debug("Resource Tag AccountId: " + 
resourceTag.getAccountId());
+}
 Account owner = _accountMgr.getAccount(resourceTag.getAccountId());
+if(s_logger.isDebugEnabled()) {
+s_logger.debug("Resource Owner: " + owner);
+}
 _accountMgr.checkAccess(caller, null, false, owner);
 //2) Only remove tag if it matches key value pairs
 if (tags != null && !tags.isEmpty()) {
 for (String key : tags.keySet()) {
-boolean canBeRemoved = false;
+boolean deleteTag = false;
 if (resourceTag.getKey().equalsIgnoreCase(key)) {
 String value = tags.get(key);
 if (value != null) {
 
 Review comment:
   @rafaelweingartner Actually, when I'm looking at the proposed code, I find 
is less obvious than current one. As I see, you prefer more discrete logic 
approach, but a lot of people feel difficult reading these things. I would like 
to avoid changing this code, because it makes it less expressive.


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 #2350: Cloudstack 10170 - fixes resource tags security bugs and adds account tags support

2017-12-04 Thread GitBox

rafaelweingartner commented on a change in pull request #2350: Cloudstack 10170 
- fixes resource tags security bugs and adds account tags support
URL: https://github.com/apache/cloudstack/pull/2350#discussion_r154626017
 
 

 ##
 File path: server/src/com/cloud/tags/TaggedResourceManagerImpl.java
 ##
 @@ -276,83 +300,76 @@ public void 
doInTransactionWithoutResult(TransactionStatus status) {
 return resourceTags;
 }
 
-@Override
-public String getUuid(String resourceId, ResourceObjectType resourceType) {
-if (!StringUtils.isNumeric(resourceId)) {
-return resourceId;
-}
-
-Class clazz = s_typeMap.get(resourceType);
-
-Object entity = _entityMgr.findById(clazz, resourceId);
-if (entity != null && entity instanceof Identity) {
-return ((Identity)entity).getUuid();
-   }
-
-   return resourceId;
-   }
-
-@Override
-@DB
-@ActionEvent(eventType = EventTypes.EVENT_TAGS_DELETE, eventDescription = 
"deleting resource tags")
-public boolean deleteTags(List resourceIds, ResourceObjectType 
resourceType, Map tags) {
-Account caller = CallContext.current().getCallingAccount();
-
+private List searchResourceTags(List 
resourceIds, ResourceObjectType resourceType) {
 SearchBuilder sb = 
_resourceTagDao.createSearchBuilder();
-sb.and().op("resourceId", sb.entity().getResourceId(), 
SearchCriteria.Op.IN);
-sb.or("resourceUuid", sb.entity().getResourceUuid(), 
SearchCriteria.Op.IN);
-sb.cp();
+sb.and("resourceUuid", sb.entity().getResourceUuid(), 
SearchCriteria.Op.IN);
 sb.and("resourceType", sb.entity().getResourceType(), 
SearchCriteria.Op.EQ);
 
 SearchCriteria sc = sb.create();
-sc.setParameters("resourceId", resourceIds.toArray());
 sc.setParameters("resourceUuid", resourceIds.toArray());
 sc.setParameters("resourceType", resourceType);
+return _resourceTagDao.search(sc, null);
+}
 
-List resourceTags = _resourceTagDao.search(sc, 
null);
-;
-final List tagsToRemove = new ArrayList();
+@Override
+@DB
+@ActionEvent(eventType = EventTypes.EVENT_TAGS_DELETE, eventDescription = 
"deleting resource tags")
+public boolean deleteTags(List resourceIds, ResourceObjectType 
resourceType, Map tags) {
+Account caller = CallContext.current().getCallingAccount();
+if(s_logger.isDebugEnabled()) {
+s_logger.debug("ResourceIds to Find " + String.join(", ", 
resourceIds));
+}
+List resourceTags = 
searchResourceTags(resourceIds, resourceType);
+final List tagsToDelete = new ArrayList<>();
 
 // Finalize which tags should be removed
 for (ResourceTag resourceTag : resourceTags) {
 //1) validate the permissions
+if(s_logger.isDebugEnabled()) {
+s_logger.debug("Resource Tag Id: " + 
resourceTag.getResourceId());
+s_logger.debug("Resource Tag AccountId: " + 
resourceTag.getAccountId());
+}
 Account owner = _accountMgr.getAccount(resourceTag.getAccountId());
+if(s_logger.isDebugEnabled()) {
+s_logger.debug("Resource Owner: " + owner);
+}
 _accountMgr.checkAccess(caller, null, false, owner);
 //2) Only remove tag if it matches key value pairs
 if (tags != null && !tags.isEmpty()) {
 
 Review comment:
   @bwsw do not worry if you are not comfortable ;)
   It was only a suggestion, but I believe it is always good to find these type 
of structure and try to improve them. 


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] bwsw commented on a change in pull request #2350: Cloudstack 10170 - fixes resource tags security bugs and adds account tags support

2017-12-04 Thread GitBox

bwsw commented on a change in pull request #2350: Cloudstack 10170 - fixes 
resource tags security bugs and adds account tags support
URL: https://github.com/apache/cloudstack/pull/2350#discussion_r154625411
 
 

 ##
 File path: server/src/com/cloud/tags/TaggedResourceManagerImpl.java
 ##
 @@ -276,83 +300,76 @@ public void 
doInTransactionWithoutResult(TransactionStatus status) {
 return resourceTags;
 }
 
-@Override
-public String getUuid(String resourceId, ResourceObjectType resourceType) {
-if (!StringUtils.isNumeric(resourceId)) {
-return resourceId;
-}
-
-Class clazz = s_typeMap.get(resourceType);
-
-Object entity = _entityMgr.findById(clazz, resourceId);
-if (entity != null && entity instanceof Identity) {
-return ((Identity)entity).getUuid();
-   }
-
-   return resourceId;
-   }
-
-@Override
-@DB
-@ActionEvent(eventType = EventTypes.EVENT_TAGS_DELETE, eventDescription = 
"deleting resource tags")
-public boolean deleteTags(List resourceIds, ResourceObjectType 
resourceType, Map tags) {
-Account caller = CallContext.current().getCallingAccount();
-
+private List searchResourceTags(List 
resourceIds, ResourceObjectType resourceType) {
 SearchBuilder sb = 
_resourceTagDao.createSearchBuilder();
-sb.and().op("resourceId", sb.entity().getResourceId(), 
SearchCriteria.Op.IN);
-sb.or("resourceUuid", sb.entity().getResourceUuid(), 
SearchCriteria.Op.IN);
-sb.cp();
+sb.and("resourceUuid", sb.entity().getResourceUuid(), 
SearchCriteria.Op.IN);
 sb.and("resourceType", sb.entity().getResourceType(), 
SearchCriteria.Op.EQ);
 
 SearchCriteria sc = sb.create();
-sc.setParameters("resourceId", resourceIds.toArray());
 sc.setParameters("resourceUuid", resourceIds.toArray());
 sc.setParameters("resourceType", resourceType);
+return _resourceTagDao.search(sc, null);
+}
 
-List resourceTags = _resourceTagDao.search(sc, 
null);
-;
-final List tagsToRemove = new ArrayList();
+@Override
+@DB
+@ActionEvent(eventType = EventTypes.EVENT_TAGS_DELETE, eventDescription = 
"deleting resource tags")
+public boolean deleteTags(List resourceIds, ResourceObjectType 
resourceType, Map tags) {
+Account caller = CallContext.current().getCallingAccount();
+if(s_logger.isDebugEnabled()) {
+s_logger.debug("ResourceIds to Find " + String.join(", ", 
resourceIds));
+}
+List resourceTags = 
searchResourceTags(resourceIds, resourceType);
+final List tagsToDelete = new ArrayList<>();
 
 // Finalize which tags should be removed
 for (ResourceTag resourceTag : resourceTags) {
 //1) validate the permissions
+if(s_logger.isDebugEnabled()) {
+s_logger.debug("Resource Tag Id: " + 
resourceTag.getResourceId());
+s_logger.debug("Resource Tag AccountId: " + 
resourceTag.getAccountId());
+}
 Account owner = _accountMgr.getAccount(resourceTag.getAccountId());
+if(s_logger.isDebugEnabled()) {
+s_logger.debug("Resource Owner: " + owner);
+}
 _accountMgr.checkAccess(caller, null, false, owner);
 //2) Only remove tag if it matches key value pairs
 if (tags != null && !tags.isEmpty()) {
 
 Review comment:
   @rafaelweingartner ok, i'll fix that, just tried to keep the logic untouched 
where possible but, ok.


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 #2350: Cloudstack 10170 - fixes resource tags security bugs and adds account tags support

2017-12-04 Thread GitBox

rafaelweingartner commented on a change in pull request #2350: Cloudstack 10170 
- fixes resource tags security bugs and adds account tags support
URL: https://github.com/apache/cloudstack/pull/2350#discussion_r154620417
 
 

 ##
 File path: server/src/com/cloud/tags/TaggedResourceManagerImpl.java
 ##
 @@ -276,83 +300,76 @@ public void 
doInTransactionWithoutResult(TransactionStatus status) {
 return resourceTags;
 }
 
-@Override
-public String getUuid(String resourceId, ResourceObjectType resourceType) {
-if (!StringUtils.isNumeric(resourceId)) {
-return resourceId;
-}
-
-Class clazz = s_typeMap.get(resourceType);
-
-Object entity = _entityMgr.findById(clazz, resourceId);
-if (entity != null && entity instanceof Identity) {
-return ((Identity)entity).getUuid();
-   }
-
-   return resourceId;
-   }
-
-@Override
-@DB
-@ActionEvent(eventType = EventTypes.EVENT_TAGS_DELETE, eventDescription = 
"deleting resource tags")
-public boolean deleteTags(List resourceIds, ResourceObjectType 
resourceType, Map tags) {
-Account caller = CallContext.current().getCallingAccount();
-
+private List searchResourceTags(List 
resourceIds, ResourceObjectType resourceType) {
 SearchBuilder sb = 
_resourceTagDao.createSearchBuilder();
-sb.and().op("resourceId", sb.entity().getResourceId(), 
SearchCriteria.Op.IN);
-sb.or("resourceUuid", sb.entity().getResourceUuid(), 
SearchCriteria.Op.IN);
-sb.cp();
+sb.and("resourceUuid", sb.entity().getResourceUuid(), 
SearchCriteria.Op.IN);
 sb.and("resourceType", sb.entity().getResourceType(), 
SearchCriteria.Op.EQ);
 
 SearchCriteria sc = sb.create();
-sc.setParameters("resourceId", resourceIds.toArray());
 sc.setParameters("resourceUuid", resourceIds.toArray());
 sc.setParameters("resourceType", resourceType);
+return _resourceTagDao.search(sc, null);
+}
 
-List resourceTags = _resourceTagDao.search(sc, 
null);
-;
-final List tagsToRemove = new ArrayList();
+@Override
+@DB
+@ActionEvent(eventType = EventTypes.EVENT_TAGS_DELETE, eventDescription = 
"deleting resource tags")
+public boolean deleteTags(List resourceIds, ResourceObjectType 
resourceType, Map tags) {
+Account caller = CallContext.current().getCallingAccount();
+if(s_logger.isDebugEnabled()) {
+s_logger.debug("ResourceIds to Find " + String.join(", ", 
resourceIds));
+}
+List resourceTags = 
searchResourceTags(resourceIds, resourceType);
+final List tagsToDelete = new ArrayList<>();
 
 // Finalize which tags should be removed
 for (ResourceTag resourceTag : resourceTags) {
 //1) validate the permissions
+if(s_logger.isDebugEnabled()) {
+s_logger.debug("Resource Tag Id: " + 
resourceTag.getResourceId());
+s_logger.debug("Resource Tag AccountId: " + 
resourceTag.getAccountId());
+}
 Account owner = _accountMgr.getAccount(resourceTag.getAccountId());
+if(s_logger.isDebugEnabled()) {
+s_logger.debug("Resource Owner: " + owner);
+}
 _accountMgr.checkAccess(caller, null, false, owner);
 //2) Only remove tag if it matches key value pairs
 if (tags != null && !tags.isEmpty()) {
 
 Review comment:
   What about using 
`org.apache.commons.collections.CollectionUtils.isEmpty(Collection)` here?
   
   Also, what about inverting this conditional?
   If `tags` is not empty, we can then use the code at line 357. Then, we can 
use a `continue` command to for a loop. This would enable to shift the code at 
lines 339-355 out of a conditional scope.


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 #2350: Cloudstack 10170 - fixes resource tags security bugs and adds account tags support

2017-12-04 Thread GitBox

rafaelweingartner commented on a change in pull request #2350: Cloudstack 10170 
- fixes resource tags security bugs and adds account tags support
URL: https://github.com/apache/cloudstack/pull/2350#discussion_r154618432
 
 

 ##
 File path: server/src/com/cloud/tags/TaggedResourceManagerImpl.java
 ##
 @@ -204,11 +206,27 @@ public long getResourceId(String resourceId, 
ResourceObjectType resourceType) {
 accountId = Account.ACCOUNT_ID_SYSTEM;
 }
 
-if ((domainId == null) || ((accountId != null) && 
(domainId.longValue() == -1)))
+if (domainId == null || domainId == -1)
 {
 domainId = _accountDao.getDomainIdForGivenAccountId(accountId);
 }
-return new Pair(accountId, domainId);
+return new Pair<>(accountId, domainId);
+}
+
+private void checkResourceAccessible(Long accountId, Long domainId, String 
exceptionMessage) {
+Account caller = CallContext.current().getCallingAccount();
+if ((domainId != null) && (domainId == -1))
 
 Review comment:
   What about using java.util.Objects.equals(Object, Object) here? Then we do 
not need this `domainId != null`.


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 #2350: Cloudstack 10170 - fixes resource tags security bugs and adds account tags support

2017-12-04 Thread GitBox

rafaelweingartner commented on a change in pull request #2350: Cloudstack 10170 
- fixes resource tags security bugs and adds account tags support
URL: https://github.com/apache/cloudstack/pull/2350#discussion_r154621634
 
 

 ##
 File path: server/src/com/cloud/tags/TaggedResourceManagerImpl.java
 ##
 @@ -276,83 +300,76 @@ public void 
doInTransactionWithoutResult(TransactionStatus status) {
 return resourceTags;
 }
 
-@Override
-public String getUuid(String resourceId, ResourceObjectType resourceType) {
-if (!StringUtils.isNumeric(resourceId)) {
-return resourceId;
-}
-
-Class clazz = s_typeMap.get(resourceType);
-
-Object entity = _entityMgr.findById(clazz, resourceId);
-if (entity != null && entity instanceof Identity) {
-return ((Identity)entity).getUuid();
-   }
-
-   return resourceId;
-   }
-
-@Override
-@DB
-@ActionEvent(eventType = EventTypes.EVENT_TAGS_DELETE, eventDescription = 
"deleting resource tags")
-public boolean deleteTags(List resourceIds, ResourceObjectType 
resourceType, Map tags) {
-Account caller = CallContext.current().getCallingAccount();
-
+private List searchResourceTags(List 
resourceIds, ResourceObjectType resourceType) {
 SearchBuilder sb = 
_resourceTagDao.createSearchBuilder();
-sb.and().op("resourceId", sb.entity().getResourceId(), 
SearchCriteria.Op.IN);
-sb.or("resourceUuid", sb.entity().getResourceUuid(), 
SearchCriteria.Op.IN);
-sb.cp();
+sb.and("resourceUuid", sb.entity().getResourceUuid(), 
SearchCriteria.Op.IN);
 sb.and("resourceType", sb.entity().getResourceType(), 
SearchCriteria.Op.EQ);
 
 SearchCriteria sc = sb.create();
-sc.setParameters("resourceId", resourceIds.toArray());
 sc.setParameters("resourceUuid", resourceIds.toArray());
 sc.setParameters("resourceType", resourceType);
+return _resourceTagDao.search(sc, null);
+}
 
-List resourceTags = _resourceTagDao.search(sc, 
null);
-;
-final List tagsToRemove = new ArrayList();
+@Override
+@DB
+@ActionEvent(eventType = EventTypes.EVENT_TAGS_DELETE, eventDescription = 
"deleting resource tags")
+public boolean deleteTags(List resourceIds, ResourceObjectType 
resourceType, Map tags) {
+Account caller = CallContext.current().getCallingAccount();
+if(s_logger.isDebugEnabled()) {
+s_logger.debug("ResourceIds to Find " + String.join(", ", 
resourceIds));
+}
+List resourceTags = 
searchResourceTags(resourceIds, resourceType);
+final List tagsToDelete = new ArrayList<>();
 
 // Finalize which tags should be removed
 for (ResourceTag resourceTag : resourceTags) {
 //1) validate the permissions
+if(s_logger.isDebugEnabled()) {
+s_logger.debug("Resource Tag Id: " + 
resourceTag.getResourceId());
+s_logger.debug("Resource Tag AccountId: " + 
resourceTag.getAccountId());
+}
 Account owner = _accountMgr.getAccount(resourceTag.getAccountId());
+if(s_logger.isDebugEnabled()) {
+s_logger.debug("Resource Owner: " + owner);
+}
 _accountMgr.checkAccess(caller, null, false, owner);
 //2) Only remove tag if it matches key value pairs
 if (tags != null && !tags.isEmpty()) {
 for (String key : tags.keySet()) {
-boolean canBeRemoved = false;
+boolean deleteTag = false;
 if (resourceTag.getKey().equalsIgnoreCase(key)) {
 String value = tags.get(key);
 if (value != null) {
 
 Review comment:
   What about changing lines 343- 349 to something like this:
   `deleteTag  = value == null || 
resourceTag.getValue().equalsIgnoreCase(value)`


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] bwsw commented on issue #905: BUG-ID: CLOUDSTACK-8922: Unable to delete IP tag

2017-12-04 Thread GitBox

bwsw commented on issue #905: BUG-ID: CLOUDSTACK-8922:  Unable to delete IP tag
URL: https://github.com/apache/cloudstack/pull/905#issuecomment-348921053
 
 
   @rafaelweingartner @yvsubhash Take a look at 
   https://github.com/apache/cloudstack/pull/2350
   


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] bwsw opened a new pull request #2350: Cloudstack 10170 - fixes resource tags security bugs and adds account tag support

2017-12-04 Thread GitBox

bwsw opened a new pull request #2350: Cloudstack 10170 - fixes resource tags 
security bugs and adds account tag support
URL: https://github.com/apache/cloudstack/pull/2350
 
 
   Reference to JIRA: https://issues.apache.org/jira/browse/CLOUDSTACK-10170
   @rafaelweingartner take a look, we discussed 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] rhtyd commented on issue #2211: CLOUDSTACK-10013: Migrate systemvmtemplate to Debian9

2017-12-04 Thread GitBox

rhtyd commented on issue #2211: CLOUDSTACK-10013: Migrate systemvmtemplate to 
Debian9
URL: https://github.com/apache/cloudstack/pull/2211#issuecomment-348918856
 
 
   I still have to fix private gateway and rVR tests on KVM. Rest tests are 
passing now. Travis job now also run unit tests for systemvm/python  code and 
runs pylint etc. Once the tests are satisfactory, I'll move to xenserver and 
vmware and repeat the same.


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 #2211: CLOUDSTACK-10013: Migrate systemvmtemplate to Debian9

2017-12-04 Thread GitBox

rhtyd commented on issue #2211: CLOUDSTACK-10013: Migrate systemvmtemplate to 
Debian9
URL: https://github.com/apache/cloudstack/pull/2211#issuecomment-348918421
 
 
   @wido I'll upload fresh systemvmtemplates soon, the kvm one is downloadable 
here 
http://hydra.yadav.xyz/systemvm64template-debian9-systemvmtemplate-4.11.0-kvm.qcow2.bz2


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] wido commented on issue #2211: CLOUDSTACK-10013: Migrate systemvmtemplate to Debian9

2017-12-04 Thread GitBox

wido commented on issue #2211: CLOUDSTACK-10013: Migrate systemvmtemplate to 
Debian9
URL: https://github.com/apache/cloudstack/pull/2211#issuecomment-348917894
 
 
   Very nice @rhtyd !
   
   For easy access, is there a CI job somewhere which builds this SSVM image? 
This would allow users to simply download it without needing to build 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 #2318: [4.9] Smoketest health checkrun baseline

2017-12-04 Thread GitBox

blueorangutan commented on issue #2318: [4.9] Smoketest health checkrun baseline
URL: https://github.com/apache/cloudstack/pull/2318#issuecomment-348914383
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1338


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 #2318: [4.9] Smoketest health checkrun baseline

2017-12-04 Thread GitBox

blueorangutan commented on issue #2318: [4.9] Smoketest health checkrun baseline
URL: https://github.com/apache/cloudstack/pull/2318#issuecomment-348910993
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1337


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 #2318: [4.9] Smoketest health checkrun baseline

2017-12-04 Thread GitBox

blueorangutan commented on issue #2318: [4.9] Smoketest health checkrun baseline
URL: https://github.com/apache/cloudstack/pull/2318#issuecomment-348902806
 
 
   @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] borisstoyanov commented on issue #2318: [4.9] Smoketest health checkrun baseline

2017-12-04 Thread GitBox

borisstoyanov commented on issue #2318: [4.9] Smoketest health checkrun baseline
URL: https://github.com/apache/cloudstack/pull/2318#issuecomment-348902600
 
 
   @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] borisstoyanov commented on issue #2318: [4.9] Smoketest health checkrun baseline

2017-12-04 Thread GitBox

borisstoyanov commented on issue #2318: [4.9] Smoketest health checkrun baseline
URL: https://github.com/apache/cloudstack/pull/2318#issuecomment-348900885
 
 
   yes, sorry got the wrong PR, will undo shortly


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 #2318: [4.9] Smoketest health checkrun baseline

2017-12-04 Thread GitBox

rhtyd commented on issue #2318: [4.9] Smoketest health checkrun baseline
URL: https://github.com/apache/cloudstack/pull/2318#issuecomment-348899109
 
 
   @borisstoyanov don't rebase 4.9 against master, this PR/smoketests are 
intended for 4.9 branch only. For master branch, see #2289. Kindly, undo your 
changes on this branch/PR. You may also, create a new PR/branch to test your 
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] rhtyd commented on issue #2318: [4.9] Smoketest health checkrun baseline

2017-12-04 Thread GitBox

rhtyd commented on issue #2318: [4.9] Smoketest health checkrun baseline
URL: https://github.com/apache/cloudstack/pull/2318#issuecomment-348899109
 
 
   @borisstoyanov don't rebase 4.9 against master, this PR/smoketests are 
intended for 4.9 branch only. For master branch, see #2289. Kindly, undo your 
changes on this branch/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] rhtyd commented on issue #2318: [4.9] Smoketest health checkrun baseline

2017-12-04 Thread GitBox

rhtyd commented on issue #2318: [4.9] Smoketest health checkrun baseline
URL: https://github.com/apache/cloudstack/pull/2318#issuecomment-348899109
 
 
   @borisstoyanov don't rebase 4.9 against master, this PR/smoketests are 
intended for 4.9 branch only. For master branch, see #2289 


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 #2318: [4.9] Smoketest health checkrun baseline

2017-12-04 Thread GitBox

borisstoyanov commented on issue #2318: [4.9] Smoketest health checkrun baseline
URL: https://github.com/apache/cloudstack/pull/2318#issuecomment-348896647
 
 
   I've rebased and pushed in order to get latest master, will rebuild and 
trigger new 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] blueorangutan commented on issue #2318: [4.9] Smoketest health checkrun baseline

2017-12-04 Thread GitBox

blueorangutan commented on issue #2318: [4.9] Smoketest health checkrun baseline
URL: https://github.com/apache/cloudstack/pull/2318#issuecomment-348897923
 
 
   @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] borisstoyanov commented on issue #2318: [4.9] Smoketest health checkrun baseline

2017-12-04 Thread GitBox

borisstoyanov commented on issue #2318: [4.9] Smoketest health checkrun baseline
URL: https://github.com/apache/cloudstack/pull/2318#issuecomment-348897792
 
 
   @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] borisstoyanov commented on issue #2301: CLOUDSTACK-10121 moveUser

2017-12-04 Thread GitBox

borisstoyanov commented on issue #2301: CLOUDSTACK-10121 moveUser
URL: https://github.com/apache/cloudstack/pull/2301#issuecomment-348897469
 
 
   @DaanHoogland I think I've wrote a test for this, after your rebase I don't 
see my commit, is it possible that it's lost somehow?


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 #2318: [4.9] Smoketest health checkrun baseline

2017-12-04 Thread GitBox

borisstoyanov commented on issue #2318: [4.9] Smoketest health checkrun baseline
URL: https://github.com/apache/cloudstack/pull/2318#issuecomment-348896647
 
 
   I've rebased and pushed in order to get latest master, will rebuild and 
trigger new tests. 
   @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 #1762: CLOUDSTACK-9595 Transactions are not getting retried in case of datab?

2017-12-04 Thread GitBox

rafaelweingartner commented on issue #1762: CLOUDSTACK-9595 Transactions are 
not getting retried in case of datab?
URL: https://github.com/apache/cloudstack/pull/1762#issuecomment-348893472
 
 
   @yvsubhash thanks for the feedback. 
   I have the same feeling, too much code to handle transactions. One way to 
avoid this is to use proper JPA implementations, which have transaction 
management out of the box. It would even be better to use JPA implementation 
with a framework like Spring data.


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] 02/02: avoid restarting networking again

2017-12-04 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 666921905fa492646ed3471a93cbb9d340de86a3
Author: Rohit Yadav 
AuthorDate: Mon Dec 4 13:57:02 2017 +0530

avoid restarting networking again

Signed-off-by: Rohit Yadav 
---
 systemvm/patches/debian/opt/cloud/bin/setup/postinit.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/systemvm/patches/debian/opt/cloud/bin/setup/postinit.sh 
b/systemvm/patches/debian/opt/cloud/bin/setup/postinit.sh
index 58a3ecc..8149d2d 100755
--- a/systemvm/patches/debian/opt/cloud/bin/setup/postinit.sh
+++ b/systemvm/patches/debian/opt/cloud/bin/setup/postinit.sh
@@ -26,6 +26,5 @@ then
   then
   /opt/cloud/bin/update_config.py cmd_line.json
   logger -t cloud "Updated config: cmd_line.json"
-  systemctl restart networking
   fi
 fi

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

[cloudstack] 01/02: deployment of dc/cluster/hosts already validates this, this test does not run and therefore could be removed

2017-12-04 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 1544150886fc9859ddb86d91bb94beec3782c6d9
Author: Rohit Yadav 
AuthorDate: Mon Dec 4 13:56:29 2017 +0530

deployment of dc/cluster/hosts already validates this, this test does not
run and therefore could be removed

Signed-off-by: Rohit Yadav 
---
 .travis.yml  |   1 -
 test/integration/smoke/test_hosts.py | 170 ---
 2 files changed, 171 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ee52d9e..b46865a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,7 +50,6 @@ env:
  smoke/test_hostha_simulator
  smoke/test_host_annotations
  smoke/test_host_maintenance
- smoke/test_hosts
  smoke/test_internal_lb
  smoke/test_iso
  smoke/test_list_ids_parameter
diff --git a/test/integration/smoke/test_hosts.py 
b/test/integration/smoke/test_hosts.py
deleted file mode 100644
index 952f160..000
--- a/test/integration/smoke/test_hosts.py
+++ /dev/null
@@ -1,170 +0,0 @@
-# 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.
-""" BVT tests for Hosts and Clusters
-"""
-#Import Local Modules
-import marvin
-from marvin.cloudstackTestCase import *
-from marvin.cloudstackAPI import *
-from marvin.lib.utils import *
-from marvin.lib.base import *
-from marvin.lib.common import *
-from marvin.lib.utils import (random_gen)
-from nose.plugins.attrib import attr
-
-#Import System modules
-import time
-
-_multiprocess_shared_ = True
-
-class TestHosts(cloudstackTestCase):
-
-def setUp(self):
-self.apiclient = self.testClient.getApiClient()
-self.hypervisor = self.testClient.getHypervisorInfo()
-self.dbclient = self.testClient.getDbConnection()
-self.services = self.testClient.getParsedTestDataConfig()
-self.zone = get_zone(self.apiclient, self.testClient.getZoneForTests())
-self.pod = get_pod(self.apiclient, self.zone.id)
-self.cleanup = []
-
-return
-
-def tearDown(self):
-try:
-#Clean up, terminate the created templates
-cleanup_resources(self.apiclient, self.cleanup)
-
-except Exception as e:
-raise Exception("Warning: Exception during cleanup : %s" % e)
-return
-
-#@attr(tags=["selfservice"])
-def test_01_clusters(self):
-"""Test Add clusters & hosts - simulator
-
-
-# Validate the following:
-# 1. Verify hypervisortype returned by API is Simulator/Xen/KVM/VWare
-# 2. Verify that the cluster is in 'Enabled' allocation state
-# 3. Verify that the host is added successfully and in Up state
-#with listHosts API response
-
-#Create clusters with Hypervisor type Simulator/XEN/KVM/VWare
-"""
-for k, v in self.services["clusters"].items():
-v["clustername"] = v["clustername"] + "-" + random_gen()
-cluster = Cluster.create(
- self.apiclient,
- v,
- zoneid=self.zone.id,
- podid=self.pod.id,
- hypervisor=v["hypervisor"].lower()
- )
-self.debug(
-"Created Cluster for hypervisor type %s & ID: %s" %(
-
v["hypervisor"],
-cluster.id
-))
-self.assertEqual(
-cluster.hypervisortype.lower(),
-v["hypervisor"].lower(),
-"Check hypervisor type is " + v["hypervisor"] + " or not"
-)
-self.assertEqual(
-cluster.allocationstate,
-'Enabled',
-"Check whether allocation state

[cloudstack] branch debian9-systemvmtemplate updated (9d2c7d3 -> 6669219)

2017-12-04 Thread bhaisaab

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a change to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


from 9d2c7d3  More fixes
 new 1544150  deployment of dc/cluster/hosts already validates this, this 
test does not run and therefore could be removed
 new 6669219  avoid restarting networking again

The 2 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:
 .travis.yml|   1 -
 .../patches/debian/opt/cloud/bin/setup/postinit.sh |   1 -
 test/integration/smoke/test_hosts.py   | 170 -
 3 files changed, 172 deletions(-)
 delete mode 100644 test/integration/smoke/test_hosts.py

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" '].

[GitHub] blueorangutan commented on issue #2301: CLOUDSTACK-10121 moveUser

2017-12-04 Thread GitBox

blueorangutan commented on issue #2301: CLOUDSTACK-10121 moveUser
URL: https://github.com/apache/cloudstack/pull/2301#issuecomment-348892092
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1336


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 #2299: CLOUDSTACK-10118 Domain level settings

2017-12-04 Thread GitBox

DaanHoogland commented on issue #2299: CLOUDSTACK-10118 Domain level settings
URL: https://github.com/apache/cloudstack/pull/2299#issuecomment-348889846
 
 
   @rhtyd i will rebase but this change is structural for the ldap changes I am 
doing and does not have any merrit on it's own. It is here to keep an eye on 
integration. Marking it with WIP


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

64 matches

Mail list logo