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

[GitBox]

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


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

[GitBox]

blueorangutan commented on issue #2211: CLOUDSTACK-10013: Migrate 
systemvmtemplate to Debian9
URL: https://github.com/apache/cloudstack/pull/2211#issuecomment-351827424
 
 
   Trillian test result (tid-1783)
   Environment: vmware-55u3 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 116746 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2211-t1783-vmware-55u3.zip
   Test completed. Failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_00_deploy_vm_root_resize | `Error` | 5.66 | 
test_deploy_vm_root_resize.py
   ContextSuite context=TestDeployVmRootSize>:teardown | `Error` | 0.11 | 
test_deploy_vm_root_resize.py
   test_02_internallb_roundrobin_1RVPC_3VM_HTTP_port80 | `Error` | 4451.04 | 
test_internal_lb.py
   test_02_internallb_roundrobin_1RVPC_3VM_HTTP_port80 | `Error` | 4486.68 | 
test_internal_lb.py
   test_04_rvpc_internallb_haproxy_stats_on_all_interfaces | `Error` | 600.79 | 
test_internal_lb.py
   test_04_rvpc_privategw_static_routes | `Failure` | 2459.19 | 
test_privategw_acl.py
   test_04_rvpc_privategw_static_routes | `Error` | 4263.10 | 
test_privategw_acl.py
   test_05_stop_ssvm | `Failure` | 931.55 | test_ssvm.py
   test_06_stop_cpvm | `Failure` | 948.15 | test_ssvm.py
   test_07_reboot_ssvm | `Error` | 918.17 | test_ssvm.py
   test_08_reboot_cpvm | `Failure` | 0.04 | test_ssvm.py
   test_09_destroy_ssvm | `Error` | 25.73 | test_ssvm.py
   test_10_destroy_cpvm | `Error` | 1028.56 | test_ssvm.py
   test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL | `Error` | 4416.15 | 
test_vpc_redundant.py
   test_02_redundant_VPC_default_routes | `Error` | 7568.24 | 
test_vpc_redundant.py
   test_02_redundant_VPC_default_routes | `Error` | 11178.69 | 
test_vpc_redundant.py
   test_04_rvpc_network_garbage_collector_nics | `Failure` | 1199.26 | 
test_vpc_redundant.py
   test_05_rvpc_multi_tiers | `Failure` | 4032.73 | test_vpc_redundant.py
   test_05_rvpc_multi_tiers | `Error` | 7643.69 | test_vpc_redundant.py
   test_01_VPC_nics_after_destroy | `Error` | 195.74 | test_vpc_router_nics.py
   test_02_VPC_default_routes | `Failure` | 4233.71 | test_vpc_router_nics.py
   test_01_redundant_vpc_site2site_vpn | `Failure` | 3623.95 | test_vpc_vpn.py
   ContextSuite context=TestRVPCSite2SiteVpn>:teardown | `Error` | 3629.59 | 
test_vpc_vpn.py
   test_01_vpc_site2site_vpn_multiple_options | `Failure` | 6272.61 | 
test_vpc_vpn.py
   ContextSuite context=TestVPCSite2SiteVPNMultipleOptions>:teardown | `Error` 
| 6283.27 | test_vpc_vpn.py
   test_01_vpc_remote_access_vpn | `Failure` | 3615.12 | test_vpc_vpn.py
   test_01_vpc_site2site_vpn | `Failure` | 3614.45 | test_vpc_vpn.py
   ContextSuite context=TestVpcSite2SiteVpn>:teardown | `Error` | 3625.08 | 
test_vpc_vpn.py
   test_01_cancel_host_maintenace_with_no_migration_jobs | `Failure` | 3663.52 
| test_host_maintenance.py
   test_02_cancel_host_maintenace_with_migration_jobs | `Error` | 265.72 | 
test_host_maintenance.py
   
   
   Manual test run on VMware 6.5:
   ```
   test_ssvm.py
   Test List secondary storage VMs ... === TestName: 
test_01_list_sec_storage_vm | Status : SUCCESS ===
   ok
   Test List console proxy VMs ... === TestName: test_02_list_cpvm_vm | Status 
: SUCCESS ===
   ok
   Test SSVM Internals ... === TestName: test_03_ssvm_internals | Status : 
SUCCESS ===
   ok
   Test CPVM Internals ... === TestName: test_04_cpvm_internals | Status : 
SUCCESS ===
   ok
   Test stop SSVM ... === TestName: test_05_stop_ssvm | Status : SUCCESS ===
   ok
   Test stop CPVM ... === TestName: test_06_stop_cpvm | Status : SUCCESS ===
   ok
   Test reboot SSVM ... === TestName: test_07_reboot_ssvm | Status : SUCCESS ===
   ok
   Test reboot CPVM ... === TestName: test_08_reboot_cpvm | Status : SUCCESS ===
   ok
   Test destroy SSVM ... === TestName: test_09_destroy_ssvm | Status : SUCCESS 
===
   ok
   Test destroy CPVM ... === TestName: test_10_destroy_cpvm | Status : SUCCESS 
===
   ok
   Test NFS Version on Secondary Storage mounted properly on SSVM ... SKIP: No 
NFS version provided in test data
   Ran 11 tests in 506.313s
   OK (SKIP=1)
   
   ```


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] 29/34: rm rc.local!

[rohit]

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

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

commit e8314a04bbca761dd178f2454eec13e74ad8de0d
Author: Rohit Yadav 
AuthorDate: Wed Dec 13 01:42:05 2017 +0530

rm rc.local!

Signed-off-by: Rohit Yadav 
---
 systemvm/debian/etc/rc.local | 19 ---
 1 file changed, 19 deletions(-)

diff --git a/systemvm/debian/etc/rc.local b/systemvm/debian/etc/rc.local
deleted file mode 100755
index e419de0..000
--- a/systemvm/debian/etc/rc.local
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/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.
-
-

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

[cloudstack] 17/34: fix simulator build

[rohit]

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

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

commit daa55ae63fd4e05c55414147d50ea70e424a7795
Author: Rohit Yadav 
AuthorDate: Mon Dec 11 02:51:17 2017 +0530

fix simulator build

Signed-off-by: Rohit Yadav 
---
 tools/marvin/marvin/lib/common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/marvin/marvin/lib/common.py 
b/tools/marvin/marvin/lib/common.py
index 32abda7..64182d9 100644
--- a/tools/marvin/marvin/lib/common.py
+++ b/tools/marvin/marvin/lib/common.py
@@ -401,7 +401,7 @@ def get_test_template(apiclient, zone_id=None, 
hypervisor=None):
 "format": "vhd",
 "hypervisor": "simulator",
 "ostype": "Other Linux (64-bit)",
-"url": "http://fake.url/tiny.vhd.bz2;,
+"url": 
"http://dl.openvm.eu/cloudstack/macchinina/x86_64/macchinina-xen.vhd.bz2;,
 "requireshvm": "True",
 "ispublic": "True"
 }

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

[cloudstack] 16/34: refactor tests, introduce a new get_test_template that returns a small testing template such as macchinina etc.

[rohit]

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

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

commit 83b5e1e6b755b4b84e3ccbe721bd298dce9f4271
Author: Rohit Yadav 
AuthorDate: Mon Dec 11 02:09:46 2017 +0530

refactor tests, introduce a new get_test_template that returns a small 
testing template such as macchinina etc.

Signed-off-by: Rohit Yadav 
---
 .../smoke/test_deploy_vm_with_userdata.py  | 11 +--
 ...st_deploy_vms_with_varied_deploymentplanners.py |  9 +-
 test/integration/smoke/test_internal_lb.py | 53 ++--
 test/integration/smoke/test_loadbalance.py | 10 +--
 test/integration/smoke/test_metrics_api.py |  4 +-
 test/integration/smoke/test_multipleips_per_nic.py |  7 +-
 test/integration/smoke/test_network_acl.py |  9 +-
 test/integration/smoke/test_nic_adapter_type.py|  6 +-
 test/integration/smoke/test_password_server.py |  7 +-
 test/integration/smoke/test_portforwardingrules.py |  6 +-
 test/integration/smoke/test_privategw_acl.py   |  7 +-
 test/integration/smoke/test_router_dns.py  | 11 ++-
 test/integration/smoke/test_router_dnsservice.py   | 11 +--
 test/integration/smoke/test_routers.py | 12 ++-
 .../smoke/test_routers_iptables_default_policy.py  | 15 ++--
 test/integration/smoke/test_routers_network_ops.py | 71 ++--
 test/integration/smoke/test_service_offerings.py   |  9 +-
 test/integration/smoke/test_snapshots.py   | 65 +--
 test/integration/smoke/test_vpc_redundant.py   | 55 ++---
 test/integration/smoke/test_vpc_vpn.py | 92 ++---
 .../definitions/systemvmtemplate/cleanup.sh|  1 -
 tools/marvin/marvin/lib/base.py|  7 +-
 tools/marvin/marvin/lib/common.py  | 95 ++
 23 files changed, 203 insertions(+), 370 deletions(-)

diff --git a/test/integration/smoke/test_deploy_vm_with_userdata.py 
b/test/integration/smoke/test_deploy_vm_with_userdata.py
index 96c9986..52b71f7 100644
--- a/test/integration/smoke/test_deploy_vm_with_userdata.py
+++ b/test/integration/smoke/test_deploy_vm_with_userdata.py
@@ -19,7 +19,7 @@ from marvin.cloudstackTestCase import cloudstackTestCase
 from marvin.lib.base import (ServiceOffering,
  VirtualMachine,
  Account)
-from marvin.lib.common import get_template, get_zone, list_virtual_machines
+from marvin.lib.common import get_test_template, get_zone, 
list_virtual_machines
 from marvin.lib.utils import cleanup_resources
 from nose.plugins.attrib import attr
 from marvin.codes import FAILED
@@ -37,6 +37,7 @@ class TestDeployVmWithUserData(cloudstackTestCase):
 cls.services = testClient.getParsedTestDataConfig()
 
 cls.zone = get_zone(cls.apiClient, testClient.getZoneForTests())
+cls.hypervisor = testClient.getHypervisorInfo()
 if cls.zone.localstorageenabled:
 #For devcloud since localstroage is enabled
 cls.services["service_offerings"]["tiny"]["storagetype"] = "local"
@@ -46,14 +47,14 @@ class TestDeployVmWithUserData(cloudstackTestCase):
 )
 cls.account = Account.create(cls.apiClient, 
services=cls.services["account"])
 cls.cleanup = [cls.account]
-cls.template = get_template(
+cls.template = get_test_template(
 cls.apiClient,
 cls.zone.id,
-cls.services["ostype"]
+cls.hypervisor
 )
 
 if cls.template == FAILED:
-assert False, "get_template() failed to return template with 
description %s" % cls.services["ostype"]
+assert False, "get_test_template() failed to return template"
 
 cls.debug("Successfully created account: %s, id: \
%s" % (cls.account.name,\
@@ -68,7 +69,7 @@ class TestDeployVmWithUserData(cloudstackTestCase):
 cls.services["virtual_machine"]["userdata"] = user_data
 
 def setup(self):
-self.hypervisor = self.testClient.getHypervisorInfo()
+self.hypervisor = self.testClient.getHypervisorInfo()
 
 @attr(tags=["devcloud", "basic", "advanced", "post"], 
required_hardware="true")
 def test_deployvm_userdata_post(self):
diff --git 
a/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py 
b/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
index 1ef6af9..62ba1a4 100644
--- a/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
+++ b/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
@@ -18,7 +18,7 @@
 from marvin.codes import FAILED
 from marvin.cloudstackTestCase import cloudstackTestCase
 from marvin.lib.base import Account, VirtualMachine, ServiceOffering, Host, 
Cluster

[cloudstack] 06/34: CLOUDSTACK-10129: UX improvements and event timeline

[rohit]

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

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

commit 5882244faa839e2d8482639e8d74d030a2c35162
Author: Rohit Yadav 
AuthorDate: Tue Nov 28 19:25:09 2017 +0530

CLOUDSTACK-10129: UX improvements and event timeline

- Fixes timezone issue where dates show up as nvalid in UI
- Introduces new event timeline listing/filtering of events
- Several UI improvements to add columns in list views
- Bulk operations support in instance list view to shutdown and destroy
  multiple-selected VMs (limitation: after operation, redundant entries
  may show up in the list view, refreshing VM list view fixes that)
- Align table thead/tbody to avoid splitting of tables

Signed-off-by: Rohit Yadav 
---
 .../org/apache/cloudstack/api/ApiConstants.java|   2 +
 .../api/command/user/event/ListEventsCmd.java  |   7 +
 .../cloudstack/api/response/EventResponse.java |   2 +-
 .../schema/src/com/cloud/user/UserAccountVO.java   |   4 +
 engine/schema/src/com/cloud/user/UserVO.java   |   4 +
 .../src/com/cloud/api/query/QueryManagerImpl.java  |  10 +-
 ui/css/cloudstack3.css |   3 +-
 ui/l10n/en.js  |   3 +
 ui/scripts/events.js   |  20 +-
 ui/scripts/instances.js| 275 -
 ui/scripts/metrics.js  |  13 +-
 ui/scripts/network.js  |  51 +++-
 ui/scripts/sharedFunctions.js  |   2 +-
 ui/scripts/storage.js  |  30 ++-
 ui/scripts/system.js   | 112 +++--
 ui/scripts/templates.js|  27 ++
 ui/scripts/ui/widgets/dataTable.js |  13 +-
 17 files changed, 412 insertions(+), 166 deletions(-)

diff --git a/api/src/org/apache/cloudstack/api/ApiConstants.java 
b/api/src/org/apache/cloudstack/api/ApiConstants.java
index a5bd95f..89deeef 100644
--- a/api/src/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/org/apache/cloudstack/api/ApiConstants.java
@@ -205,6 +205,7 @@ public class ApiConstants {
 public static final String OUTOFBANDMANAGEMENT_POWERSTATE = 
"outofbandmanagementpowerstate";
 public static final String OUTOFBANDMANAGEMENT_ENABLED = 
"outofbandmanagementenabled";
 public static final String PARAMS = "params";
+public static final String PARENT_ID = "parentid";
 public static final String PARENT_DOMAIN_ID = "parentdomainid";
 public static final String PASSWORD = "password";
 public static final String SHOULD_UPDATE_PASSWORD = 
"update_passwd_on_host";
@@ -274,6 +275,7 @@ public class ApiConstants {
 public static final String SNAPSHOT_QUIESCEVM = "quiescevm";
 public static final String SOURCE_ZONE_ID = "sourcezoneid";
 public static final String START_DATE = "startdate";
+public static final String START_ID = "startid";
 public static final String START_IP = "startip";
 public static final String START_IPV6 = "startipv6";
 public static final String START_PORT = "startport";
diff --git 
a/api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java 
b/api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java
index a4934fa..b98c308 100644
--- a/api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java
@@ -65,6 +65,9 @@ public class ListEventsCmd extends 
BaseListProjectAndAccountResourcesCmd {
 @Parameter(name = ApiConstants.TYPE, type = CommandType.STRING, 
description = "the event type (see event types)")
 private String type;
 
+@Parameter(name = ApiConstants.START_ID, type = CommandType.UUID, 
entityType = EventResponse.class, description = "the parent/start ID of the 
event, when provided this will list all the events with the start/parent ID 
including the parent event")
+private Long startId;
+
 /
 /// Accessors ///
 /
@@ -97,6 +100,10 @@ public class ListEventsCmd extends 
BaseListProjectAndAccountResourcesCmd {
 return type;
 }
 
+public Long getStartId() {
+return startId;
+}
+
 /
 /// API Implementation///
 /
diff --git a/api/src/org/apache/cloudstack/api/response/EventResponse.java 
b/api/src/org/apache/cloudstack/api/response/EventResponse.java
index 5ce66ed..da15434 100644
--- a/api/src/org/apache/cloudstack/api/response/EventResponse.java
+++ 

[cloudstack] 01/34: CLOUDSTACK-10013: Migrate systemvmtemplate to Debian9

[rohit]

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

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

commit c72ca39e9a592c7afffa44c71a0ee530692c73c9
Author: Rohit Yadav 
AuthorDate: Sun Jul 23 18:01:35 2017 +0200

CLOUDSTACK-10013: Migrate systemvmtemplate to Debian9

  SystemVM changes to work on Debian 9
- Migrate away from chkconfig to systemctl
- Remove xenstore-utils override deb pkg
- Fix runlevel in sysv scripts for systemd

Signed-off-by: Rohit Yadav 
---
 systemvm/patches/debian/buildsystemvm.sh   | 577 -
 systemvm/patches/debian/config/etc/init.d/cloud|  10 +-
 .../debian/config/etc/init.d/cloud-early-config|  23 +-
 .../debian/config/etc/init.d/cloud-passwd-srvr |  10 +-
 systemvm/patches/debian/config/etc/init.d/postinit |   6 +-
 systemvm/patches/debian/config/etc/rc.local|   2 +-
 systemvm/patches/debian/config/etc/ssh/sshd_config |   1 -
 .../debian/config/opt/cloud/bin/patchsystemvm.sh   | 128 ++---
 tools/appliance/build.sh   |   2 +-
 .../definitions/systemvmtemplate/apt_upgrade.sh|   9 +-
 .../systemvmtemplate/authorized_keys.sh|   1 +
 .../definitions/systemvmtemplate/build_time.sh |  26 -
 .../definitions/systemvmtemplate/cleanup.sh|   1 -
 .../definitions/systemvmtemplate/configure_grub.sh |   6 +-
 .../systemvmtemplate/configure_login.sh|  15 +-
 .../systemvmtemplate/configure_networking.sh   |  25 +-
 .../configure_systemvm_services.sh |  94 +++-
 .../definitions/systemvmtemplate/definition.rb |  36 +-
 .../systemvmtemplate/install_systemvm_packages.sh  |  32 +-
 .../definitions/systemvmtemplate/preseed.cfg   |  69 ++-
 .../definitions/systemvmtemplate/zerodisk.sh   |   9 +-
 21 files changed, 267 insertions(+), 815 deletions(-)

diff --git a/systemvm/patches/debian/buildsystemvm.sh 
b/systemvm/patches/debian/buildsystemvm.sh
deleted file mode 100755
index a34b1dd..000
--- a/systemvm/patches/debian/buildsystemvm.sh
+++ /dev/null
@@ -1,577 +0,0 @@
-#!/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.
-
-echo ""
-echo " Note there is a new systemvm build script based on "
-echo " Veewee(Vagrant) under tools/appliance."
-echo ""
-
-set -e
-set -x
-
-IMAGENAME=systemvm
-LOCATION=/var/lib/images/systemvm
-PASSWORD=password
-#APT_PROXY=192.168.1.115:3142/
-APT_PROXY=
-HOSTNAME=systemvm
-SIZE=2000
-DEBIAN_MIRROR=ftp.us.debian.org/debian
-MINIMIZE=true
-CLOUDSTACK_RELEASE=4.0
-offset=4096
-baseimage() {
-  mkdir -p $LOCATION
-  #dd if=/dev/zero of=$IMAGELOC bs=1M  count=$SIZE
-  dd if=/dev/zero of=$IMAGELOC bs=1M seek=$((SIZE - 1)) count=1
-  loopdev=$(losetup -f)
-  losetup $loopdev $IMAGELOC
-  parted $loopdev -s 'mklabel msdos'
-  parted $loopdev -s 'mkpart primary ext3 4096B -1'
-  sleep 2 
-  losetup -d $loopdev
-  loopdev=$(losetup --show -o $offset -f $IMAGELOC )
-  mkfs.ext3  -L ROOT $loopdev
-  mkdir -p $MOUNTPOINT
-  tune2fs -c 100 -i 0 $loopdev
-  sleep 2 
-  losetup -d $loopdev
-  
-  mount -o loop,offset=$offset $IMAGELOC  $MOUNTPOINT
-  
-  #debootstrap --variant=minbase 
--keyring=/usr/share/keyrings/debian-archive-keyring.gpg wheezy $MOUNTPOINT 
http://${APT_PROXY}${DEBIAN_MIRROR}
-  debootstrap --variant=minbase --arch=i386 wheezy $MOUNTPOINT 
http://${APT_PROXY}${DEBIAN_MIRROR}
-}
-
-
-fixapt() {
-  if [ "$APT_PROXY" != "" ]; then
-  cat >> etc/apt/apt.conf.d/01proxy << EOF
-Acquire::http::Proxy "http://${APT_PROXY};;
-EOF
-  fi
-
-  cat > etc/apt/sources.list << EOF
-deb http://http.debian.net/debian/ wheezy main contrib non-free
-deb-src http://http.debian.net/debian/ wheezy main contrib non-free
-
-deb http://security.debian.org/ wheezy/updates main
-deb-src http://security.debian.org/ wheezy/updates main
-
-deb http://http.debian.net/debian/ wheezy-backports main
-deb-src http://http.debian.net/debian/ wheezy-backports main
-EOF
-
-  cat >> etc/apt/apt.conf << EOF
-APT::Default-Release "stable"; 

[cloudstack] 27/34: fixes

[rohit]

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

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

commit cbaca700f8bfd3bf8bde181826b909dfaf1211f5
Author: Rohit Yadav 
AuthorDate: Wed Dec 13 00:26:27 2017 +0530

fixes

Signed-off-by: Rohit Yadav 
---
 systemvm/debian/etc/rc.local   | 28 
 .../etc/systemd/system/cloud-postinit.service  |  2 +-
 systemvm/debian/opt/cloud/bin/setup/common.sh  |  3 +-
 .../debian/opt/cloud/bin/setup/consoleproxy.sh |  2 +-
 systemvm/debian/opt/cloud/bin/setup/dhcpsrvr.sh|  2 +-
 systemvm/debian/opt/cloud/bin/setup/elbvm.sh   |  2 +-
 systemvm/debian/opt/cloud/bin/setup/ilbvm.sh   |  2 +-
 .../debian/opt/cloud/bin/setup/patchsystemvm.sh|  4 +++
 systemvm/debian/opt/cloud/bin/setup/postinit.sh| 39 +++---
 systemvm/debian/opt/cloud/bin/setup/secstorage.sh  |  2 +-
 systemvm/debian/opt/cloud/bin/update_config.py |  7 
 ui/l10n/en.js  |  1 -
 ui/scripts/system.js   |  4 +--
 ui/scripts/ui/dialog.js|  2 +-
 ui/scripts/ui/widgets/multiEdit.js |  2 +-
 15 files changed, 49 insertions(+), 53 deletions(-)

diff --git a/systemvm/debian/etc/rc.local b/systemvm/debian/etc/rc.local
index 94c6466..e419de0 100755
--- a/systemvm/debian/etc/rc.local
+++ b/systemvm/debian/etc/rc.local
@@ -16,32 +16,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-[ ! -f /var/cache/cloud/enabled_svcs ] && touch /var/cache/cloud/enabled_svcs
-for svc in $(cat /var/cache/cloud/enabled_svcs)
-do
-   logger -t cloud "Starting $svc"
-   systemctl enable --no-block --now $svc
-done
 
-[ ! -f /var/cache/cloud/disabled_svcs ] && touch /var/cache/cloud/disabled_svcs
-for svc in $(cat /var/cache/cloud/disabled_svcs)
-do
-   logger -t cloud "Stopping $svc"
-   systemctl disable --no-block --now $svc
-done
-
-# Restore the persistent iptables nat, rules and filters for IPv4 and IPv6 if 
they exist
-ipv4="/etc/iptables/rules.v4"
-if [ -e $ipv4 ]
-then
-   iptables-restore < $ipv4
-fi
-
-ipv6="/etc/iptables/rules.v6"
-if [ -e $ipv6 ]
-then
-   iptables-restore < $ipv6
-fi
-
-date > /var/cache/cloud/boot_up_done
-logger -t cloud "Boot up process done"
diff --git a/systemvm/debian/etc/systemd/system/cloud-postinit.service 
b/systemvm/debian/etc/systemd/system/cloud-postinit.service
index 04f71a3..c23516e 100644
--- a/systemvm/debian/etc/systemd/system/cloud-postinit.service
+++ b/systemvm/debian/etc/systemd/system/cloud-postinit.service
@@ -11,4 +11,4 @@ WantedBy=multi-user.target
 Type=oneshot
 ExecStart=/opt/cloud/bin/setup/postinit.sh
 RemainAfterExit=true
-TimeoutStartSec=5min
+TimeoutStartSec=10min
diff --git a/systemvm/debian/opt/cloud/bin/setup/common.sh 
b/systemvm/debian/opt/cloud/bin/setup/common.sh
index f1f72f4..078cb58 100755
--- a/systemvm/debian/opt/cloud/bin/setup/common.sh
+++ b/systemvm/debian/opt/cloud/bin/setup/common.sh
@@ -590,8 +590,7 @@ routing_svcs() {
systemctl disable --now portmap
systemctl enable apache2
systemctl enable haproxy
-   systemctl enable ssh
-   echo "ssh haproxy apache2" > /var/cache/cloud/enabled_svcs
+   echo "haproxy apache2" > /var/cache/cloud/enabled_svcs
echo "cloud nfs-common portmap" > /var/cache/cloud/disabled_svcs
if [ $RROUTER -eq 1 ]
then
diff --git a/systemvm/debian/opt/cloud/bin/setup/consoleproxy.sh 
b/systemvm/debian/opt/cloud/bin/setup/consoleproxy.sh
index a3b2797..225dc6f 100755
--- a/systemvm/debian/opt/cloud/bin/setup/consoleproxy.sh
+++ b/systemvm/debian/opt/cloud/bin/setup/consoleproxy.sh
@@ -19,7 +19,7 @@
 . /opt/cloud/bin/setup/common.sh
 
 consoleproxy_svcs() {
-  echo "cloud ssh" > /var/cache/cloud/enabled_svcs
+  echo "cloud" > /var/cache/cloud/enabled_svcs
   echo "haproxy dnsmasq apache2 nfs-common portmap" > 
/var/cache/cloud/disabled_svcs
   mkdir -p /var/log/cloud
 }
diff --git a/systemvm/debian/opt/cloud/bin/setup/dhcpsrvr.sh 
b/systemvm/debian/opt/cloud/bin/setup/dhcpsrvr.sh
index 467bb56..9161aeb 100755
--- a/systemvm/debian/opt/cloud/bin/setup/dhcpsrvr.sh
+++ b/systemvm/debian/opt/cloud/bin/setup/dhcpsrvr.sh
@@ -19,7 +19,7 @@
 . /opt/cloud/bin/setup/common.sh
 
 dhcpsrvr_svcs() {
-  echo "ssh dnsmasq apache2" > /var/cache/cloud/enabled_svcs
+  echo "dnsmasq apache2" > /var/cache/cloud/enabled_svcs
   echo "cloud nfs-common conntrackd keepalived haproxy portmap" > 
/var/cache/cloud/disabled_svcs
 }
 
diff --git a/systemvm/debian/opt/cloud/bin/setup/elbvm.sh 
b/systemvm/debian/opt/cloud/bin/setup/elbvm.sh
index 600fb0d..ae16b4b 100755
--- a/systemvm/debian/opt/cloud/bin/setup/elbvm.sh
+++ b/systemvm/debian/opt/cloud/bin/setup/elbvm.sh
@@ -19,7 +19,7 @@
 . /opt/cloud/bin/setup/common.sh
 
 elbvm_svcs() {
-  echo "ssh haproxy" > 

[cloudstack] 34/34: vmware related fixes

[rohit]

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

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

commit ac9b898236149c9360c74ccca144e2ce595eaea5
Author: Rohit Yadav 
AuthorDate: Fri Dec 15 17:15:36 2017 +0530

vmware related fixes

Signed-off-by: Rohit Yadav 
---
 systemvm/debian/opt/cloud/bin/setup/common.sh| 8 
 systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh | 7 ++-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/systemvm/debian/opt/cloud/bin/setup/common.sh 
b/systemvm/debian/opt/cloud/bin/setup/common.sh
index 078cb58..23bf5ad 100755
--- a/systemvm/debian/opt/cloud/bin/setup/common.sh
+++ b/systemvm/debian/opt/cloud/bin/setup/common.sh
@@ -331,14 +331,14 @@ setup_common() {
 ip route add default via $GW dev $gwdev
   fi
 
-  # a hacking way to activate vSwitch under VMware
-  ping -n -c 3 $GW &
+  # Workaround to activate vSwitch under VMware
+  timeout 5 ping -n -c 3 $GW || true
   if [ -n "$MGMTNET"  -a -n "$LOCAL_GW" ]
   then
-  ping -n -c 3 $LOCAL_GW &
+  timeout 5 ping -n -c 3 $LOCAL_GW || true
   #This code is added to address ARP issue by pinging MGMT_GW
   MGMT_GW=$(echo $MGMTNET | awk -F "." '{print $1"."$2"."$3".1"}')
-  ping -n -c 3 $MGMT_GW &
+  timeout 5 ping -n -c 3 $MGMT_GW || true
   fi
 
   if [ "$HYPERVISOR" == "vmware" ]; then
diff --git a/systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh 
b/systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh
index 106cfd6..6bad7e7 100755
--- a/systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh
+++ b/systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh
@@ -65,11 +65,8 @@ EOF
  if [ "$HYPERVISOR" == "vmware" ] || [ "$HYPERVISOR" == "hyperv" ];
  then
  ip route add $MGMTNET via $LOCAL_GW dev eth0
-
-  # a hacking way to activate vSwitch under VMware
- ping -n -c 3 $LOCAL_GW &
- sleep 3
- pkill ping
+ # workaround to activate vSwitch under VMware
+ timeout 5 ping -n -c 3 $LOCAL_GW || true
  fi
   fi
 

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

[cloudstack] 02/34: CLOUDSTACK-10013: Make Debian9 systemvmtemplates work with systemd

[rohit]

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

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

commit d5680adb1d63560abb439be035cf18aae10c0bdb
Author: Wido den Hollander 
AuthorDate: Thu Aug 10 13:51:11 2017 +0200

CLOUDSTACK-10013: Make Debian9 systemvmtemplates work with systemd

- Load the nf_conntrack_ipv6 module for IPv6 connection tracking on SSVM
- Move systemd services to /etc and enable services after they have been
  installed
- Disable most services by default and enable in cloud-early-config
- Start services after enabling them using systemd
- In addition remove /etc/init.d/cloud as this is no longer needed and
  done by systemd
- Accept DOS/MBR as file format for ISO images as well

Under Debian 7 the 'file' command would return:

  debian-9.1.0-amd64-netinst.iso: ISO 9660 CD-ROM filesystem data UDF 
filesystem data

Under Debian 9 however it will return

  debian-9.1.0-amd64-netinst.iso: DOS/MBR boot sector

This would make the HTTPTemplateDownloader in the Secondary Storage VM 
refuse the ISO as
a valid template because it's not a correct format.

Changes this behavior so that it accepts both.
This allows us to use Debian 9 as a System VM template.

Not sure though if enabling them is enough for systemd to still start them
on first boot

Signed-off-by: Wido den Hollander 
---
 .gitignore |   2 +
 systemvm/patches/debian/config/etc/init.d/cloud| 155 -
 .../debian/config/etc/init.d/cloud-early-config|  55 ++--
 .../systemvmtemplate/configure_conntrack.sh|   1 +
 .../configure_systemvm_services.sh |  22 +--
 .../utils/imagestore/ImageStoreUtil.java   |   2 +-
 6 files changed, 30 insertions(+), 207 deletions(-)

diff --git a/.gitignore b/.gitignore
index 29b4ffc..1a73724 100644
--- a/.gitignore
+++ b/.gitignore
@@ -97,3 +97,5 @@ systemvm/.pydevproject
 test/.pydevprojec
 plugins/hypervisors/kvm/.pydevproject
 scripts/.pydevproject
+*.qcow2
+*.raw
diff --git a/systemvm/patches/debian/config/etc/init.d/cloud 
b/systemvm/patches/debian/config/etc/init.d/cloud
deleted file mode 100755
index 9b3a63b..000
--- a/systemvm/patches/debian/config/etc/init.d/cloud
+++ /dev/null
@@ -1,155 +0,0 @@
-#!/bin/bash
-### BEGIN INIT INFO
-# Provides:  cloud
-# Required-Start:$local_fs cloud-early-config
-# Required-Stop: $local_fs
-# Default-Start: 3 4 5
-# Default-Stop:  0 1 6
-# Short-Description: Start up the CloudStack cloud service
-### END INIT INFO
-# 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 -x
-
-ENABLED=0
-[ -e /etc/default/cloud ] && . /etc/default/cloud
-
-CMDLINE=$(cat /var/cache/cloud/cmdline)
-
-if [ ! -z $CLOUD_DEBUG ];then
-  LOG_FILE=/var/log/cloud/cloud.out
-else
-  LOG_FILE=/dev/null
-fi
-
-TYPE="router"
-for i in $CMDLINE
-  do
-# search for foo=bar pattern and cut out foo
-FIRSTPATTERN=$(echo $i | cut -d= -f1)
-case $FIRSTPATTERN in 
-  type)
-  TYPE=$(echo $i | cut -d= -f2)
-  ;;
-esac
-done
-
-# Source function library.
-if [ -f /etc/init.d/functions ]
-then
-  . /etc/init.d/functions
-fi
-
-if [ -f ./lib/lsb/init-functions ]
-then
-  . /lib/lsb/init-functions
-fi
-
-_success() {
-  if [ -f /etc/init.d/functions ]
-  then
-success
-  else
-echo "Success"
-  fi
-}
-
-_failure() {
-  if [ -f /etc/init.d/functions ]
-  then
-failure
-  else
-echo "Failed"
-  fi
-}
-RETVAL=$?
-CLOUDSTACK_HOME="/usr/local/cloud"
-if [ -f  $CLOUDSTACK_HOME/systemvm/utils.sh ];
-then
-  . $CLOUDSTACK_HOME/systemvm/utils.sh
-else
-  _failure
-fi
-
-# mkdir -p /var/log/vmops
-
-start() {
-   local pid=$(get_pids)
-   if [ "$pid" != "" ]; then
-   echo "CloudStack cloud sevice is already running, PID = $pid"
-   return 0
-   fi
-
-   echo -n "Starting CloudStack cloud service (type=$TYPE) "
-   if [ -f $CLOUDSTACK_HOME/systemvm/run.sh ];
-   then
- if [ "$pid" == "" ]
- then
-   (cd $CLOUDSTACK_HOME/systemvm; nohup ./run.sh > 

[cloudstack] 12/34: CLOUDSTACK-10181: Skip rVR test cases for VMware until supported

[rohit]

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

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

commit 779f2b18d021a2ea491a870be13a4016dff31381
Author: Rohit Yadav 
AuthorDate: Sat Dec 9 00:43:25 2017 +0530

CLOUDSTACK-10181: Skip rVR test cases for VMware until supported

With this change, rVR related test cases will be skipped for VMware
where this feature is not properly supported.

Signed-off-by: Rohit Yadav 
---
 test/integration/smoke/test_internal_lb.py | 11 +++
 test/integration/smoke/test_privategw_acl.py   | 11 +++
 test/integration/smoke/test_routers_network_ops.py | 13 -
 test/integration/smoke/test_vpc_redundant.py   | 11 +++
 test/integration/smoke/test_vpc_vpn.py | 10 ++
 5 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/test/integration/smoke/test_internal_lb.py 
b/test/integration/smoke/test_internal_lb.py
index 5b4c663..379bbb0 100644
--- a/test/integration/smoke/test_internal_lb.py
+++ b/test/integration/smoke/test_internal_lb.py
@@ -50,6 +50,8 @@ from marvin.lib.common import (get_zone,
get_template,
list_network_offerings)
 
+from marvin.lib.decoratorGenerators import skipTestIf
+
 from nose.plugins.attrib import attr
 
 import logging
@@ -280,6 +282,7 @@ class TestInternalLb(cloudstackTestCase):
 
 cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
 cls.domain = get_domain(cls.apiclient)
+
 cls.logger.debug("Creating compute offering: %s" 
%cls.services["compute_offering"]["name"])
 cls.compute_offering = ServiceOffering.create(
 cls.apiclient,
@@ -302,6 +305,12 @@ class TestInternalLb(cloudstackTestCase):
%s" % (cls.account.name,
   cls.account.id))
 
+# Skip rVR related test cases for VMware, for details see
+# https://issues.apache.org/jira/browse/CLOUDSTACK-10181
+cls.rvrNotSupported = False
+if cls.hypervisor.lower() in ['vmware']:
+cls.rvrNotSupported = True
+
 cls._cleanup = [cls.account, cls.compute_offering]
 return
 
@@ -598,6 +607,7 @@ class TestInternalLb(cloudstackTestCase):
 self.cleanup.insert(0, vpc_offering)
 self.execute_internallb_roundrobin_tests(vpc_offering)
 
+@skipTestIf("rvrNotSupported")
 @attr(tags=["smoke", "advanced"], required_hardware="true")
 def test_02_internallb_roundrobin_1RVPC_3VM_HTTP_port80(self):
 """
@@ -766,6 +776,7 @@ class TestInternalLb(cloudstackTestCase):
 
 self.execute_internallb_haproxy_tests(vpc_offering)
 
+@skipTestIf("rvrNotSupported")
 @attr(tags=["smoke", "advanced"], required_hardware="true")
 def test_04_rvpc_internallb_haproxy_stats_on_all_interfaces(self):
 """ Test to verify access to loadbalancer haproxy admin stats page
diff --git a/test/integration/smoke/test_privategw_acl.py 
b/test/integration/smoke/test_privategw_acl.py
index b86b96e..d48eb42 100644
--- a/test/integration/smoke/test_privategw_acl.py
+++ b/test/integration/smoke/test_privategw_acl.py
@@ -25,6 +25,7 @@ from marvin.lib.base import *
 from marvin.lib.common import *
 from nose.plugins.attrib import attr
 from marvin.codes import PASS
+from marvin.lib.decoratorGenerators import skipTestIf
 
 import time
 import logging
@@ -182,6 +183,14 @@ class TestPrivateGwACL(cloudstackTestCase):
 cls.services["service_offering"])
 cls._cleanup = [cls.service_offering]
 
+cls.hypervisor = cls.testClient.getHypervisorInfo()
+
+# Skip rVR related test cases for VMware, for details see
+# https://issues.apache.org/jira/browse/CLOUDSTACK-10181
+cls.rvrNotSupported = False
+if cls.hypervisor.lower() in ['vmware']:
+cls.rvrNotSupported = True
+
 cls.logger = logging.getLogger('TestPrivateGwACL')
 cls.stream_handler = logging.StreamHandler()
 cls.logger.setLevel(logging.DEBUG)
@@ -289,6 +298,7 @@ class TestPrivateGwACL(cloudstackTestCase):
 
 self.performVPCTests(vpc_off, restart_with_cleanup = True)
 
+@skipTestIf("rvrNotSupported")
 @attr(tags=["advanced"], required_hardware="true")
 def test_04_rvpc_privategw_static_routes(self):
 self.logger.debug("Creating a Redundant VPC offering..")
@@ -301,6 +311,7 @@ class TestPrivateGwACL(cloudstackTestCase):
 
 self.performVPCTests(vpc_off)
 
+@skipTestIf("rvrNotSupported")
 @attr(tags=["advanced"], required_hardware="true")
 def _test_05_rvpc_privategw_check_interface(self):
 self.logger.debug("Creating a Redundant VPC offering..")
diff --git a/test/integration/smoke/test_routers_network_ops.py 

[cloudstack] 19/34: more fixes

[rohit]

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

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

commit a8a929ca73ab6f30f79099e5e2b7cfccf46f1f29
Author: Rohit Yadav 
AuthorDate: Mon Dec 11 17:39:44 2017 +0530

more fixes

Signed-off-by: Rohit Yadav 
---
 systemvm/debian/opt/cloud/bin/update_config.py |  2 +-
 test/integration/smoke/test_templates.py   |  4 ++--
 .../definitions/systemvmtemplate/apt_upgrade.sh|  1 -
 .../appliance/definitions/systemvmtemplate/cleanup.sh  |  3 +--
 .../definitions/systemvmtemplate/configure_grub.sh |  2 +-
 .../definitions/systemvmtemplate/definition.rb |  2 +-
 .../appliance/definitions/systemvmtemplate/finalize.sh |  2 +-
 .../appliance/definitions/systemvmtemplate/preseed.cfg | 18 ++
 tools/marvin/marvin/lib/common.py  | 15 +--
 9 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/systemvm/debian/opt/cloud/bin/update_config.py 
b/systemvm/debian/opt/cloud/bin/update_config.py
index a603f47..db47c53 100755
--- a/systemvm/debian/opt/cloud/bin/update_config.py
+++ b/systemvm/debian/opt/cloud/bin/update_config.py
@@ -41,7 +41,7 @@ currentGuestNetConfig = "/etc/cloudstack/guestnetwork.json"
 
 # If the command line json file is unprocessed process it
 # This is important or, the control interfaces will get deleted!
-if os.path.isfile(jsonPath % "cmd_line.json"):
+if jsonFilename != "cmd_line.json" and os.path.isfile(jsonPath % 
"cmd_line.json"):
 qf = QueueFile()
 qf.setFile("cmd_line.json")
 qf.load(None)
diff --git a/test/integration/smoke/test_templates.py 
b/test/integration/smoke/test_templates.py
index 955fe6e..6544ad2 100644
--- a/test/integration/smoke/test_templates.py
+++ b/test/integration/smoke/test_templates.py
@@ -158,7 +158,6 @@ class TestCreateTemplateWithChecksum(cloudstackTestCase):
 cmd.id = temp.id
 cmd.zoneid = self.zone.id
 self.apiclient.deleteTemplate(cmd)
-
 except Exception as e:
 raise Exception("Warning: Exception during cleanup : %s" % e)
 return
@@ -227,7 +226,8 @@ class TestCreateTemplateWithChecksum(cloudstackTestCase):
 
 def registerTemplate(self, cmd):
 temp = self.apiclient.registerTemplate(cmd)[0]
-self.cleanup.append(temp)
+if not temp:
+self.cleanup.append(temp)
 return temp
 
 def getOsType(self, param):
diff --git a/tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh 
b/tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh
index 2d7394d..4a408c3 100644
--- a/tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh
+++ b/tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh
@@ -22,7 +22,6 @@ set -x
 function fix_tune2fs() {
   for partition in $(blkid -o list | grep ext | awk '{print $1}')
   do
-tune2fs -m0 $partition
 tune2fs -c 1 $partition
   done
   fdisk -l
diff --git a/tools/appliance/definitions/systemvmtemplate/cleanup.sh 
b/tools/appliance/definitions/systemvmtemplate/cleanup.sh
index 00f068d..fd7d9f3 100644
--- a/tools/appliance/definitions/systemvmtemplate/cleanup.sh
+++ b/tools/appliance/definitions/systemvmtemplate/cleanup.sh
@@ -22,7 +22,7 @@ set -x
 function cleanup_apt() {
   apt-get -y remove --purge dictionaries-common busybox isc-dhcp-client 
isc-dhcp-common \
 task-english task-ssh-server tasksel tasksel-data laptop-detect nano 
wamerican \
-debconf-i18n sharutils gnupg gnupg-agent keyboard-configuration
+debconf-i18n sharutils gnupg gnupg-agent
 
   apt-get -y autoremove --purge
   apt-get autoclean
@@ -59,7 +59,6 @@ function cleanup_misc() {
   # Docs and data files
   rm -fr /var/lib/apt/*
   rm -fr /var/cache/apt/*
-  rm -fr /usr/lib/gnupg*
   rm -fr /usr/share/doc
   rm -fr /usr/share/man
   rm -fr /usr/share/info
diff --git a/tools/appliance/definitions/systemvmtemplate/configure_grub.sh 
b/tools/appliance/definitions/systemvmtemplate/configure_grub.sh
index 4a42dc6..c0a2596 100644
--- a/tools/appliance/definitions/systemvmtemplate/configure_grub.sh
+++ b/tools/appliance/definitions/systemvmtemplate/configure_grub.sh
@@ -27,7 +27,7 @@ function configure_grub() {
 GRUB_DEFAULT=0
 GRUB_TIMEOUT=0
 GRUB_DISTRIBUTOR=Debian
-GRUB_CMDLINE_LINUX_DEFAULT="quiet"
+GRUB_CMDLINE_LINUX_DEFAULT=""
 GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8 console=hvc0 
earlyprintk=xen net.ifnames=0 biosdevname=0 debian-installer=en_US 
fsck.mode=force nomodeset"
 GRUB_CMDLINE_XEN="com1=115200 console=com1"
 GRUB_TERMINAL="console serial"
diff --git a/tools/appliance/definitions/systemvmtemplate/definition.rb 
b/tools/appliance/definitions/systemvmtemplate/definition.rb
index 917dd77..b5e4da2 100644
--- a/tools/appliance/definitions/systemvmtemplate/definition.rb
+++ 

[cloudstack] 20/34: rvr fixes

[rohit]

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

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

commit d691a70c9ae6781c6ad0ae667d6492d9e8f048dc
Author: Rohit Yadav 
AuthorDate: Mon Dec 11 18:14:05 2017 +0530

rvr fixes

Signed-off-by: Rohit Yadav 
---
 systemvm/debian/opt/cloud/bin/cs/CsRedundant.py| 11 ++--
 systemvm/debian/opt/cloud/bin/setup/common.sh  | 61 --
 systemvm/debian/opt/cloud/bin/setup/router.sh  |  5 --
 systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh   |  5 --
 .../opt/cloud/templates/keepalived.conf.templ  |  1 -
 5 files changed, 7 insertions(+), 76 deletions(-)

diff --git a/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py 
b/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py
index 108f337..29b5028 100755
--- a/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py
+++ b/systemvm/debian/opt/cloud/bin/cs/CsRedundant.py
@@ -75,6 +75,10 @@ class CsRedundant(object):
 def _redundant_off(self):
 CsHelper.service("conntrackd", "stop")
 CsHelper.service("keepalived", "stop")
+CsHelper.umount_tmpfs(self.CS_RAMDISK_DIR)
+CsHelper.rmdir(self.CS_RAMDISK_DIR)
+CsHelper.rm(self.CONNTRACKD_CONF)
+CsHelper.rm(self.KEEPALIVED_CONF)
 
 def _redundant_on(self):
 guest = self.address.get_guest_if()
@@ -107,10 +111,9 @@ class CsRedundant(object):
 CsHelper.service("keepalived", "stop")
 return
 
-# setup_router should execute this already:
-# CsHelper.mkdir(self.CS_RAMDISK_DIR, 0755, False)
-# CsHelper.mount_tmpfs(self.CS_RAMDISK_DIR)
-# CsHelper.mkdir(self.CS_ROUTER_DIR, 0755, False)
+CsHelper.mkdir(self.CS_RAMDISK_DIR, 0755, False)
+CsHelper.mount_tmpfs(self.CS_RAMDISK_DIR)
+CsHelper.mkdir(self.CS_ROUTER_DIR, 0755, False)
 for s in self.CS_TEMPLATES:
 d = s
 if s.endswith(".templ"):
diff --git a/systemvm/debian/opt/cloud/bin/setup/common.sh 
b/systemvm/debian/opt/cloud/bin/setup/common.sh
index 76ec826..f1f72f4 100755
--- a/systemvm/debian/opt/cloud/bin/setup/common.sh
+++ b/systemvm/debian/opt/cloud/bin/setup/common.sh
@@ -609,67 +609,6 @@ routing_svcs() {
fi
 }
 
-setup_redundant_router() {
-rrouter_bin_path="/ramdisk/rrouter"
-rrouter_log="/ramdisk/rrouter/keepalived.log"
-rrouter_bin_path_str="\/ramdisk\/rrouter"
-rrouter_log_str="\/ramdisk\/rrouter\/keepalived.log"
-mkdir -p /ramdisk
-mount tmpfs /ramdisk -t tmpfs
-mkdir -p /ramdisk/rrouter
-ip route delete default
-
-# Seed keepalived
-if [ "$RROUTER_STATE" == "MASTER" ]
-then
-sed -i "s/priority.*/priority 100/g" 
/opt/cloud/templates/keepalived.conf.templ
-else
-sed -i "s/priority.*/priority 50/g" 
/opt/cloud/templates/keepalived.conf.templ
-fi
-cp /opt/cloud/templates/keepalived.conf.templ 
/etc/keepalived/keepalived.conf # changes!
-sed -i "s/\[ROUTER_ID\]/$NAME/g" /etc/keepalived/keepalived.conf
-sed -i "s/\[ROUTER_IP\]/$GUEST_GW\/$GUEST_CIDR_SIZE/g" 
/etc/keepalived/keepalived.conf #fixme, multiple ips?
-sed -i "s/\[BOARDCAST\]/$GUEST_BRD/g" /etc/keepalived/keepalived.conf
-sed -i "s/\[PRIORITY\]/$ROUTER_PR/g" /etc/keepalived/keepalived.conf
-sed -i "s/\[PASS\]/$VM_PASSWORD/g" /etc/keepalived/keepalived.conf
-sed -i "s/\[RROUTER_BIN_PATH\]/$rrouter_bin_path_str/g" 
/etc/keepalived/keepalived.conf
-sed -i "s/\[DELTA\]/2/g" /etc/keepalived/keepalived.conf
-sed -i "s/--exec\ \$DAEMON;/--exec\ \$DAEMON\ --\ --vrrp;/g" 
/etc/init.d/keepalived
-if [ $ADVERT_INT ]
-then
-sed -i "s/advert_int 1/advert_int $ADVERT_INT/g" 
/etc/keepalived/keepalived.conf
-fi
-chmod -x /etc/keepalived/keepalived.conf
-
-# Seed conntrackd
-cp /opt/cloud/templates/conntrackd.conf.templ 
/etc/conntrackd/conntrackd.conf
-sed -i "s/\[LINK_IF\]/eth0/g" /etc/conntrackd/conntrackd.conf
-sed -i "s/\[LINK_IP\]/$ETH0_IP/g" /etc/conntrackd/conntrackd.conf
-sed -i "s/\[IGNORE_IP1\]/$GUEST_GW/g" /etc/conntrackd/conntrackd.conf # 
checkme?
-sed -i "s/\[IGNORE_IP2\]/$ETH0_IP/g" /etc/conntrackd/conntrackd.conf
-sed -i "s/\[IGNORE_IP3\]/$ETH1_IP/g" /etc/conntrackd/conntrackd.conf
-
-# ramdisk scripts
-cp /opt/cloud/templates/heartbeat.sh.templ $rrouter_bin_path/heartbeat.sh
-cp /opt/cloud/templates/check_heartbeat.sh.templ 
$rrouter_bin_path/check_heartbeat.sh
-cp /opt/cloud/templates/arping_gateways.sh.templ 
$rrouter_bin_path/arping_gateways.sh
-cp /opt/cloud/templates/check_bumpup.sh $rrouter_bin_path/
-cp /opt/cloud/templates/checkrouter.sh.templ /opt/cloud/bin/checkrouter.sh 
# changes!
-#sed -i "s/\[RROUTER_LOG\]/$rrouter_log_str/g" 
/opt/cloud/bin/checkrouter.sh
-
-sed -i "s/\[RROUTER_BIN_PATH\]/$rrouter_bin_path_str/g" 

[cloudstack] 25/34: systemvm fixes

[rohit]

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

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

commit 4b4cec6e7634cfdb99732a288353383da8e170f6
Author: Rohit Yadav 
AuthorDate: Tue Dec 12 13:13:57 2017 +0530

systemvm fixes

Signed-off-by: Rohit Yadav 
---
 .../appliance/definitions/systemvmtemplate/apt_upgrade.sh  | 14 --
 tools/appliance/definitions/systemvmtemplate/cleanup.sh|  2 +-
 tools/appliance/definitions/systemvmtemplate/definition.rb |  2 +-
 tools/appliance/definitions/systemvmtemplate/finalize.sh   | 11 +--
 tools/appliance/definitions/systemvmtemplate/preseed.cfg   |  7 +--
 5 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh 
b/tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh
index 1a72b3a..4d5ff26 100644
--- a/tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh
+++ b/tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh
@@ -19,6 +19,17 @@
 set -e
 set -x
 
+# Perform fsck check on every 2nd boot
+function fix_tune2fs() {
+  for partition in $(blkid -o list | grep ext | awk '{print $1}')
+  do
+tune2fs -m 1 $partition
+tune2fs -c 2 $partition
+  done
+  fdisk -l
+  df -h
+}
+
 function add_backports() {
   sed -i '/cdrom/d' /etc/apt/sources.list
   sed -i '/deb-src/d' /etc/apt/sources.list
@@ -30,8 +41,7 @@ function apt_upgrade() {
   DEBIAN_FRONTEND=noninteractive
   DEBIAN_PRIORITY=critical
 
-  fdisk -l
-  df -h
+  fix_tune2fs
 
   # Setup sudo
   echo 'cloud ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/cloud
diff --git a/tools/appliance/definitions/systemvmtemplate/cleanup.sh 
b/tools/appliance/definitions/systemvmtemplate/cleanup.sh
index fd7d9f3..eed29af 100644
--- a/tools/appliance/definitions/systemvmtemplate/cleanup.sh
+++ b/tools/appliance/definitions/systemvmtemplate/cleanup.sh
@@ -21,7 +21,7 @@ set -x
 
 function cleanup_apt() {
   apt-get -y remove --purge dictionaries-common busybox isc-dhcp-client 
isc-dhcp-common \
-task-english task-ssh-server tasksel tasksel-data laptop-detect nano 
wamerican \
+task-english task-ssh-server tasksel tasksel-data laptop-detect wamerican \
 debconf-i18n sharutils gnupg gnupg-agent
 
   apt-get -y autoremove --purge
diff --git a/tools/appliance/definitions/systemvmtemplate/definition.rb 
b/tools/appliance/definitions/systemvmtemplate/definition.rb
index b5e4da2..52cb7df 100644
--- a/tools/appliance/definitions/systemvmtemplate/definition.rb
+++ b/tools/appliance/definitions/systemvmtemplate/definition.rb
@@ -36,7 +36,7 @@ architectures = {
 config = {
 :cpu_count => '1',
 :memory_size => '512',
-:disk_size => '2500', :disk_format => 'VDI', :hostiocache => 'off',
+:disk_size => '2100', :disk_format => 'VDI', :hostiocache => 'off',
 :iso_download_timeout => '1000',
 :boot_wait => '10',
 :boot_cmd_sequence => [
diff --git a/tools/appliance/definitions/systemvmtemplate/finalize.sh 
b/tools/appliance/definitions/systemvmtemplate/finalize.sh
index 82d17b9..febae7b 100644
--- a/tools/appliance/definitions/systemvmtemplate/finalize.sh
+++ b/tools/appliance/definitions/systemvmtemplate/finalize.sh
@@ -49,19 +49,11 @@ function cleanup_veewee() {
   rm -fv .veewee_version .veewee_params .vbox_version
 }
 
-# Perform fsck check on every 2nd boot
-function fix_tune2fs() {
-  for partition in $(blkid -o list | grep ext | awk '{print $1}')
-  do
-tune2fs -c 2 $partition
-  done
-}
-
 # Zero out the free space to save space in the final image:
 function zero_disk() {
   df -h
   fstrim -av
-  for path in / /boot /var /var/log /tmp
+  for path in / /boot /var/log /tmp
   do
 dd if=/dev/zero of=${path}/zero bs=1M || true
 sync
@@ -73,7 +65,6 @@ function finalize() {
   configure_misc
   configure_sudoers
   cleanup_veewee
-  fix_tune2fs
   sync
   zero_disk
   halt -p
diff --git a/tools/appliance/definitions/systemvmtemplate/preseed.cfg 
b/tools/appliance/definitions/systemvmtemplate/preseed.cfg
index 60bd9a8..d218172 100644
--- a/tools/appliance/definitions/systemvmtemplate/preseed.cfg
+++ b/tools/appliance/definitions/systemvmtemplate/preseed.cfg
@@ -63,16 +63,11 @@ d-i partman-auto/expert_recipe string   
  \
   use_filesystem{ } filesystem{ ext2 }\
   mountpoint{ /boot } \
   .   \
-  1300 40 1500 ext4   \
+  1450 40 1600 ext4   \
   method{ format } format{ }  \
   use_filesystem{ } filesystem{ ext4 }\
   mountpoint{ / } \
   .   \
-  

[cloudstack] 31/34: don't skip rvr tests for vmware

[rohit]

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

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

commit aa51d5b623a3c8212973acff928a7f7b6928e27b
Author: Rohit Yadav 
AuthorDate: Wed Dec 13 16:24:08 2017 +0530

don't skip rvr tests for vmware

Signed-off-by: Rohit Yadav 
---
 test/integration/smoke/test_internal_lb.py | 10 --
 test/integration/smoke/test_privategw_acl.py   |  8 
 test/integration/smoke/test_routers_network_ops.py | 10 --
 test/integration/smoke/test_vpc_redundant.py   | 10 --
 test/integration/smoke/test_vpc_vpn.py | 10 --
 5 files changed, 48 deletions(-)

diff --git a/test/integration/smoke/test_internal_lb.py 
b/test/integration/smoke/test_internal_lb.py
index 21a6f40..ba555aa 100644
--- a/test/integration/smoke/test_internal_lb.py
+++ b/test/integration/smoke/test_internal_lb.py
@@ -50,8 +50,6 @@ from marvin.lib.common import (get_zone,
get_test_template,
list_network_offerings)
 
-from marvin.lib.decoratorGenerators import skipTestIf
-
 from nose.plugins.attrib import attr
 
 import logging
@@ -269,12 +267,6 @@ class TestInternalLb(cloudstackTestCase):
%s" % (cls.account.name,
   cls.account.id))
 
-# Skip rVR related test cases for VMware, for details see
-# https://issues.apache.org/jira/browse/CLOUDSTACK-10181
-cls.rvrNotSupported = False
-if cls.hypervisor.lower() in ['vmware']:
-cls.rvrNotSupported = True
-
 cls._cleanup = [cls.account, cls.compute_offering]
 return
 
@@ -571,7 +563,6 @@ class TestInternalLb(cloudstackTestCase):
 self.cleanup.insert(0, vpc_offering)
 self.execute_internallb_roundrobin_tests(vpc_offering)
 
-@skipTestIf("rvrNotSupported")
 @attr(tags=["smoke", "advanced"], required_hardware="true")
 def test_02_internallb_roundrobin_1RVPC_3VM_HTTP_port80(self):
 """
@@ -740,7 +731,6 @@ class TestInternalLb(cloudstackTestCase):
 
 self.execute_internallb_haproxy_tests(vpc_offering)
 
-@skipTestIf("rvrNotSupported")
 @attr(tags=["smoke", "advanced"], required_hardware="true")
 def test_04_rvpc_internallb_haproxy_stats_on_all_interfaces(self):
 """ Test to verify access to loadbalancer haproxy admin stats page
diff --git a/test/integration/smoke/test_privategw_acl.py 
b/test/integration/smoke/test_privategw_acl.py
index 09d3fa4..72c3080 100644
--- a/test/integration/smoke/test_privategw_acl.py
+++ b/test/integration/smoke/test_privategw_acl.py
@@ -184,12 +184,6 @@ class TestPrivateGwACL(cloudstackTestCase):
 cls.services["service_offering"])
 cls._cleanup = [cls.service_offering]
 
-# Skip rVR related test cases for VMware, for details see
-# https://issues.apache.org/jira/browse/CLOUDSTACK-10181
-cls.rvrNotSupported = False
-if cls.hypervisor.lower() in ['vmware']:
-cls.rvrNotSupported = True
-
 cls.logger = logging.getLogger('TestPrivateGwACL')
 cls.stream_handler = logging.StreamHandler()
 cls.logger.setLevel(logging.DEBUG)
@@ -297,7 +291,6 @@ class TestPrivateGwACL(cloudstackTestCase):
 
 self.performVPCTests(vpc_off, restart_with_cleanup = True)
 
-@skipTestIf("rvrNotSupported")
 @attr(tags=["advanced"], required_hardware="true")
 def test_04_rvpc_privategw_static_routes(self):
 self.logger.debug("Creating a Redundant VPC offering..")
@@ -310,7 +303,6 @@ class TestPrivateGwACL(cloudstackTestCase):
 
 self.performVPCTests(vpc_off)
 
-@skipTestIf("rvrNotSupported")
 @attr(tags=["advanced"], required_hardware="true")
 def _test_05_rvpc_privategw_check_interface(self):
 self.logger.debug("Creating a Redundant VPC offering..")
diff --git a/test/integration/smoke/test_routers_network_ops.py 
b/test/integration/smoke/test_routers_network_ops.py
index c189437..2f122a2 100644
--- a/test/integration/smoke/test_routers_network_ops.py
+++ b/test/integration/smoke/test_routers_network_ops.py
@@ -88,13 +88,6 @@ class TestRedundantIsolateNetworks(cloudstackTestCase):
 
 cls.hypervisor = cls.testClient.getHypervisorInfo()
 
-# Skip rVR related test cases for VMware, for details see
-# https://issues.apache.org/jira/browse/CLOUDSTACK-10181
-cls.rvrNotSupported = False
-if cls.hypervisor.lower() in ['vmware']:
-cls.rvrNotSupported = True
-return
-
 cls.template = get_test_template(cls.api_client, cls.zone.id, 
cls.hypervisor)
 if cls.template == FAILED:
 assert False, "get_test_template() failed to return template"
@@ -150,9 +143,6 @@ class TestRedundantIsolateNetworks(cloudstackTestCase):
   

[cloudstack] 05/34: CLOUDSTACK-9348: Improve Nio SSH handshake buffers

[rohit]

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

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

commit b62ea9e98151e6c7745c91a9e8e0c9e7504cab5b
Author: Rohit Yadav 
AuthorDate: Thu Nov 30 16:51:48 2017 +0530

CLOUDSTACK-9348: Improve Nio SSH handshake buffers

Use a holder class to pass buffers, fixes potential leak.

Signed-off-by: Rohit Yadav 
---
 .../agent/manager/ClusteredAgentManagerImpl.java   |  2 +-
 utils/src/main/java/com/cloud/utils/nio/Link.java  | 72 +-
 .../main/java/com/cloud/utils/nio/NioClient.java   |  2 +-
 .../java/com/cloud/utils/nio/NioConnection.java|  2 +-
 4 files changed, 58 insertions(+), 20 deletions(-)

diff --git 
a/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
 
b/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
index 2ebfeb5..0b9899e 100644
--- 
a/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
+++ 
b/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
@@ -519,7 +519,7 @@ public class ClusteredAgentManagerImpl extends 
AgentManagerImpl implements Clust
 sslEngine.setUseClientMode(true);
 
sslEngine.setEnabledProtocols(SSLUtils.getSupportedProtocols(sslEngine.getEnabledProtocols()));
 sslEngine.beginHandshake();
-if (!Link.doHandshake(ch1, sslEngine, true)) {
+if (!Link.doHandshake(ch1, sslEngine)) {
 ch1.close();
 throw new IOException(String.format("SSL: 
Handshake failed with peer management server '%s' on %s:%d ", peerName, ip, 
port));
 }
diff --git a/utils/src/main/java/com/cloud/utils/nio/Link.java 
b/utils/src/main/java/com/cloud/utils/nio/Link.java
index 8f1b811..35211c8 100644
--- a/utils/src/main/java/com/cloud/utils/nio/Link.java
+++ b/utils/src/main/java/com/cloud/utils/nio/Link.java
@@ -32,6 +32,8 @@ import java.security.GeneralSecurityException;
 import java.security.KeyStore;
 import java.security.SecureRandom;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
 
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
@@ -462,7 +464,7 @@ public class Link {
 return buffer;
 }
 
-public static ByteBuffer handleBufferUnderflow(final SSLEngine engine, 
ByteBuffer buffer) {
+public static ByteBuffer handleBufferUnderflow(final SSLEngine engine, 
final ByteBuffer buffer) {
 if (engine == null || buffer == null) {
 return buffer;
 }
@@ -475,14 +477,14 @@ public class Link {
 return replaceBuffer;
 }
 
-private static boolean doHandshakeUnwrap(final SocketChannel 
socketChannel, final SSLEngine sslEngine,
+private static HandshakeHolder doHandshakeUnwrap(final SocketChannel 
socketChannel, final SSLEngine sslEngine,
  ByteBuffer peerAppData, 
ByteBuffer peerNetData, final int appBufferSize) throws IOException {
 if (socketChannel == null || sslEngine == null || peerAppData == null 
|| peerNetData == null || appBufferSize < 0) {
-return false;
+return new HandshakeHolder(peerAppData, peerNetData, false);
 }
 if (socketChannel.read(peerNetData) < 0) {
 if (sslEngine.isInboundDone() && sslEngine.isOutboundDone()) {
-return false;
+return new HandshakeHolder(peerAppData, peerNetData, false);
 }
 try {
 sslEngine.closeInbound();
@@ -492,7 +494,7 @@ public class Link {
 sslEngine.closeOutbound();
 // After closeOutbound the engine will be set to WRAP state,
 // in order to try to send a close message to the client.
-return true;
+return new HandshakeHolder(peerAppData, peerNetData, true);
 }
 peerNetData.flip();
 SSLEngineResult result = null;
@@ -503,7 +505,10 @@ public class Link {
 s_logger.error(String.format("SSL error caught during unwrap data: 
%s, for local address=%s, remote address=%s. The client may have invalid 
ca-certificates.",
 sslException.getMessage(), 
socketChannel.getLocalAddress(), socketChannel.getRemoteAddress()));
 sslEngine.closeOutbound();
-return false;
+return new HandshakeHolder(peerAppData, peerNetData, true);
+}
+if (result == null) {
+return new HandshakeHolder(peerAppData, peerNetData, false);
 }
 switch (result.getStatus()) {
 case OK:
@@ -519,23 +524,23 @@ public class Link {
   

[cloudstack] 14/34: update per new macchinina template

[rohit]

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

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

commit dc4b7ab2739612904b6e92dfc1988d1c46be658a
Author: Rohit Yadav 
AuthorDate: Sun Dec 10 21:26:24 2017 +0530

update per new macchinina template

Signed-off-by: Rohit Yadav 
---
 server/src/com/cloud/resource/ResourceManagerImpl.java |  2 +-
 .../storage/secondary/SecondaryStorageVmManager.java   |  6 +++---
 .../secondarystorage/SecondaryStorageManagerImpl.java  |  2 +-
 systemvm/debian/opt/cloud/bin/setup/common.sh  | 11 ++-
 .../debian/opt/cloud/templates/keepalived.conf.templ   |  8 
 test/integration/smoke/test_templates.py   | 18 +-
 tools/appliance/build.sh   |  2 +-
 .../definitions/systemvmtemplate/configure_grub.sh |  2 +-
 8 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java 
b/server/src/com/cloud/resource/ResourceManagerImpl.java
index 33c36de..c9916e9 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -2274,7 +2274,7 @@ public class ResourceManagerImpl extends ManagerBase 
implements ResourceManager,
 }
 
 try {
-SSHCmdHelper.SSHCmdResult result = 
SSHCmdHelper.sshExecuteCmdOneShot(connection, "service cloudstack-agent restart 
|| systemctl restart cloudstack-agent");
+SSHCmdHelper.SSHCmdResult result = 
SSHCmdHelper.sshExecuteCmdOneShot(connection, "service cloudstack-agent 
restart");
 s_logger.debug("cloudstack-agent restart result: " + 
result.toString());
 } catch (final SshException e) {
 return false;
diff --git 
a/server/src/com/cloud/storage/secondary/SecondaryStorageVmManager.java 
b/server/src/com/cloud/storage/secondary/SecondaryStorageVmManager.java
index 3b32c85..99073f7 100644
--- a/server/src/com/cloud/storage/secondary/SecondaryStorageVmManager.java
+++ b/server/src/com/cloud/storage/secondary/SecondaryStorageVmManager.java
@@ -27,11 +27,11 @@ import com.cloud.vm.SecondaryStorageVmVO;
 
 public interface SecondaryStorageVmManager extends Manager {
 
-public static final int DEFAULT_SS_VM_RAMSIZE = 512;// 512M
-public static final int DEFAULT_SS_VM_CPUMHZ = 500;// 500 
MHz
+public static final int DEFAULT_SS_VM_RAMSIZE = 1024;   // 1024M
+public static final int DEFAULT_SS_VM_CPUMHZ = 500; // 500 MHz
 public static final int DEFAULT_SS_VM_MTUSIZE = 1500;
 public static final int DEFAULT_SS_VM_CAPACITY = 50;// max 
command execution session per SSVM
-public static final int DEFAULT_STANDBY_CAPACITY = 10;// 
standy capacity to reserve per zone
+public static final int DEFAULT_STANDBY_CAPACITY = 10;  // standy 
capacity to reserve per zone
 
 public static final String ALERT_SUBJECT = "secondarystoragevm-alert";
 
diff --git 
a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
 
b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
index 273fdd0..bed0313 100644
--- 
a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
+++ 
b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
@@ -951,7 +951,7 @@ public class SecondaryStorageManagerImpl extends 
ManagerBase implements Secondar
 int ramSize = 
NumbersUtil.parseInt(_configDao.getValue("ssvm.ram.size"), 
DEFAULT_SS_VM_RAMSIZE);
 int cpuFreq = 
NumbersUtil.parseInt(_configDao.getValue("ssvm.cpu.mhz"), DEFAULT_SS_VM_CPUMHZ);
 List offerings = 
_offeringDao.createSystemServiceOfferings("System Offering For Secondary 
Storage VM",
-ServiceOffering.ssvmDefaultOffUniqueName, 1, ramSize, 
cpuFreq, null, null, false, null,
+ServiceOffering.ssvmDefaultOffUniqueName, 2, ramSize, 
cpuFreq, null, null, false, null,
 Storage.ProvisioningType.THIN, true, null, true, 
VirtualMachine.Type.SecondaryStorageVm, true);
 // this can sometimes happen, if DB is manually or 
programmatically manipulated
 if (offerings == null || offerings.size() < 2) {
diff --git a/systemvm/debian/opt/cloud/bin/setup/common.sh 
b/systemvm/debian/opt/cloud/bin/setup/common.sh
index e6a4417..76ec826 100755
--- a/systemvm/debian/opt/cloud/bin/setup/common.sh
+++ b/systemvm/debian/opt/cloud/bin/setup/common.sh
@@ -620,12 +620,18 @@ setup_redundant_router() {
 ip route delete default
 
  

[cloudstack] 23/34: fixes

[rohit]

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

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

commit 7ed696aa351a4ff97f3105ad944dbf6c973f2452
Author: Rohit Yadav 
AuthorDate: Tue Dec 12 10:24:39 2017 +0530

fixes

Signed-off-by: Rohit Yadav 
---
 .travis.yml| 11 ++---
 .../etc/systemd/system/cloud-postinit.service  |  2 +-
 systemvm/debian/opt/cloud/bin/cs/CsApp.py  |  2 +-
 systemvm/debian/opt/cloud/bin/passwd_server| 26 
 systemvm/debian/opt/cloud/bin/passwd_server_ip | 29 -
 systemvm/debian/opt/cloud/bin/update_config.py | 14 +++
 systemvm/debian/opt/cloud/bin/vpc_passwd_server| 32 ---
 .../opt/cloud/templates/keepalived.conf.templ  |  4 +-
 .../definitions/systemvmtemplate/apt_upgrade.sh| 13 ++
 .../definitions/systemvmtemplate/configure_grub.sh |  2 +-
 .../definitions/systemvmtemplate/finalize.sh   |  9 
 tools/marvin/marvin/config/test_data.py| 48 +-
 tools/marvin/marvin/lib/common.py  | 47 +
 13 files changed, 79 insertions(+), 160 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a206cbe..b4749c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -115,8 +115,7 @@ env:
  component/test_acl_sharednetwork_deployVM-impersonation
  component/test_affinity_groups_projects
  component/test_cpu_domain_limits
- component/test_cpu_limits
- component/test_volumes"
+ component/test_cpu_limits"
 
 - TESTS="component/test_cpu_max_limits
  component/test_acl_isolatednetwork
@@ -144,10 +143,12 @@ env:
  component/test_snapshots
  component/test_stopped_vm"
 
-- TESTS="component/test_resource_limits
- component/test_tags
+- TESTS="component/test_resource_limits"
+
+- TESTS="component/test_tags
  component/test_templates
- component/test_update_vm"
+ component/test_update_vm
+ component/test_volumes"
 
 - TESTS="component/test_vpc
  component/test_vpc_network
diff --git a/systemvm/debian/etc/systemd/system/cloud-postinit.service 
b/systemvm/debian/etc/systemd/system/cloud-postinit.service
index 83f0636..04f71a3 100644
--- a/systemvm/debian/etc/systemd/system/cloud-postinit.service
+++ b/systemvm/debian/etc/systemd/system/cloud-postinit.service
@@ -11,4 +11,4 @@ WantedBy=multi-user.target
 Type=oneshot
 ExecStart=/opt/cloud/bin/setup/postinit.sh
 RemainAfterExit=true
-TimeoutStartSec=1min
+TimeoutStartSec=5min
diff --git a/systemvm/debian/opt/cloud/bin/cs/CsApp.py 
b/systemvm/debian/opt/cloud/bin/cs/CsApp.py
index 2085088..031ac05 100755
--- a/systemvm/debian/opt/cloud/bin/cs/CsApp.py
+++ b/systemvm/debian/opt/cloud/bin/cs/CsApp.py
@@ -66,7 +66,7 @@ class CsApache(CsApp):
 
 class CsPasswdSvc():
 """
-  nohup bash /opt/cloud/bin/vpc_passwd_server $ip >/dev/null 2>&1 &
+  CloudStack VR password server
 """
 
 def __init__(self, ip):
diff --git a/systemvm/debian/opt/cloud/bin/passwd_server 
b/systemvm/debian/opt/cloud/bin/passwd_server
deleted file mode 100755
index 295e720..000
--- a/systemvm/debian/opt/cloud/bin/passwd_server
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/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.
-
-#we have intentionally split the ip gathering command into two.
-#This was done to avoid getting a SIGPIPE during certain load conditions.
-ipInfo=$(ip addr show dev eth0 | grep inet | grep eth0 )
-ips=$(echo "$ipInfo" | awk '{print $2}' ); echo $ips
-for ip in $ips; do
-   addr=$(echo $ip | awk -F'/' '{print $1}')
-   /opt/cloud/bin/passwd_server_ip $addr >> /var/log/cloud.log 2>&1 &
-done;
diff --git a/systemvm/debian/opt/cloud/bin/passwd_server_ip 
b/systemvm/debian/opt/cloud/bin/passwd_server_ip
deleted file mode 100755
index ce21b53..000
--- a/systemvm/debian/opt/cloud/bin/passwd_server_ip
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache 

[cloudstack] 28/34: CLOUDSTACK-10187: Don't delete vifs for VPCs with source nat

[rohit]

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

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

commit 439413638f400694a1821e16d7afbc391b66795e
Author: Rohit Yadav 
AuthorDate: Wed Dec 13 01:28:18 2017 +0530

CLOUDSTACK-10187: Don't delete vifs for VPCs with source nat

On XenServer, both redundant router's vifs were getting deleted when any
PF rule is removed from any of the acquired public IPs. This fix
ensures that lastIp is set to `false` when processed by hypervisor
resources to avoid removing of VIFs when VPCs have any source nat IP.

Signed-off-by: Rohit Yadav 
---
 .../com/cloud/network/router/CommandSetupHelper.java  | 19 ++-
 test/integration/smoke/test_vpc_redundant.py  |  4 ++--
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/server/src/com/cloud/network/router/CommandSetupHelper.java 
b/server/src/com/cloud/network/router/CommandSetupHelper.java
index cadaf4f..c8d85fe 100644
--- a/server/src/com/cloud/network/router/CommandSetupHelper.java
+++ b/server/src/com/cloud/network/router/CommandSetupHelper.java
@@ -475,7 +475,7 @@ public class CommandSetupHelper {
 
 public void createAssociateIPCommands(final VirtualRouter router, final 
List ips, final Commands cmds, final long vmId) {
 final String ipAssocCommand = "IPAssocCommand";
-createRedundantAssociateIPCommands(router, ips, cmds, ipAssocCommand, 
vmId);
+createRedundantAssociateIPCommands(router, ips, cmds, ipAssocCommand, 
false);
 }
 
 public void createNetworkACLsCommands(final List 
rules, final VirtualRouter router, final Commands cmds, final long 
guestNetworkId,
@@ -645,7 +645,7 @@ public class CommandSetupHelper {
 
 final String ipAssocCommand = "IPAssocVpcCommand";
 if (router.getIsRedundantRouter()) {
-createRedundantAssociateIPCommands(router, ips, cmds, 
ipAssocCommand, 0);
+createRedundantAssociateIPCommands(router, ips, cmds, 
ipAssocCommand, true);
 return;
 }
 
@@ -742,7 +742,7 @@ public class CommandSetupHelper {
 }
 }
 
-public void createRedundantAssociateIPCommands(final VirtualRouter router, 
final List ips, final Commands cmds, final String 
ipAssocCommand, final long vmId) {
+public void createRedundantAssociateIPCommands(final VirtualRouter router, 
final List ips, final Commands cmds, final String 
ipAssocCommand, final boolean isVPC) {
 
 // Ensure that in multiple vlans case we first send all ip addresses of
 // vlan1, then all ip addresses of vlan2, etc..
@@ -840,7 +840,16 @@ public class CommandSetupHelper {
 }
 
 // for network if the ips does not have any rules, then only last 
ip
-List userIps = 
_ipAddressDao.listByAssociatedNetwork(associatedWithNetworkId, null);
+final List userIps = 
_ipAddressDao.listByAssociatedNetwork(associatedWithNetworkId, null);
+boolean hasSourceNat = false;
+if (isVPC && userIps.size() > 0 && userIps.get(0) != null) {
+// All ips should belong to a VPC
+final Long vpcId = userIps.get(0).getVpcId();
+final List sourceNatIps = 
_ipAddressDao.listByAssociatedVpc(vpcId, true);
+if (sourceNatIps != null && sourceNatIps.size() > 0) {
+hasSourceNat = true;
+}
+}
 
 int ipsWithrules = 0;
 int ipsStaticNat = 0;
@@ -864,7 +873,7 @@ public class CommandSetupHelper {
 cmd.setAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE, 
dcVo.getNetworkType().toString());
 
 // if there is 1 static nat then it will be checked for remove at 
the resource
-if (ipsWithrules == 0 && ipsStaticNat == 0) {
+if (ipsWithrules == 0 && ipsStaticNat == 0 && !hasSourceNat) {
 // there is only one ip address for the network.
 cmd.setAccessDetail(NetworkElementCommand.NETWORK_PUB_LAST_IP, 
"true");
 } else {
diff --git a/test/integration/smoke/test_vpc_redundant.py 
b/test/integration/smoke/test_vpc_redundant.py
index b87ce43..e7b29b1 100644
--- a/test/integration/smoke/test_vpc_redundant.py
+++ b/test/integration/smoke/test_vpc_redundant.py
@@ -610,7 +610,7 @@ class TestVPCRedundancy(cloudstackTestCase):
 
 gc_wait = Configurations.list(self.apiclient, name="network.gc.wait")
 gc_interval = Configurations.list(self.apiclient, 
name="network.gc.interval")
-
+
 self.logger.debug("network.gc.wait is ==> %s" % gc_wait)
 self.logger.debug("network.gc.interval is ==> %s" % gc_interval)
 
@@ -628,7 +628,7 @@ class TestVPCRedundancy(cloudstackTestCase):
 
 @attr(tags=["advanced", "intervlan"], required_hardware="true")
 def 

[cloudstack] 33/34: CLOUDSTACK-9501: route is not available by default on CentOS7 (#1637)

[rohit]

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

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

commit 3dc2b4816756ad2bab0d4d10a84aed417831e254
Author: lmrv 
AuthorDate: Thu Dec 14 00:54:05 2017 +0530

CLOUDSTACK-9501: route is not available by default on CentOS7 (#1637)

This adds the `net-tools` dependency on CentOS cloudstack-agent rpms.
This will provide ifconfig, route and other tools that may be used
by CloudStack scripts and utilities.

Signed-off-by: Rohit Yadav 
---
 packaging/centos7/cloud.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 10b9c3e..caf1960 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -104,6 +104,7 @@ Requires: bridge-utils
 Requires: ebtables
 Requires: iptables
 Requires: ethtool
+Requires: net-tools
 Requires: iproute
 Requires: ipset
 Requires: perl

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

[cloudstack] 04/34: CLOUDSTACK-7853: Fix ping timeout edge case and refactor code

[rohit]

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

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

commit 86c21bade1c01a748ee77687f8e0a6375c879209
Author: Rohit Yadav 
AuthorDate: Sat Dec 2 15:50:34 2017 +0530

CLOUDSTACK-7853: Fix ping timeout edge case and refactor code

Refresh InaccurateClock every 10seconds, refactor code to get ping timeout
and ping interval.

Signed-off-by: Rohit Yadav 
---
 .../src/com/cloud/agent/manager/AgentManagerImpl.java| 16 
 .../main/java/com/cloud/utils/time/InaccurateClock.java  |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git 
a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java 
b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
index 325f3ec..7815c76 100644
--- a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -213,7 +213,7 @@ public class AgentManagerImpl extends ManagerBase 
implements AgentManager, Handl
 _nodeId = ManagementServerNode.getManagementServerId();
 s_logger.info("Configuring AgentManagerImpl. management server node 
id(msid): " + _nodeId);
 
-final long lastPing = (System.currentTimeMillis() >> 10) - (long) 
(PingTimeout.value() * PingInterval.value());
+final long lastPing = (System.currentTimeMillis() >> 10) - 
getTimeout();
 _hostDao.markHostsAsDisconnected(_nodeId, lastPing);
 
 registerForHostEvents(new BehindOnPingListener(), true, true, false);
@@ -241,8 +241,12 @@ public class AgentManagerImpl extends ManagerBase 
implements AgentManager, Handl
 return true;
 }
 
+protected int getPingInterval() {
+return PingInterval.value();
+}
+
 protected long getTimeout() {
-return (long) (PingTimeout.value() * PingInterval.value());
+return (long) (Math.ceil(PingTimeout.value() * PingInterval.value()));
 }
 
 @Override
@@ -358,10 +362,6 @@ public class AgentManagerImpl extends ManagerBase 
implements AgentManager, Handl
 return null;
 }
 
-protected int getPingInterval() {
-return PingInterval.value();
-}
-
 @Override
 public Answer send(final Long hostId, final Command cmd) throws 
AgentUnavailableException, OperationTimedoutException {
 final Commands cmds = new Commands(Command.OnError.Stop);
@@ -623,7 +623,7 @@ public class AgentManagerImpl extends ManagerBase 
implements AgentManager, Handl
 }
 }
 
-_monitorExecutor.scheduleWithFixedDelay(new MonitorTask(), 
PingInterval.value(), PingInterval.value(), TimeUnit.SECONDS);
+_monitorExecutor.scheduleWithFixedDelay(new MonitorTask(), 
getPingInterval(), getPingInterval(), TimeUnit.SECONDS);
 
 return true;
 }
@@ -1515,7 +1515,7 @@ public class AgentManagerImpl extends ManagerBase 
implements AgentManager, Handl
 attache = createAttacheForDirectConnect(host, resource);
 final StartupAnswer[] answers = new StartupAnswer[cmds.length];
 for (int i = 0; i < answers.length; i++) {
-answers[i] = new StartupAnswer(cmds[i], attache.getId(), 
PingInterval.value());
+answers[i] = new StartupAnswer(cmds[i], attache.getId(), 
getPingInterval());
 }
 attache.process(answers);
 
diff --git a/utils/src/main/java/com/cloud/utils/time/InaccurateClock.java 
b/utils/src/main/java/com/cloud/utils/time/InaccurateClock.java
index 2a22853..e03231d 100644
--- a/utils/src/main/java/com/cloud/utils/time/InaccurateClock.java
+++ b/utils/src/main/java/com/cloud/utils/time/InaccurateClock.java
@@ -63,7 +63,7 @@ public class InaccurateClock extends StandardMBean implements 
InaccurateClockMBe
 public synchronized String restart() {
 turnOff();
 s_executor = Executors.newScheduledThreadPool(1, new 
NamedThreadFactory("InaccurateClock"));
-s_executor.scheduleAtFixedRate(new SetTimeTask(), 0, 60, 
TimeUnit.SECONDS);
+s_executor.scheduleAtFixedRate(new SetTimeTask(), 0, 10, 
TimeUnit.SECONDS);
 return "Restarted";
 }
 

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

[cloudstack] 26/34: fix volume usage test case

[rohit]

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

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

commit 2716ede1133db78fb82f5d70a30d7dcce5b84081
Author: Rohit Yadav 
AuthorDate: Tue Dec 12 20:52:24 2017 +0530

fix volume usage test case

Signed-off-by: Rohit Yadav 
---
 server/src/com/cloud/server/StatsCollector.java |  2 +-
 test/integration/smoke/test_usage.py| 22 --
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/server/src/com/cloud/server/StatsCollector.java 
b/server/src/com/cloud/server/StatsCollector.java
index 96b51f5..d32ed98 100644
--- a/server/src/com/cloud/server/StatsCollector.java
+++ b/server/src/com/cloud/server/StatsCollector.java
@@ -937,7 +937,7 @@ public class StatsCollector extends ManagerBase implements 
ComponentMethodInterc
 }
 
 public VolumeStats getVolumeStats(String volumeLocator) {
-if (_volumeStats.containsKey(volumeLocator)) {
+if (volumeLocator != null && _volumeStats.containsKey(volumeLocator)) {
 return _volumeStats.get(volumeLocator);
 }
 return null;
diff --git a/test/integration/smoke/test_usage.py 
b/test/integration/smoke/test_usage.py
index e6c6565..4419835 100644
--- a/test/integration/smoke/test_usage.py
+++ b/test/integration/smoke/test_usage.py
@@ -680,26 +680,12 @@ class TestVolumeUsage(cloudstackTestCase):
 "Check VOLUME.DELETE in events table"
 )
 self.hypervisor = str(get_hypervisor_type(self.apiclient)).lower()
-if self.hypervisor == "vmware":
-self.testdata["coreos_volume"][
-"url"] = self.testdata["coreos_volume"]["urlvmware"]
-self.testdata["coreos_volume"]["format"] = "OVA"
-elif self.hypervisor == "xenserver":
-self.testdata["coreos_volume"][
-"url"] = self.testdata["coreos_volume"]["urlxen"]
-self.testdata["coreos_volume"]["format"] = "VHD"
-elif self.hypervisor == "kvm":
-self.testdata["coreos_volume"][
-"url"] = self.testdata["coreos_volume"]["urlkvm"]
-self.testdata["coreos_volume"]["format"] = "QCOW2"
-elif self.hypervisor == "hyperv":
-self.testdata["coreos_volume"][
-"url"] = self.testdata["coreos_volume"]["urlxen"]
-self.testdata["coreos_volume"]["format"] = "VHD"
-
+volume_template = self.testdata["test_templates"][self.hypervisor]
+volume_template["diskname"] = "Volume_tiny"
+volume_template["format"] = volume_template["format"].upper()
 volume_uploaded = Volume.upload(
 self.apiclient,
-self.testdata["coreos_volume"],
+volume_template,
 self.zone.id,
 account=self.account.name,
 domainid=self.account.domainid)

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

[cloudstack] 18/34: fsck on systemvm boot

[rohit]

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

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

commit 5c31b85b248d2dbf1d08f229b4133ecf87b3405a
Author: Rohit Yadav 
AuthorDate: Mon Dec 11 10:15:32 2017 +0530

fsck on systemvm boot

Signed-off-by: Rohit Yadav 
---
 test/integration/smoke/test_snapshots.py   | 2 +-
 tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh| 5 +++--
 tools/appliance/definitions/systemvmtemplate/configure_grub.sh | 2 +-
 tools/appliance/definitions/systemvmtemplate/finalize.sh   | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/test/integration/smoke/test_snapshots.py 
b/test/integration/smoke/test_snapshots.py
index a75a1e9..6e9a877 100644
--- a/test/integration/smoke/test_snapshots.py
+++ b/test/integration/smoke/test_snapshots.py
@@ -62,7 +62,7 @@ class TestSnapshotRootDisk(cloudstackTestCase):
 
 cls._cleanup = []
 if not cls.hypervisorNotSupported:
-cls.template = get_test_template(cls.apiclient, cl.zone.id, 
cls.hypervisor)
+cls.template = get_test_template(cls.apiclient, cls.zone.id, 
cls.hypervisor)
 if cls.template == FAILED:
 assert False, "get_test_template() failed to return template"
 
diff --git a/tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh 
b/tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh
index 6f37e34..2d7394d 100644
--- a/tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh
+++ b/tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh
@@ -19,10 +19,11 @@
 set -e
 set -x
 
-function remove_reserved_blocks() {
+function fix_tune2fs() {
   for partition in $(blkid -o list | grep ext | awk '{print $1}')
   do
 tune2fs -m0 $partition
+tune2fs -c 1 $partition
   done
   fdisk -l
   df -h
@@ -42,7 +43,7 @@ function apt_upgrade() {
   # Setup sudo
   echo 'cloud ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/cloud
 
-  remove_reserved_blocks
+  fix_tune2fs
   add_backports
 
   rm -fv /root/*.iso
diff --git a/tools/appliance/definitions/systemvmtemplate/configure_grub.sh 
b/tools/appliance/definitions/systemvmtemplate/configure_grub.sh
index 85f9da2..4a42dc6 100644
--- a/tools/appliance/definitions/systemvmtemplate/configure_grub.sh
+++ b/tools/appliance/definitions/systemvmtemplate/configure_grub.sh
@@ -28,7 +28,7 @@ GRUB_DEFAULT=0
 GRUB_TIMEOUT=0
 GRUB_DISTRIBUTOR=Debian
 GRUB_CMDLINE_LINUX_DEFAULT="quiet"
-GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8 console=hvc0 
earlyprintk=xen net.ifnames=0 biosdevname=0 debian-installer=en_US nomodeset"
+GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8 console=hvc0 
earlyprintk=xen net.ifnames=0 biosdevname=0 debian-installer=en_US 
fsck.mode=force nomodeset"
 GRUB_CMDLINE_XEN="com1=115200 console=com1"
 GRUB_TERMINAL="console serial"
 GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=0 --word=8 --parity=no 
--stop=1"
diff --git a/tools/appliance/definitions/systemvmtemplate/finalize.sh 
b/tools/appliance/definitions/systemvmtemplate/finalize.sh
index 912887c..febae7b 100644
--- a/tools/appliance/definitions/systemvmtemplate/finalize.sh
+++ b/tools/appliance/definitions/systemvmtemplate/finalize.sh
@@ -51,14 +51,14 @@ function cleanup_veewee() {
 
 # Zero out the free space to save space in the final image:
 function zero_disk() {
+  df -h
+  fstrim -av
   for path in / /boot /var/log /tmp
   do
 dd if=/dev/zero of=${path}/zero bs=1M || true
 sync
 rm -f ${path}/zero
   done
-  fstrim -av
-  df -h
 }
 
 function finalize() {

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

[cloudstack] 08/34: CLOUDSTACK-10013: Fix ipsec VPN configuration

[rohit]

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

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

commit ea11b69c5426abe71ed01ec127177a97798e8b62
Author: Rohit Yadav 
AuthorDate: Fri Dec 1 20:58:18 2017 +0530

CLOUDSTACK-10013: Fix ipsec VPN configuration

- Fixes strongswan/ipsec, l2tpd and pppd configs
- Uses auto=route in ipsec configs
- Fixes road-warrior setup
- Fixes site-to-site VPN with automatic connection configuration
- Fixes vpc_vpn tests

Signed-off-by: Rohit Yadav 
---
 systemvm/patches/debian/opt/cloud/bin/configure.py | 38 +-
 .../patches/debian/opt/cloud/bin/ipsectunnel.sh| 10 +-
 .../debian/opt/cloud/bin/monitor_service.sh|  2 --
 systemvm/patches/vpn/etc/ipsec.d/l2tp.conf | 12 +++
 systemvm/patches/vpn/etc/ppp/options.xl2tpd|  2 --
 systemvm/patches/vpn/opt/cloud/bin/vpn_l2tp.sh | 18 +-
 test/integration/smoke/test_vpc_vpn.py | 26 +++
 7 files changed, 55 insertions(+), 53 deletions(-)

diff --git a/systemvm/patches/debian/opt/cloud/bin/configure.py 
b/systemvm/patches/debian/opt/cloud/bin/configure.py
index 68d1c26..b8a3e02 100755
--- a/systemvm/patches/debian/opt/cloud/bin/configure.py
+++ b/systemvm/patches/debian/opt/cloud/bin/configure.py
@@ -546,10 +546,6 @@ class CsSite2SiteVpn(CsDataBag):
 ikepolicy=obj['ike_policy'].replace(';','-')
 esppolicy=obj['esp_policy'].replace(';','-')
 
-pfs='no'
-if 'modp' in esppolicy:
-pfs='yes'
-
 if rightpeer in self.confips:
 self.confips.remove(rightpeer)
 file = CsFile(vpnconffile)
@@ -557,7 +553,6 @@ class CsSite2SiteVpn(CsDataBag):
 file.search("conn ", "conn vpn-%s" % rightpeer)
 file.addeq(" left=%s" % leftpeer)
 file.addeq(" leftsubnet=%s" % obj['local_guest_cidr'])
-file.addeq(" leftnexthop=%s" % obj['local_public_gateway'])
 file.addeq(" right=%s" % rightpeer)
 file.addeq(" rightsubnet=%s" % peerlist)
 file.addeq(" type=tunnel")
@@ -567,9 +562,8 @@ class CsSite2SiteVpn(CsDataBag):
 file.addeq(" ikelifetime=%s" % 
self.convert_sec_to_h(obj['ike_lifetime']))
 file.addeq(" esp=%s" % esppolicy)
 file.addeq(" lifetime=%s" % self.convert_sec_to_h(obj['esp_lifetime']))
-file.addeq(" pfs=%s" % pfs)
 file.addeq(" keyingtries=2")
-file.addeq(" auto=start")
+file.addeq(" auto=route")
 if 'encap' not in obj:
 obj['encap']=False
 file.addeq(" forceencaps=%s" % CsHelper.bool_to_yn(obj['encap']))
@@ -585,10 +579,20 @@ class CsSite2SiteVpn(CsDataBag):
 logging.info("Configured vpn %s %s", leftpeer, rightpeer)
 CsHelper.execute("ipsec rereadsecrets")
 
-# This will load the new config and start the connection when needed 
since auto=start in the config
+# This will load the new config
 CsHelper.execute("ipsec reload")
 os.chmod(vpnsecretsfile, 0400)
 
+for i in xrange(3):
+result = CsHelper.execute('ipsec status vpn-%s | grep "%s"' % 
(rightpeer, peerlist.split(",", 1)[0]))
+if len(result) > 0:
+break
+time.sleep(1)
+
+# With 'auto=route', connections are established on an attempt to
+# communicate over the S2S VPN. This uses ping to initialize the 
connection.
+CsHelper.execute("timeout 5 ping -c 3 %s" % (peerlist.split("/", 
1)[0].replace(".0", ".1")))
+
 def convert_sec_to_h(self, val):
 hrs = int(val) / 3600
 return "%sh" % hrs
@@ -658,6 +662,7 @@ class CsRemoteAccessVpn(CsDataBag):
 self.confips = []
 
 logging.debug(self.dbag)
+
 for public_ip in self.dbag:
 if public_ip == "id":
 continue
@@ -665,12 +670,13 @@ class CsRemoteAccessVpn(CsDataBag):
 
 #Enable remote access vpn
 if vpnconfig['create']:
+shutdownIpsec = False
 logging.debug("Enabling  remote access vpn  on "+ public_ip)
 
 dev = CsHelper.get_device(public_ip)
 if dev == "":
-logging.error("Request for ipsec to %s not possible 
because ip is not configured", public_ip)
-continue
+logging.error("Request for ipsec to %s not possible 
because ip is not configured", public_ip)
+continue
 
 CsHelper.start_if_stopped("ipsec")
 self.configure_l2tpIpsec(public_ip, self.dbag[public_ip])
@@ -682,7 +688,6 @@ class CsRemoteAccessVpn(CsDataBag):
 CsHelper.execute("ipsec rereadsecrets")
 else:
 logging.debug("Disabling remote access vpn .")
-

[cloudstack] 21/34: systemvmtemplate enlargements

[rohit]

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

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

commit 2cb23efc51e4f3ceb4a8d5000fc07254f9bd6a0f
Author: Rohit Yadav 
AuthorDate: Mon Dec 11 18:23:11 2017 +0530

systemvmtemplate enlargements

Signed-off-by: Rohit Yadav 
---
 tools/appliance/definitions/systemvmtemplate/preseed.cfg | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/appliance/definitions/systemvmtemplate/preseed.cfg 
b/tools/appliance/definitions/systemvmtemplate/preseed.cfg
index 290d867..60bd9a8 100644
--- a/tools/appliance/definitions/systemvmtemplate/preseed.cfg
+++ b/tools/appliance/definitions/systemvmtemplate/preseed.cfg
@@ -63,17 +63,17 @@ d-i partman-auto/expert_recipe string   
  \
   use_filesystem{ } filesystem{ ext2 }\
   mountpoint{ /boot } \
   .   \
-  1000 40 1200 ext4   \
+  1300 40 1500 ext4   \
   method{ format } format{ }  \
   use_filesystem{ } filesystem{ ext4 }\
   mountpoint{ / } \
   .   \
-  700 70 800 ext4 \
+  550 70 800 ext4 \
   method{ format } format{ }  \
   use_filesystem{ } filesystem{ ext4 }\
   mountpoint{ /var }  \
   .   \
-  400 60 500 ext4 \
+  350 60 500 ext4 \
   method{ format } format{ }  \
   use_filesystem{ } filesystem{ ext4 }\
   mountpoint{ /var/log }  \
@@ -83,7 +83,7 @@ d-i partman-auto/expert_recipe string 
\
   use_filesystem{ } filesystem{ ext4 }\
   mountpoint{ /tmp }  \
   .   \
-  200 100 1024 linux-swap \
+  100 100 1024 linux-swap \
   method{ swap } format{ }\
   .
 

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

[cloudstack] 32/34: increase timeout as things run slow in nested-environments

[rohit]

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

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

commit a678ba7b6341003ee59404090c21b6c1cd9f7caf
Author: Rohit Yadav 
AuthorDate: Wed Dec 13 16:49:52 2017 +0530

increase timeout as things run slow in nested-environments

Signed-off-by: Rohit Yadav 
---
 test/integration/smoke/test_deploy_vm_root_resize.py | 8 
 test/integration/smoke/test_ssvm.py  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/integration/smoke/test_deploy_vm_root_resize.py 
b/test/integration/smoke/test_deploy_vm_root_resize.py
index 4855099..463b93e 100755
--- a/test/integration/smoke/test_deploy_vm_root_resize.py
+++ b/test/integration/smoke/test_deploy_vm_root_resize.py
@@ -126,9 +126,9 @@ class TestDeployVmRootSize(cloudstackTestCase):
  if cls.restartreq:
 cls.restartServer()
 
-#Giving 30 seconds to management to warm-up,
+#Giving 90 seconds to management to warm-up,
 #Experienced failures when trying to deploy a VM exactly when 
management came up
-time.sleep(30)
+time.sleep(90)
 
 #create a service offering
 cls.service_offering = ServiceOffering.create(
@@ -159,9 +159,9 @@ class TestDeployVmRootSize(cloudstackTestCase):
tags="")
 cls.restartServer()
 
-#Giving 30 seconds to management to warm-up,
+#Giving 90 seconds to management to warm-up,
 #Experienced failures when trying to deploy a VM exactly when 
management came up
-time.sleep(30)
+time.sleep(90)
 
 cleanup_resources(cls.api_client, cls._cleanup)
 except Exception as e:
diff --git a/test/integration/smoke/test_ssvm.py 
b/test/integration/smoke/test_ssvm.py
index 41db1ab..f20003b 100644
--- a/test/integration/smoke/test_ssvm.py
+++ b/test/integration/smoke/test_ssvm.py
@@ -73,7 +73,7 @@ class TestSSVMs(cloudstackTestCase):
 return list_host_response[0].state == 'Up', None
 return False, None
 
-res, _ = wait_until(3, self.services["sleep"], checkRunningAgent)
+res, _ = wait_until(3, 300, checkRunningAgent)
 if not res:
 raise Exception("Failed to wait for SSVM agent to be Up")
 
@@ -99,7 +99,7 @@ class TestSSVMs(cloudstackTestCase):
 return ssvm_response.state == 'Running', ssvm_response
 return False, None
 
-res, ssvm_response = wait_until(3, self.services["sleep"], 
checkRunningState)
+res, ssvm_response = wait_until(3, 300, checkRunningState)
 if not res:
 self.fail("Failed to reach systemvm state to Running")
 return ssvm_response

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

[cloudstack] 15/34: using debian 9.3.0 now :)

[rohit]

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

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

commit 6607ba9778f6bd26b905835cfa820ae7eb6f8dd5
Author: Rohit Yadav 
AuthorDate: Sun Dec 10 21:41:55 2017 +0530

using debian 9.3.0 now :)

Signed-off-by: Rohit Yadav 
---
 tools/appliance/definitions/systemvmtemplate/definition.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/appliance/definitions/systemvmtemplate/definition.rb 
b/tools/appliance/definitions/systemvmtemplate/definition.rb
index 03be568..917dd77 100644
--- a/tools/appliance/definitions/systemvmtemplate/definition.rb
+++ b/tools/appliance/definitions/systemvmtemplate/definition.rb
@@ -27,9 +27,9 @@ arch = 'amd64'
 architectures = {
 :amd64 => {
 :os_type_id => 'Debian_64',
-:iso_file => 'debian-9.2.1-amd64-netinst.iso',
-:iso_src => 
'https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-9.2.1-amd64-netinst.iso',
-:iso_sha512 => 
'ebfe25dc593967e39349b205480b0ec0103ef4a0468c602f4857e13d06d407bfe876162399e0e8d4dea5675953dc37ab585316f307ccf9f4440124b4f719df04'
+:iso_file => 'debian-9.3.0-amd64-netinst.iso',
+:iso_src => 
'https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-9.3.0-amd64-netinst.iso',
+:iso_sha512 => 
'8775231d6f56a3d8f116eb64fe048f5cbd2ea0f8c092a1cb7608bcb4106f9c85cb69ce68f53bd381019ab40f1c0316843036daf3fd9107c81c58a240334cc747'
 }
 }
 

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

[cloudstack] branch debian9-systemvmtemplate updated (737cdea -> ac9b898)

[rohit]

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

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


omit 737cdea  vmware related fixes
omit cb39c25  CLOUDSTACK-9501: route is not available by default on CentOS7 
(#1637)
omit 41eabaf  increase timeout as things run slow in nested-environments
omit 949e1f0  don't skip rvr tests for vmware
omit 4f4e798  process unprocessed cmd_line.json
omit 58f7fc0  rm rc.local!
omit 289e1c2  CLOUDSTACK-10187: Don't delete vifs for VPCs with source nat
omit 17285a4  fixes
omit e08d2d2  fix volume usage test case
omit 8135906  systemvm fixes
omit 6c304c5  more fixes
omit 159b160  fixes
omit c5241d3  use new get_test_templates
omit 6096177  systemvmtemplate enlargements
omit 939466d  rvr fixes
omit 979bb45  more fixes
omit 2f1ae96  fsck on systemvm boot
omit 821ac53  fix simulator build
omit da16bba  refactor tests, introduce a new get_test_template that 
returns a small testing template such as macchinina etc.
omit f5c1c4e  using debian 9.3.0 now :)
omit 51490db  update per new macchinina template
omit 23d59e4  more systemvmtemplate optimizations
omit 4d72077  CLOUDSTACK-10181: Skip rVR test cases for VMware until 
supported
omit ffe324f  CLOUDSTACK-10013: SystemVM codebase refactorings and 
improvements
omit 9b58f4c  CLOUDSTACK-10013: Make the generated VR/json files unique 
(ports #1470)
omit fa197e1  CLOUDSTACK-10010: Port marvin test from #2190 by @swill
omit f494d7d  CLOUDSTACK-10013: Fix ipsec VPN configuration
omit 6795ec5  CLOUDSTACK-10013: SystemVM.iso refactoring and cleanups
omit 132712c  CLOUDSTACK-10129: UX improvements and event timeline
omit 6f1c2e0  CLOUDSTACK-9348: Improve Nio SSH handshake buffers
omit b41c4fa  CLOUDSTACK-7853: Fix ping timeout edge case and refactor code
omit dcaf5f1  CLOUDSTACK-10013: Debian9 SystemVM appliance improvements
omit 4411bfa  CLOUDSTACK-10013: Make Debian9 systemvmtemplates work with 
systemd
omit a53a8dd  CLOUDSTACK-10013: Migrate systemvmtemplate to Debian9
 add 6ab2ba9  doc: replace virutal by virtual (typo)
 add d57b518  Merge pull request #2359 from exoscale/doc_virutal
 add fc49533  CLOUDSTACK-9986: Use host table to iterate for zone/cluster 
metrics (#2353)
 add 44a7eb0  CLOUDSTACK-10176: VM Start Api Job returns success for failed 
Job (#2354)
 add b417226  CLOUDSTACK-9839: Add XenServer 7.1 and 7.2 interoperablility 
(#2346)
 add 47419df  CLOUDSTACK-10039: Adding used IOPS to storage pool response 
(#2294)
 add 566238b  CLOUDSTACK-8908: After copying the template charging for that 
template is stopped (#2308)
 add 973a9c1  CLOUDSTACK-10003 automatic configure juniper srx/vsrx nat 
loopback, (#2184)
 new c72ca39  CLOUDSTACK-10013: Migrate systemvmtemplate to Debian9
 new d5680ad  CLOUDSTACK-10013: Make Debian9 systemvmtemplates work with 
systemd
 new c5f8543  CLOUDSTACK-10013: Debian9 SystemVM appliance improvements
 new 86c21ba  CLOUDSTACK-7853: Fix ping timeout edge case and refactor code
 new b62ea9e  CLOUDSTACK-9348: Improve Nio SSH handshake buffers
 new 5882244  CLOUDSTACK-10129: UX improvements and event timeline
 new 9f7fdb6  CLOUDSTACK-10013: SystemVM.iso refactoring and cleanups
 new ea11b69  CLOUDSTACK-10013: Fix ipsec VPN configuration
 new efc63d6  CLOUDSTACK-10010: Port marvin test from #2190 by @swill
 new 6ea2717  CLOUDSTACK-10013: Make the generated VR/json files unique 
(ports #1470)
 new 795963b  CLOUDSTACK-10013: SystemVM codebase refactorings and 
improvements
 new 779f2b1  CLOUDSTACK-10181: Skip rVR test cases for VMware until 
supported
 new e0c2f00  more systemvmtemplate optimizations
 new dc4b7ab  update per new macchinina template
 new 6607ba9  using debian 9.3.0 now :)
 new 83b5e1e  refactor tests, introduce a new get_test_template that 
returns a small testing template such as macchinina etc.
 new daa55ae  fix simulator build
 new 5c31b85  fsck on systemvm boot
 new a8a929c  more fixes
 new d691a70  rvr fixes
 new 2cb23ef  systemvmtemplate enlargements
 new 5b2c68e  use new get_test_templates
 new 7ed696a  fixes
 new 27704a92 more fixes
 new 4b4cec6  systemvm fixes
 new 2716ede  fix volume usage test case
 new cbaca70  fixes
 new 4394136  CLOUDSTACK-10187: Don't delete vifs for VPCs with source nat
 new e8314a0  rm rc.local!
 new 6730e7f  process unprocessed cmd_line.json
 new aa51d5b  don't skip rvr tests for vmware
 new a678ba7  increase timeout as things run slow in nested-environments
 new 3dc2b48  CLOUDSTACK-9501: route is not available by default on CentOS7 
(#1637)
 new ac9b898  vmware related fixes

This update added new revisions after undoing existing revisions.
That is to say, some 

[cloudstack] 13/34: more systemvmtemplate optimizations

[rohit]

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

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

commit e0c2f0042f5c1144be3a8b112a4994ffb1ac0b6c
Author: Rohit Yadav 
AuthorDate: Sat Dec 9 16:37:31 2017 +0530

more systemvmtemplate optimizations

Signed-off-by: Rohit Yadav 
---
 systemvm/debian/opt/cloud/bin/setup/postinit.sh   | 15 ++-
 tools/appliance/build.sh  |  2 +-
 tools/appliance/definitions/systemvmtemplate/cleanup.sh   |  1 +
 tools/appliance/definitions/systemvmtemplate/finalize.sh  |  1 +
 .../systemvmtemplate/install_systemvm_packages.sh |  2 +-
 tools/appliance/definitions/systemvmtemplate/preseed.cfg  |  6 +++---
 6 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/systemvm/debian/opt/cloud/bin/setup/postinit.sh 
b/systemvm/debian/opt/cloud/bin/setup/postinit.sh
index efd1b4b..9a16966 100755
--- a/systemvm/debian/opt/cloud/bin/setup/postinit.sh
+++ b/systemvm/debian/opt/cloud/bin/setup/postinit.sh
@@ -15,9 +15,17 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
+#
 # This scripts before ssh.service but after cloud-early-config
 
+# Eject cdrom if any
+eject || true
+
+# Refresh and setup systemd
+chmod -x /etc/systemd/system/cloud*.service
+systemctl daemon-reload
+
+# Setup router
 CMDLINE=/var/cache/cloud/cmdline
 for str in $(cat $CMDLINE)
   do
@@ -32,15 +40,12 @@ for str in $(cat $CMDLINE)
 esac
 done
 
-chmod -x /etc/systemd/system/cloud*.service
-systemctl daemon-reload
-
 if [ "$TYPE" == "router" ] || [ "$TYPE" == "vpcrouter" ] || [ "$TYPE" == 
"dhcpsrvr" ]
 then
   if [ -x /opt/cloud/bin/update_config.py ]
   then
   /opt/cloud/bin/update_config.py cmd_line.json
-  logger -t cloud "Updated config: cmd_line.json"
+  logger -t cloud "postinit: Updated config cmd_line.json"
   fi
 fi
 
diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh
index 45f4728..6f2ab6b 100755
--- a/tools/appliance/build.sh
+++ b/tools/appliance/build.sh
@@ -397,7 +397,7 @@ function stage_vmx (){
 displayname = "${1}"
 annotation = "${1}"
 guestos = "otherlinux-64"
-virtualhw.version = "7"
+virtualHW.version = "8"
 config.version = "8"
 numvcpus = "1"
 cpuid.coresPerSocket = "1"
diff --git a/tools/appliance/definitions/systemvmtemplate/cleanup.sh 
b/tools/appliance/definitions/systemvmtemplate/cleanup.sh
index 00f068d..f1591ac 100644
--- a/tools/appliance/definitions/systemvmtemplate/cleanup.sh
+++ b/tools/appliance/definitions/systemvmtemplate/cleanup.sh
@@ -64,6 +64,7 @@ function cleanup_misc() {
   rm -fr /usr/share/man
   rm -fr /usr/share/info
   rm -fr /usr/share/lintian
+  rm -fr /usr/share/vim
   find /usr/share/locale -type f | grep -v en | xargs rm -fr
 }
 
diff --git a/tools/appliance/definitions/systemvmtemplate/finalize.sh 
b/tools/appliance/definitions/systemvmtemplate/finalize.sh
index 1a25e39..912887c 100644
--- a/tools/appliance/definitions/systemvmtemplate/finalize.sh
+++ b/tools/appliance/definitions/systemvmtemplate/finalize.sh
@@ -57,6 +57,7 @@ function zero_disk() {
 sync
 rm -f ${path}/zero
   done
+  fstrim -av
   df -h
 }
 
diff --git 
a/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh 
b/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh
index 40ff6df..b60f908 100644
--- a/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh
+++ b/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh
@@ -53,7 +53,7 @@ function install_packages() {
   fi
 
   ${apt_get} install grub-legacy \
-rsyslog logrotate cron net-tools ifupdown vim netbase iptables \
+rsyslog logrotate cron net-tools ifupdown tmux vim netbase iptables \
 openssh-server e2fsprogs tcpdump socat wget \
 python bzip2 sed gawk diffutils grep gzip less tar telnet ftp rsync 
traceroute psmisc lsof procps \
 inetutils-ping iputils-arping httping  curl \
diff --git a/tools/appliance/definitions/systemvmtemplate/preseed.cfg 
b/tools/appliance/definitions/systemvmtemplate/preseed.cfg
index 5a8e2d9..7fbe2a1 100644
--- a/tools/appliance/definitions/systemvmtemplate/preseed.cfg
+++ b/tools/appliance/definitions/systemvmtemplate/preseed.cfg
@@ -57,7 +57,7 @@ d-i partman-auto/method string regular
 d-i partman-auto/choose_recipe select atomic
 d-i partman-auto/expert_recipe string \
   boot-root ::\
-  50 50 50 ext2   \
+  100 50 100 ext2 \
   $primary{ } $bootable{ }\
   method{ format } format{ }  \
   use_filesystem{ } filesystem{ 

[cloudstack] 30/34: process unprocessed cmd_line.json

[rohit]

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

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

commit 6730e7f1d2c74c86959015fe2a3d304db887a1f8
Author: Rohit Yadav 
AuthorDate: Wed Dec 13 15:57:05 2017 +0530

process unprocessed cmd_line.json

Signed-off-by: Rohit Yadav 
---
 systemvm/debian/opt/cloud/bin/update_config.py | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/systemvm/debian/opt/cloud/bin/update_config.py 
b/systemvm/debian/opt/cloud/bin/update_config.py
index 7b86378..c22aea0 100755
--- a/systemvm/debian/opt/cloud/bin/update_config.py
+++ b/systemvm/debian/opt/cloud/bin/update_config.py
@@ -112,6 +112,12 @@ def is_guestnet_configured(guestnet_dict, keys):
 
 return exists
 
+# If the command line json file is unprocessed process it
+# This is important or, the control interfaces will get deleted!
+if jsonFilename != "cmd_line.json" and os.path.isfile(jsonPath % 
"cmd_line.json"):
+qf = QueueFile()
+qf.setFile("cmd_line.json")
+qf.load(None)
 
 if not (os.path.isfile(jsonConfigFile) and os.access(jsonConfigFile, os.R_OK)):
 print "[ERROR] update_config.py :: Unable to read and access %s to process 
it" % jsonConfigFile

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

[cloudstack] 24/34: more fixes

[rohit]

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

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

commit 27704a92c60066110664afaf38a6345b4c2e3d90
Author: Rohit Yadav 
AuthorDate: Tue Dec 12 12:31:33 2017 +0530

more fixes

Signed-off-by: Rohit Yadav 
---
 .../cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java  |  4 
 server/src/com/cloud/server/StatsCollector.java  | 12 ++--
 systemvm/debian/etc/issue|  2 +-
 test/integration/smoke/test_nic.py   |  6 +++---
 test/integration/smoke/test_service_offerings.py |  2 +-
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git 
a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
 
b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
index 7f2e156..3ce96a6 100644
--- 
a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
+++ 
b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
@@ -216,6 +216,10 @@ public class AsyncJobManagerImpl extends ManagerBase 
implements AsyncJobManager,
 @SuppressWarnings("rawtypes")
 final GenericDao dao = GenericDaoBase.getDao(job.getClass());
 
+if (dao == null) {
+throw new CloudRuntimeException(String.format("Failed to get 
dao from job's class=%s, for job id=%d, cmd=%s", job.getClass(), job.getId(), 
job.getCmd()));
+}
+
 publishOnEventBus(job, "submit");
 
 if (!_vmInstanceDao.lockInLockTable(String.valueOf(syncObjId), 
VmJobLockTimeout.value())){
diff --git a/server/src/com/cloud/server/StatsCollector.java 
b/server/src/com/cloud/server/StatsCollector.java
index 305711e..96b51f5 100644
--- a/server/src/com/cloud/server/StatsCollector.java
+++ b/server/src/com/cloud/server/StatsCollector.java
@@ -918,7 +918,12 @@ public class StatsCollector extends ManagerBase implements 
ComponentMethodInterc
 try {
 HashMap volumeStatsByUuid = 
_userVmMgr.getVolumeStatistics(pool.getClusterId(), pool.getUuid(), 
pool.getPoolType(), volumeLocators, StatsTimeout.value());
 if (volumeStatsByUuid != null){
-_volumeStats.putAll(volumeStatsByUuid);
+for (final Map.Entry 
entry : volumeStatsByUuid.entrySet()) {
+if (entry == null || entry.getKey() == null || 
entry.getValue() == null) {
+continue;
+}
+_volumeStats.put(entry.getKey(), 
entry.getValue());
+}
 }
 } catch (Exception e) {
 s_logger.warn("Failed to get volume stats for cluster 
with ID: " + pool.getClusterId(), e);
@@ -932,7 +937,10 @@ public class StatsCollector extends ManagerBase implements 
ComponentMethodInterc
 }
 
 public VolumeStats getVolumeStats(String volumeLocator) {
-return _volumeStats.get(volumeLocator);
+if (_volumeStats.containsKey(volumeLocator)) {
+return _volumeStats.get(volumeLocator);
+}
+return null;
 }
 
 class StorageCollector extends ManagedContextRunnable {
diff --git a/systemvm/debian/etc/issue b/systemvm/debian/etc/issue
index 2d2b7c0..fdef90e 100644
--- a/systemvm/debian/etc/issue
+++ b/systemvm/debian/etc/issue
@@ -1,3 +1,3 @@
-   __?.o/  Apache CloudStack SystemVM 4.11
+   __?.o/  Apache CloudStack SystemVM
   (  )#https://cloudstack.apache.org
  (___(_)   \s \r \n \l
diff --git a/test/integration/smoke/test_nic.py 
b/test/integration/smoke/test_nic.py
index 584ccf5..c7f8468 100644
--- a/test/integration/smoke/test_nic.py
+++ b/test/integration/smoke/test_nic.py
@@ -22,7 +22,7 @@ from marvin.lib.base import (Account,
  VirtualMachine,
  NetworkOffering)
 from marvin.lib.common import (get_zone,
-   get_test_template,
+   get_template,
get_domain)
 from marvin.lib.utils import validateList
 from marvin.codes import PASS
@@ -76,10 +76,10 @@ class TestNic(cloudstackTestCase):
 self.services["service_offerings"][
 "tiny"]["storagetype"] = 'local'
 
-template = get_test_template(
+template = get_template(
 self.apiclient,
 self.zone.id,
-self.hypervisor
+self.services["ostype"]
 )
 # Set Zones and disk offerings
 

[cloudstack] 22/34: use new get_test_templates

[rohit]

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

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

commit 5b2c68e38a2c549e9e0eb5b35606a8442672ea91
Author: Rohit Yadav 
AuthorDate: Mon Dec 11 21:40:49 2017 +0530

use new get_test_templates

Signed-off-by: Rohit Yadav 
---
 test/integration/smoke/test_accounts.py| 22 +++--
 test/integration/smoke/test_affinity_groups.py | 10 +++---
 .../smoke/test_affinity_groups_projects.py | 11 ---
 test/integration/smoke/test_deploy_vm_iso.py   |  7 +++--
 test/integration/smoke/test_host_maintenance.py|  6 ++--
 test/integration/smoke/test_hostha_kvm.py  |  4 +--
 test/integration/smoke/test_list_ids_parameter.py  | 10 +++---
 .../smoke/test_nested_virtualization.py| 15 +
 test/integration/smoke/test_network.py | 36 +++---
 test/integration/smoke/test_nic.py |  6 ++--
 test/integration/smoke/test_projects.py|  7 +++--
 test/integration/smoke/test_reset_vm_on_reboot.py  |  7 +++--
 test/integration/smoke/test_router_dhcphosts.py| 12 +---
 test/integration/smoke/test_vpc_router_nics.py | 30 ++
 14 files changed, 98 insertions(+), 85 deletions(-)

diff --git a/test/integration/smoke/test_accounts.py 
b/test/integration/smoke/test_accounts.py
index a64d922..00047bf 100644
--- a/test/integration/smoke/test_accounts.py
+++ b/test/integration/smoke/test_accounts.py
@@ -32,7 +32,7 @@ from marvin.lib.base import (Domain,
  PublicIPAddress)
 from marvin.lib.common import (get_domain,
get_zone,
-   get_template,
+   get_test_template,
list_accounts,
list_virtual_machines,
list_service_offering,
@@ -128,11 +128,12 @@ class TestAccounts(cloudstackTestCase):
 
 cls.services = Services().services
 cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+cls.hypervisor = cls.testClient.getHypervisorInfo()
 cls.services['mode'] = cls.zone.networktype
-cls.template = get_template(
+cls.template = get_test_template(
 cls.api_client,
 cls.zone.id,
-cls.services["ostype"]
+cls.hypervisor
 )
 cls.services["virtual_machine"]["zoneid"] = cls.zone.id
 cls.services["virtual_machine"]["template"] = cls.template.id
@@ -270,11 +271,12 @@ class TestRemoveUserFromAccount(cloudstackTestCase):
 
 cls.services = Services().services
 cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+cls.hypervisor = cls.testClient.getHypervisorInfo()
 cls.services['mode'] = cls.zone.networktype
-cls.template = get_template(
+cls.template = get_test_template(
 cls.api_client,
 cls.zone.id,
-cls.services["ostype"]
+cls.hypervisor
 )
 cls.services["virtual_machine"]["zoneid"] = cls.zone.id
 cls.services["virtual_machine"]["template"] = cls.template.id
@@ -948,6 +950,7 @@ class TestAddVmToSubDomain(cloudstackTestCase):
 cls.services = Services().services
 cls.domain = get_domain(cls.api_client)
 cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+cls.hypervisor = cls.testClient.getHypervisorInfo()
 cls.services['mode'] = cls.zone.networktype
 cls.sub_domain = Domain.create(
 cls.api_client,
@@ -983,10 +986,10 @@ class TestAddVmToSubDomain(cloudstackTestCase):
 cls.sub_domain,
 cls.service_offering
 ]
-cls.template = get_template(
+cls.template = get_test_template(
 cls.api_client,
 cls.zone.id,
-cls.services["ostype"]
+cls.hypervisor
 )
 cls.services["virtual_machine"]["zoneid"] = cls.zone.id
 cls.vm_1 = VirtualMachine.create(
@@ -1717,12 +1720,13 @@ class TestDomainForceRemove(cloudstackTestCase):
 cls.services = Services().services
 cls.domain = get_domain(cls.api_client)
 cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+cls.hypervisor = cls.testClient.getHypervisorInfo()
 cls.services['mode'] = cls.zone.networktype
 
-cls.template = get_template(
+cls.template = get_test_template(
 cls.api_client,
 cls.zone.id,
-cls.services["ostype"]
+cls.hypervisor
 )
 
 cls.services["virtual_machine"]["zoneid"] = cls.zone.id
diff --git a/test/integration/smoke/test_affinity_groups.py 

[cloudstack] 09/34: CLOUDSTACK-10010: Port marvin test from #2190 by @swill

[rohit]

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

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

commit efc63d6405f54185d239697cd73b52fa12bf12eb
Author: Will Stevens 
AuthorDate: Sat Dec 2 21:11:40 2017 +0530

CLOUDSTACK-10010: Port marvin test from #2190 by @swill

This ports the S2S config test by @swill from #2190 with additional
changes to make robust and environment agnostic.

Signed-off-by: Rohit Yadav 
---
 test/integration/smoke/test_vpc_vpn.py | 468 -
 1 file changed, 463 insertions(+), 5 deletions(-)

diff --git a/test/integration/smoke/test_vpc_vpn.py 
b/test/integration/smoke/test_vpc_vpn.py
index 83c244b..b3dfab2 100644
--- a/test/integration/smoke/test_vpc_vpn.py
+++ b/test/integration/smoke/test_vpc_vpn.py
@@ -1138,8 +1138,19 @@ class TestRVPCSite2SiteVpn(cloudstackTestCase):
 self.apiclient, customer2_response.id, vpn1_response['id'])
 self.debug("VPN connection created for VPC %s" % vpc1.id)
 
-self.assertEqual(
-vpnconn2_response['state'], "Connected", "Failed to connect 
between VPCs!")
+def checkVpnConnected():
+connections = Vpn.listVpnConnection(
+self.apiclient,
+listall='true',
+vpcid=vpc2.id)
+if isinstance(connections, list):
+return connections[0].state == 'Connected', None
+return False, None
+
+# Wait up to 60 seconds for passive connection to show up as Connected
+res, _ = wait_until(2, 30, checkVpnConnected)
+if not res:
+self.fail("Failed to connect between VPCs, see VPN state as 
Connected")
 
 # acquire an extra ip address to use to ssh into vm2
 try:
@@ -1174,9 +1185,8 @@ class TestRVPCSite2SiteVpn(cloudstackTestCase):
 
 if ssh_client:
 # run ping test
-packet_loss = ssh_client.execute(
-"/bin/ping -c 3 -t 10 " + vm1.nic[0].ipaddress + " |grep 
packet|cut -d ' ' -f 7| cut -f1 -d'%'")[0]
-self.assert_(int(packet_loss) == 0, "Ping did not succeed")
+packet_loss = ssh_client.execute("/bin/ping -c 3 -t 10 " + 
vm1.nic[0].ipaddress + " | grep packet | sed 's/.*received, //g' | sed 's/[% 
]*packet.*//g'")[0]
+self.assert_(int(packet_loss) < 50, "Ping did not succeed")
 else:
 self.fail("Failed to setup ssh connection to %s" % vm2.public_ip)
 
@@ -1189,3 +1199,451 @@ class TestRVPCSite2SiteVpn(cloudstackTestCase):
 cleanup_resources(cls.apiclient, cls.cleanup)
 except Exception, e:
 raise Exception("Cleanup failed with %s" % e)
+
+
+class TestVPCSite2SiteVPNMultipleOptions(cloudstackTestCase):
+
+@classmethod
+def setUpClass(cls):
+cls.logger = logging.getLogger('TestVPCSite2SiteVPNMultipleOptions')
+cls.stream_handler = logging.StreamHandler()
+cls.logger.setLevel(logging.DEBUG)
+cls.logger.addHandler(cls.stream_handler)
+
+testClient = super(TestVPCSite2SiteVPNMultipleOptions, 
cls).getClsTestClient()
+cls.apiclient = testClient.getApiClient()
+cls.services = Services().services
+
+cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
+cls.domain = get_domain(cls.apiclient)
+
+cls.compute_offering = ServiceOffering.create(
+cls.apiclient,
+cls.services["compute_offering"]
+)
+
+cls.account = Account.create(
+cls.apiclient, services=cls.services["account"])
+
+cls.hypervisor = testClient.getHypervisorInfo()
+
+cls.logger.debug("Downloading Template: %s from: %s" % 
(cls.services["template"][
+ cls.hypervisor.lower()], 
cls.services["template"][cls.hypervisor.lower()]["url"]))
+cls.template = Template.register(cls.apiclient, 
cls.services["template"][cls.hypervisor.lower(
+)], cls.zone.id, hypervisor=cls.hypervisor.lower(), 
account=cls.account.name, domainid=cls.domain.id)
+cls.template.download(cls.apiclient)
+
+if cls.template == FAILED:
+assert False, "get_template() failed to return template"
+
+cls.logger.debug("Successfully created account: %s, id: \
+   %s" % (cls.account.name,
+  cls.account.id))
+
+cls.cleanup = [cls.account, cls.compute_offering]
+return
+
+def _get_ssh_client(self, virtual_machine, services, retries):
+""" Setup ssh client connection and return connection
+vm requires attributes public_ip, public_port, username, password """
+
+try:
+ssh_client = SshClient(
+virtual_machine.public_ip,
+services["virtual_machine"]["ssh_port"],
+

[cloudstack] 10/34: CLOUDSTACK-10013: Make the generated VR/json files unique (ports #1470)

[rohit]

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

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

commit 6ea2717edad57cf2cd7a61edf93a3dc07eeda1be
Author: Remi Bergsma 
AuthorDate: Sat Dec 2 23:19:14 2017 +0530

CLOUDSTACK-10013: Make the generated VR/json files unique (ports #1470)

This ports PR #1470 by @remibergsma.

Make the generated json files unique to prevent concurrency issues:
The json files now have UUIDs to prevent them from getting overwritten
before they've been executed. Prevents config to be pushed to the wrong
router.

2016-02-25 18:32:23,797 DEBUG [c.c.a.t.Request] 
(AgentManager-Handler-1:null) (logid:) Seq 2-4684025087442026584: Processing:  
{ Ans: , MgmtId: 90520732674657, via: 2, Ver: v1, Flags: 10, 
[{"com.cloud.agent.api.routing.GroupA
nswer":{"results":["null - success: null","null - success: [INFO] 
update_config.py :: Processing incoming file => 
vm_dhcp_entry.json.4ea45061-2efb-4467-8eaa-db3d77fb0a7b\n[INFO] Processing JSON 
file vm_dhcp_entry.json.4ea4506
1-2efb-4467-8eaa-db3d77fb0a7b\n"],"result":true,"wait":0}}] }

On the router:
2016-02-25 18:32:23,416  merge.py __moveFile:298 Processed file written to 
/var/cache/cloud/processed/vm_dhcp_entry.json.4ea45061-2efb-4467-8eaa-db3d77fb0a7b.gz

Signed-off-by: Rohit Yadav 
---
 .../facade/AbstractConfigItemFacade.java   |  21 +-
 .../kvm/resource/LibvirtComputingResource.java |   5 +
 systemvm/patches/debian/etc/rc.local   |   9 -
 systemvm/patches/debian/opt/cloud/bin/configure.py | 220 +
 systemvm/patches/debian/opt/cloud/bin/merge.py |  37 ++--
 .../patches/debian/opt/cloud/bin/update_config.py  |  22 ++-
 6 files changed, 159 insertions(+), 155 deletions(-)

diff --git 
a/core/src/com/cloud/agent/resource/virtualnetwork/facade/AbstractConfigItemFacade.java
 
b/core/src/com/cloud/agent/resource/virtualnetwork/facade/AbstractConfigItemFacade.java
index f017384..a083012 100644
--- 
a/core/src/com/cloud/agent/resource/virtualnetwork/facade/AbstractConfigItemFacade.java
+++ 
b/core/src/com/cloud/agent/resource/virtualnetwork/facade/AbstractConfigItemFacade.java
@@ -22,6 +22,8 @@ package com.cloud.agent.resource.virtualnetwork.facade;
 import java.util.Hashtable;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.UUID;
+import org.apache.log4j.Logger;
 
 import com.cloud.agent.api.BumpUpPriorityCommand;
 import com.cloud.agent.api.SetupGuestNetworkCommand;
@@ -58,6 +60,8 @@ import com.google.gson.GsonBuilder;
 
 public abstract class AbstractConfigItemFacade {
 
+private static final Logger s_logger = 
Logger.getLogger(AbstractConfigItemFacade.class);
+
 private final static Gson gson;
 
 private static Hashtable flyweight = new Hashtable();
@@ -104,13 +108,26 @@ public abstract class AbstractConfigItemFacade {
 return instance;
 }
 
+private static String appendUuidToJsonFiles(final String filename) {
+String remoteFileName = new String(filename);
+if (remoteFileName.endsWith("json")) {
+remoteFileName += "." + UUID.randomUUID().toString();
+}
+return remoteFileName;
+}
+
 protected List generateConfigItems(final ConfigBase 
configuration) {
 final List cfg = new LinkedList<>();
 
-final ConfigItem configFile = new 
FileConfigItem(VRScripts.CONFIG_PERSIST_LOCATION, destinationFile, 
gson.toJson(configuration));
+final String remoteFilename = appendUuidToJsonFiles(destinationFile);
+if (s_logger.isDebugEnabled()) {
+s_logger.debug("Transformed filename: " + destinationFile + " to: 
" + remoteFilename);
+}
+
+final ConfigItem configFile = new 
FileConfigItem(VRScripts.CONFIG_PERSIST_LOCATION, remoteFilename, 
gson.toJson(configuration));
 cfg.add(configFile);
 
-final ConfigItem updateCommand = new 
ScriptConfigItem(VRScripts.UPDATE_CONFIG, destinationFile);
+final ConfigItem updateCommand = new 
ScriptConfigItem(VRScripts.UPDATE_CONFIG, remoteFilename);
 cfg.add(updateCommand);
 
 return cfg;
diff --git 
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
 
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 952fe9e..2e5d571 100644
--- 
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ 
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -332,6 +332,9 @@ public class LibvirtComputingResource extends 
ServerResourceBase implements Serv
 if (details == null) {
 details = parser.getLines();
 }
+
+

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

[GitBox]

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


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

[GitBox]

blueorangutan 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-352160950
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1386


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 #2351: CLOUDSTACK-10173: VR's guest/public nic to pick network rate from offering

[GitBox]

blueorangutan commented on issue #2351: CLOUDSTACK-10173: VR's guest/public nic 
to pick network rate from offering
URL: https://github.com/apache/cloudstack/pull/2351#issuecomment-352160258
 
 
   @rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been 
kicked to run smoke tests


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2351: CLOUDSTACK-10173: VR's guest/public nic to pick network rate from offering

[GitBox]

rhtyd commented on issue #2351: CLOUDSTACK-10173: VR's guest/public nic to pick 
network rate from offering
URL: https://github.com/apache/cloudstack/pull/2351#issuecomment-352160235
 
 
   @blueorangutan test


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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

[GitBox]

blueorangutan 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-352159943
 
 
   @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted 
as I make progress.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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

[GitBox]

rhtyd 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-352159933
 
 
   @blueorangutan package


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2347: CLOUDSTACK-10166: Get accountId and domainId from VPC when tagging a NetworkACL as a user

[GitBox]

rhtyd commented on issue #2347: CLOUDSTACK-10166: Get accountId and domainId 
from VPC when tagging a NetworkACL as a user
URL: https://github.com/apache/cloudstack/pull/2347#issuecomment-352159827
 
 
   @khos2ow I see a new regression in failed test 
`test_01_single_VPC_iptables_policies`, rest are known failures fixed in #2211. 
Please check and fix the PR if necessary.


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 #2258: Cloudstack 10064: Secondary storage Usage for uploadedVolume is not collected

[GitBox]

rhtyd commented on issue #2258: Cloudstack 10064: Secondary storage Usage for 
uploadedVolume is not collected
URL: https://github.com/apache/cloudstack/pull/2258#issuecomment-352159799
 
 
   @PranaliM the new test still fails, please check and fix.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd closed pull request #2184: CLOUDSTACK-10003 automatic configure juniper srx/vsrx nat loopback,

[GitBox]

rhtyd closed pull request #2184: CLOUDSTACK-10003 automatic configure juniper 
srx/vsrx nat loopback,
URL: https://github.com/apache/cloudstack/pull/2184
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git 
a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
 
b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
index d60ccb67240..64d13485abb 100644
--- 
a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
+++ 
b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
@@ -303,7 +303,7 @@ public String getCountName() {
 }
 
 private enum SrxCommand {
-LOGIN, OPEN_CONFIGURATION, CLOSE_CONFIGURATION, COMMIT, ROLLBACK, 
CHECK_IF_EXISTS, CHECK_IF_IN_USE, ADD, DELETE, GET_ALL;
+LOGIN, OPEN_CONFIGURATION, CLOSE_CONFIGURATION, COMMIT, ROLLBACK, 
CHECK_IF_EXISTS, CHECK_IF_IN_USE, ADD, DELETE, GET_ALL, CHECK_PRIVATE_IF_EXISTS;
 }
 
 private enum Protocol {
@@ -2011,6 +2011,7 @@ private String genStaticNatRuleName(String publicIp, 
String privateIp) {
 
 private boolean manageStaticNatRule(SrxCommand command, String publicIp, 
String privateIp) throws ExecutionException {
 String ruleName = genStaticNatRuleName(publicIp, privateIp);
+String ruleName_private = genStaticNatRuleName(privateIp, publicIp);
 String xml;
 
 switch (command) {
@@ -2022,7 +2023,13 @@ private boolean manageStaticNatRule(SrxCommand command, 
String publicIp, String
 xml = replaceXmlValue(xml, "from-zone", _publicZone);
 xml = replaceXmlValue(xml, "rule-name", ruleName);
 return sendRequestAndCheckResponse(command, xml, "name", 
ruleName);
-
+case CHECK_PRIVATE_IF_EXISTS:
+xml = SrxXml.STATIC_NAT_RULE_GETONE.getXml();
+xml = setDelete(xml, false);
+xml = replaceXmlValue(xml, "rule-set", _privateZone);
+xml = replaceXmlValue(xml, "from-zone", _privateZone);
+xml = replaceXmlValue(xml, "rule-name", ruleName_private);
+return sendRequestAndCheckResponse(command, xml, "name", 
ruleName_private);
 case ADD:
 if (manageStaticNatRule(SrxCommand.CHECK_IF_EXISTS, publicIp, 
privateIp)) {
 return true;
@@ -2038,6 +2045,16 @@ private boolean manageStaticNatRule(SrxCommand command, 
String publicIp, String
 if (!sendRequestAndCheckResponse(command, xml)) {
 throw new ExecutionException("Failed to add static NAT 
rule from public IP " + publicIp + " to private IP " + privateIp);
 } else {
+xml = SrxXml.STATIC_NAT_RULE_ADD.getXml();
+xml = replaceXmlValue(xml, "rule-set", _privateZone);
+xml = replaceXmlValue(xml, "from-zone", _privateZone);
+xml = replaceXmlValue(xml, "rule-name", ruleName_private);
+xml = replaceXmlValue(xml, "original-ip", publicIp);
+xml = replaceXmlValue(xml, "translated-ip", privateIp);
+if (!sendRequestAndCheckResponse(command, xml))
+{
+throw new ExecutionException("Failed to add trust 
static NAT rule from public IP " + publicIp + " to private IP " + privateIp);
+}
 return true;
 }
 
@@ -2055,6 +2072,18 @@ private boolean manageStaticNatRule(SrxCommand command, 
String publicIp, String
 if (!sendRequestAndCheckResponse(command, xml, "name", 
ruleName)) {
 throw new ExecutionException("Failed to delete static NAT 
rule from public IP " + publicIp + " to private IP " + privateIp);
 } else {
+if 
(manageStaticNatRule(SrxCommand.CHECK_PRIVATE_IF_EXISTS, publicIp, privateIp)){
+xml = SrxXml.STATIC_NAT_RULE_GETONE.getXml();
+xml = setDelete(xml, true);
+xml = replaceXmlValue(xml, "rule-set", _privateZone);
+xml = replaceXmlValue(xml, "from-zone", _privateZone);
+xml = replaceXmlValue(xml, "rule-name", 
ruleName_private);
+}
+
+if (!sendRequestAndCheckResponse(command, xml, "name", 
ruleName_private))
+{
+throw new ExecutionException("Failed to delete trust 
static NAT rule from public IP " + publicIp + " to private IP " + privateIp);
+}
 return true;
 }
 
@@ -2184,6 

[cloudstack] branch master updated: CLOUDSTACK-10003 automatic configure juniper srx/vsrx nat loopback, (#2184)

[rohit]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 973a9c1  CLOUDSTACK-10003 automatic configure juniper srx/vsrx nat 
loopback, (#2184)
973a9c1 is described below

commit 973a9c1dce72cc05a404eab45ca1ee02bdcb50d4
Author: ming416 
AuthorDate: Sat Dec 16 12:21:25 2017 +0800

CLOUDSTACK-10003 automatic configure juniper srx/vsrx nat loopback, (#2184)

Automatic configure juniper srx/vsrx nat loopback,

Constraint condition that manual configure source nat in juniper 
srx，allowed vm vist public network :
zone : trust to {trust,untrust}
rule : source address {0.0.0.0/0},destination address{0.0.0.0/0} ,do source 
nat with pool {public network getway ip}.

code change for trust to trust destination or static nat:

1. add srxCommand :CHECK_PRIVATE_IF_EXISTS. for add/delete rule to detect 
whether exist or not contain DestinationNatRule or StaticNatRule 
(ruleName_private) in trust zone .
2. add DestinationNatRule  (ruleName_private) to trust zone when ADD 
DestinationNatRule to untrust .
3. delete DestinationNatRule  (ruleName_private) from trust zone when 
DELETE DestinationNatRule from untrust.
4. add StaticNatRule (ruleName_private) to trust zone when ADD  
StaticNatRule to untrust .
5. delete  StaticNatRule (ruleName_private) from trust zone when DELETE  
StaticNatRule from untrust.

Check private if exist.
---
 .../cloud/network/resource/JuniperSrxResource.java | 71 +-
 1 file changed, 68 insertions(+), 3 deletions(-)

diff --git 
a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
 
b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
index 75c7583..20031e3 100644
--- 
a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
+++ 
b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
@@ -303,7 +303,7 @@ public class JuniperSrxResource implements ServerResource {
 }
 
 private enum SrxCommand {
-LOGIN, OPEN_CONFIGURATION, CLOSE_CONFIGURATION, COMMIT, ROLLBACK, 
CHECK_IF_EXISTS, CHECK_IF_IN_USE, ADD, DELETE, GET_ALL;
+LOGIN, OPEN_CONFIGURATION, CLOSE_CONFIGURATION, COMMIT, ROLLBACK, 
CHECK_IF_EXISTS, CHECK_IF_IN_USE, ADD, DELETE, GET_ALL, CHECK_PRIVATE_IF_EXISTS;
 }
 
 private enum Protocol {
@@ -2011,6 +2011,7 @@ public class JuniperSrxResource implements ServerResource 
{
 
 private boolean manageStaticNatRule(SrxCommand command, String publicIp, 
String privateIp) throws ExecutionException {
 String ruleName = genStaticNatRuleName(publicIp, privateIp);
+String ruleName_private = genStaticNatRuleName(privateIp, publicIp);
 String xml;
 
 switch (command) {
@@ -2022,7 +2023,13 @@ public class JuniperSrxResource implements 
ServerResource {
 xml = replaceXmlValue(xml, "from-zone", _publicZone);
 xml = replaceXmlValue(xml, "rule-name", ruleName);
 return sendRequestAndCheckResponse(command, xml, "name", 
ruleName);
-
+case CHECK_PRIVATE_IF_EXISTS:
+xml = SrxXml.STATIC_NAT_RULE_GETONE.getXml();
+xml = setDelete(xml, false);
+xml = replaceXmlValue(xml, "rule-set", _privateZone);
+xml = replaceXmlValue(xml, "from-zone", _privateZone);
+xml = replaceXmlValue(xml, "rule-name", ruleName_private);
+return sendRequestAndCheckResponse(command, xml, "name", 
ruleName_private);
 case ADD:
 if (manageStaticNatRule(SrxCommand.CHECK_IF_EXISTS, publicIp, 
privateIp)) {
 return true;
@@ -2038,6 +2045,16 @@ public class JuniperSrxResource implements 
ServerResource {
 if (!sendRequestAndCheckResponse(command, xml)) {
 throw new ExecutionException("Failed to add static NAT 
rule from public IP " + publicIp + " to private IP " + privateIp);
 } else {
+xml = SrxXml.STATIC_NAT_RULE_ADD.getXml();
+xml = replaceXmlValue(xml, "rule-set", _privateZone);
+xml = replaceXmlValue(xml, "from-zone", _privateZone);
+xml = replaceXmlValue(xml, "rule-name", ruleName_private);
+xml = replaceXmlValue(xml, "original-ip", publicIp);
+xml = replaceXmlValue(xml, "translated-ip", privateIp);
+if (!sendRequestAndCheckResponse(command, xml))
+{
+throw new ExecutionException("Failed to add trust 
static NAT rule from public IP " + publicIp + " to private IP " + privateIp);
+}

[GitHub] rhtyd commented on issue #2184: CLOUDSTACK-10003 automatic configure juniper srx/vsrx nat loopback,

[GitBox]

rhtyd commented on issue #2184: CLOUDSTACK-10003 automatic configure juniper 
srx/vsrx nat loopback,
URL: https://github.com/apache/cloudstack/pull/2184#issuecomment-352159710
 
 
   LGTM based on tests, given we don't have srx to test against I'll merge this 
based on test results (ignoring known failures).


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd closed pull request #2308: CLOUDSTACK-8908 After copying the template charging for that template is stopped

[GitBox]

rhtyd closed pull request #2308: CLOUDSTACK-8908 After copying the template 
charging for that template is stopped
URL: https://github.com/apache/cloudstack/pull/2308
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java 
b/engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java
index 45337b22e13..ad8ce59dba7 100644
--- a/engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java
+++ b/engine/schema/src/com/cloud/usage/dao/UsageStorageDaoImpl.java
@@ -66,6 +66,7 @@ public UsageStorageDaoImpl() {
 IdZoneSearch.and("id", IdZoneSearch.entity().getId(), 
SearchCriteria.Op.EQ);
 IdZoneSearch.and("type", IdZoneSearch.entity().getStorageType(), 
SearchCriteria.Op.EQ);
 IdZoneSearch.and("dcId", IdZoneSearch.entity().getZoneId(), 
SearchCriteria.Op.EQ);
+IdZoneSearch.and("deleted", IdZoneSearch.entity().getDeleted(), 
SearchCriteria.Op.NULL);
 IdZoneSearch.done();
 }
 
@@ -85,6 +86,7 @@ public UsageStorageDaoImpl() {
 sc.setParameters("id", id);
 sc.setParameters("type", type);
 sc.setParameters("dcId", dcId);
+sc.setParameters("deleted", null);
 return listBy(sc, 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] rhtyd commented on issue #2308: CLOUDSTACK-8908 After copying the template charging for that template is stopped

[GitBox]

rhtyd commented on issue #2308: CLOUDSTACK-8908 After copying the template 
charging for that template is stopped
URL: https://github.com/apache/cloudstack/pull/2308#issuecomment-352159508
 
 
   Tests LGTM, merging based on test results.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2348: Remove ejb-api 3.0 dependency

[GitBox]

rhtyd commented on issue #2348: Remove ejb-api 3.0 dependency
URL: https://github.com/apache/cloudstack/pull/2348#issuecomment-352159107
 
 
   LGTM, test LGTM as well. The failures are known issues.


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 #2348: Remove ejb-api 3.0 dependency

[GitBox]

rhtyd commented on issue #2348: Remove ejb-api 3.0 dependency
URL: https://github.com/apache/cloudstack/pull/2348#issuecomment-352159483
 
 
   @rafaelweingartner can you address outstanding queries, following which we 
can merge this.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on a change in pull request #2348: Remove ejb-api 3.0 dependency

[GitBox]

rhtyd commented on a change in pull request #2348: Remove ejb-api 3.0 dependency
URL: https://github.com/apache/cloudstack/pull/2348#discussion_r157333568
 
 

 ##
 File path: server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
 ##
 @@ -1207,20 +1183,6 @@ private void cleanupUnfinishedWork() {
 }
 }
 
-private void processScheduledWork() {
 
 Review comment:
   The usage of this method is commented, should we remove that too or keep 
this?


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on a change in pull request #2348: Remove ejb-api 3.0 dependency

[GitBox]

rhtyd commented on a change in pull request #2348: Remove ejb-api 3.0 dependency
URL: https://github.com/apache/cloudstack/pull/2348#discussion_r157333549
 
 

 ##
 File path: server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
 ##
 @@ -437,10 +434,6 @@ public void 
doInTransactionWithoutResult(TransactionStatus status) {
 }
 }
 });
-
-for (Long vmId : affectedVms) {
 
 Review comment:
   @rafaelweingartner why have you removed this?


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2348: Remove ejb-api 3.0 dependency

[GitBox]

rhtyd commented on issue #2348: Remove ejb-api 3.0 dependency
URL: https://github.com/apache/cloudstack/pull/2348#issuecomment-352159107
 
 
   LGTM, test LGTM as well. The failures are known issues. Based on reviews and 
test results, I'll merge this.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2351: CLOUDSTACK-10173: VR's guest/public nic to pick network rate from offering

[GitBox]

blueorangutan commented on issue #2351: CLOUDSTACK-10173: VR's guest/public nic 
to pick network rate from offering
URL: https://github.com/apache/cloudstack/pull/2351#issuecomment-352157845
 
 
   Trillian test result (tid-1789)
   Environment: vmware-55u3 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 57003 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2351-t1789-vmware-55u3.zip
   Test completed. Failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_00_deploy_vm_root_resize | `Error` | 6.16 | 
test_deploy_vm_root_resize.py
   ContextSuite context=TestDeployVmRootSize>:teardown | `Error` | 0.08 | 
test_deploy_vm_root_resize.py
   test_04_extract_Iso | `Failure` | 132.35 | test_iso.py
   test_01_deploy_vms_storage_tags | `Error` | 35.58 | test_primary_storage.py
   test_01_deploy_vms_storage_tags | `Error` | 35.61 | test_primary_storage.py
   ContextSuite context=TestStorageTags>:teardown | `Error` | 85.56 | 
test_primary_storage.py
   test_01_vpc_privategw_acl | `Failure` | 126.66 | test_privategw_acl.py
   test_02_vpc_privategw_static_routes | `Failure` | 458.53 | 
test_privategw_acl.py
   test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 383.61 | 
test_privategw_acl.py
   test_04_rvpc_privategw_static_routes | `Failure` | 554.28 | 
test_privategw_acl.py
   test_01_RVR_Network_FW_PF_SSH_default_routes_egress_true | `Failure` | 
400.06 | test_routers_network_ops.py
   test_02_RVR_Network_FW_PF_SSH_default_routes_egress_false | `Failure` | 
478.73 | test_routers_network_ops.py
   test_02_list_snapshots_with_removed_data_store | `Error` | 30.72 | 
test_snapshots.py
   test_02_list_snapshots_with_removed_data_store | `Error` | 30.74 | 
test_snapshots.py
   test_05_stop_ssvm | `Error` | 320.58 | test_ssvm.py
   test_06_stop_cpvm | `Error` | 143.69 | test_ssvm.py
   test_07_reboot_ssvm | `Error` | 127.10 | test_ssvm.py
   test_08_reboot_cpvm | `Failure` | 0.03 | test_ssvm.py
   test_02_create_template_with_checksum_sha1 | `Error` | 5.15 | 
test_templates.py
   test_03_create_template_with_checksum_sha256 | `Error` | 5.17 | 
test_templates.py
   test_04_create_template_with_checksum_md5 | `Error` | 5.17 | 
test_templates.py
   test_04_extract_template | `Failure` | 142.38 | test_templates.py
   ContextSuite context=TestISOUsage>:setup | `Error` | 0.00 | test_usage.py
   test_01_volume_usage | `Error` | 15.80 | test_usage.py
   test_01_create_volume | `Error` | 25.31 | test_volumes.py
   test_02_attach_volume | `Error` | 20.15 | test_volumes.py
   test_03_download_attached_volume | `Error` | 5.07 | test_volumes.py
   test_04_delete_attached_volume | `Error` | 5.07 | test_volumes.py
   test_05_detach_volume | `Error` | 5.07 | test_volumes.py
   test_06_download_detached_volume | `Error` | 5.07 | test_volumes.py
   test_07_resize_fail | `Error` | 10.21 | test_volumes.py
   test_08_resize_volume | `Error` | 5.06 | test_volumes.py
   test_09_delete_detached_volume | `Error` | 20.23 | test_volumes.py
   test_10_list_volumes | `Failure` | 365.98 | test_volumes.py
   ContextSuite context=TestVolumes>:teardown | `Error` | 366.17 | 
test_volumes.py
   test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL | `Failure` | 1518.24 
| test_vpc_redundant.py
   test_05_rvpc_multi_tiers | `Failure` | 1436.28 | test_vpc_redundant.py
   test_01_vpc_remote_access_vpn | `Failure` | 558.26 | test_vpc_vpn.py
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2308: CLOUDSTACK-8908 After copying the template charging for that template is stopped

[GitBox]

blueorangutan commented on issue #2308: CLOUDSTACK-8908 After copying the 
template charging for that template is stopped
URL: https://github.com/apache/cloudstack/pull/2308#issuecomment-352154057
 
 
   Trillian test result (tid-1795)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 23753 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2308-t1795-kvm-centos7.zip
   Test completed. Failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_01_vpc_privategw_acl | `Failure` | 46.04 | test_privategw_acl.py
   test_02_vpc_privategw_static_routes | `Failure` | 131.97 | 
test_privategw_acl.py
   test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 96.75 | 
test_privategw_acl.py
   test_04_rvpc_privategw_static_routes | `Failure` | 167.10 | 
test_privategw_acl.py
   test_02_create_template_with_checksum_sha1 | `Error` | 5.15 | 
test_templates.py
   test_03_create_template_with_checksum_sha256 | `Error` | 5.14 | 
test_templates.py
   test_04_create_template_with_checksum_md5 | `Error` | 5.16 | 
test_templates.py
   test_05_rvpc_multi_tiers | `Failure` | 185.01 | test_vpc_redundant.py
   test_01_vpc_remote_access_vpn | `Failure` | 45.55 | test_vpc_vpn.py
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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

[GitBox]

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


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 #2348: Remove ejb-api 3.0 dependency

[GitBox]

blueorangutan commented on issue #2348: Remove ejb-api 3.0 dependency
URL: https://github.com/apache/cloudstack/pull/2348#issuecomment-352148607
 
 
   Trillian test result (tid-1794)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 30045 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2348-t1794-kvm-centos7.zip
   Test completed. Failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_01_vpc_privategw_acl | `Failure` | 56.27 | test_privategw_acl.py
   test_02_vpc_privategw_static_routes | `Failure` | 222.51 | 
test_privategw_acl.py
   test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 127.16 | 
test_privategw_acl.py
   test_04_rvpc_privategw_static_routes | `Failure` | 302.84 | 
test_privategw_acl.py
   test_02_create_template_with_checksum_sha1 | `Error` | 5.15 | 
test_templates.py
   test_03_create_template_with_checksum_sha256 | `Error` | 5.14 | 
test_templates.py
   test_04_create_template_with_checksum_md5 | `Error` | 5.13 | 
test_templates.py
   test_01_vpc_remote_access_vpn | `Failure` | 60.62 | test_vpc_vpn.py
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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

[GitBox]

blueorangutan commented on issue #2301: CLOUDSTACK-10121 moveUser
URL: https://github.com/apache/cloudstack/pull/2301#issuecomment-352148347
 
 
   @rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been 
kicked to run smoke tests


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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

[GitBox]

rhtyd commented on issue #2301: CLOUDSTACK-10121 moveUser
URL: https://github.com/apache/cloudstack/pull/2301#issuecomment-352148296
 
 
   @blueorangutan test


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2315: A comprehensive solution for CLOUDSTACK-9025 and CLOUDSTACK-10128.

[GitBox]

blueorangutan commented on issue #2315: A comprehensive solution for 
CLOUDSTACK-9025 and CLOUDSTACK-10128.
URL: https://github.com/apache/cloudstack/pull/2315#issuecomment-352143216
 
 
   Trillian test result (tid-1792)
   Environment: xenserver-65sp1 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 38657 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2315-t1792-xenserver-65sp1.zip
   Test completed. Failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_01_vpc_privategw_acl | `Failure` | 101.34 | test_privategw_acl.py
   test_02_vpc_privategw_static_routes | `Failure` | 473.27 | 
test_privategw_acl.py
   test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 332.79 | 
test_privategw_acl.py
   test_04_rvpc_privategw_static_routes | `Failure` | 649.09 | 
test_privategw_acl.py
   test_01_RVR_Network_FW_PF_SSH_default_routes_egress_true | `Failure` | 
448.86 | test_routers_network_ops.py
   test_02_RVR_Network_FW_PF_SSH_default_routes_egress_false | `Failure` | 
435.99 | test_routers_network_ops.py
   test_02_create_template_with_checksum_sha1 | `Error` | 5.14 | 
test_templates.py
   test_03_create_template_with_checksum_sha256 | `Error` | 5.14 | 
test_templates.py
   test_04_create_template_with_checksum_md5 | `Error` | 5.14 | 
test_templates.py
   test_01_volume_usage | `Error` | 25.63 | test_usage.py
   test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL | `Failure` | 573.71 | 
test_vpc_redundant.py
   test_02_redundant_VPC_default_routes | `Failure` | 445.14 | 
test_vpc_redundant.py
   test_05_rvpc_multi_tiers | `Failure` | 466.24 | test_vpc_redundant.py
   test_01_vpc_remote_access_vpn | `Failure` | 140.95 | test_vpc_vpn.py
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2184: CLOUDSTACK-10003 automatic configure juniper srx/vsrx nat loopback,

[GitBox]

blueorangutan commented on issue #2184: CLOUDSTACK-10003 automatic configure 
juniper srx/vsrx nat loopback,
URL: https://github.com/apache/cloudstack/pull/2184#issuecomment-352142925
 
 
   Trillian test result (tid-1793)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 26969 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2184-t1793-kvm-centos7.zip
   Test completed. Failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   ContextSuite context=TestStorageTags>:teardown | `Error` | 111.30 | 
test_primary_storage.py
   test_01_vpc_privategw_acl | `Failure` | 41.26 | test_privategw_acl.py
   test_02_vpc_privategw_static_routes | `Failure` | 127.00 | 
test_privategw_acl.py
   test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 162.20 | 
test_privategw_acl.py
   test_04_rvpc_privategw_static_routes | `Failure` | 287.84 | 
test_privategw_acl.py
   test_02_create_template_with_checksum_sha1 | `Error` | 5.16 | 
test_templates.py
   test_03_create_template_with_checksum_sha256 | `Error` | 5.15 | 
test_templates.py
   test_04_create_template_with_checksum_md5 | `Error` | 5.16 | 
test_templates.py
   test_01_vpc_remote_access_vpn | `Failure` | 70.73 | test_vpc_vpn.py
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2258: Cloudstack 10064: Secondary storage Usage for uploadedVolume is not collected

[GitBox]

blueorangutan commented on issue #2258: Cloudstack 10064: Secondary storage 
Usage for uploadedVolume is not collected
URL: https://github.com/apache/cloudstack/pull/2258#issuecomment-352116681
 
 
   Trillian test result (tid-1791)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 29048 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2258-t1791-kvm-centos7.zip
   Test completed. Failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_01_vpc_privategw_acl | `Failure` | 66.90 | test_privategw_acl.py
   test_02_vpc_privategw_static_routes | `Failure` | 107.87 | 
test_privategw_acl.py
   test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 112.86 | 
test_privategw_acl.py
   test_04_rvpc_privategw_static_routes | `Failure` | 233.56 | 
test_privategw_acl.py
   test_02_create_template_with_checksum_sha1 | `Error` | 5.26 | 
test_templates.py
   test_03_create_template_with_checksum_sha256 | `Error` | 5.23 | 
test_templates.py
   test_04_create_template_with_checksum_md5 | `Error` | 5.24 | 
test_templates.py
   test_01_vpc_remote_access_vpn | `Failure` | 50.94 | test_vpc_vpn.py
   test_hostha_kvm_host_fencing | `Error` | 25.76 | test_hostha_kvm.py
   
   
   Additional tests completed. 0 look ok, 1 have error(s)
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_01_SecondaryUsageUploadedVolume | `Error` | 245.78 | 
test_ss_volume_usage.py
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2347: CLOUDSTACK-10166: Get accountId and domainId from VPC when tagging a NetworkACL as a user

[GitBox]

blueorangutan commented on issue #2347: CLOUDSTACK-10166: Get accountId and 
domainId from VPC when tagging a NetworkACL as a user
URL: https://github.com/apache/cloudstack/pull/2347#issuecomment-352103578
 
 
   Trillian test result (tid-1790)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 25496 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2347-t1790-kvm-centos7.zip
   Test completed. Failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_01_vpc_privategw_acl | `Failure` | 41.68 | test_privategw_acl.py
   test_02_vpc_privategw_static_routes | `Failure` | 122.98 | 
test_privategw_acl.py
   test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 87.74 | 
test_privategw_acl.py
   test_04_rvpc_privategw_static_routes | `Failure` | 178.15 | 
test_privategw_acl.py
   test_01_single_VPC_iptables_policies | `Error` | 781.34 | 
test_routers_iptables_default_policy.py
   test_02_create_template_with_checksum_sha1 | `Error` | 5.24 | 
test_templates.py
   test_03_create_template_with_checksum_sha256 | `Error` | 5.21 | 
test_templates.py
   test_04_create_template_with_checksum_md5 | `Error` | 5.22 | 
test_templates.py
   test_06_download_detached_volume | `Failure` | 147.55 | test_volumes.py
   test_01_vpc_remote_access_vpn | `Failure` | 50.90 | test_vpc_vpn.py
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] mike-tutkowski commented on issue #2298: CLOUDSTACK-9620: Enhancements for managed storage

[GitBox]

mike-tutkowski commented on issue #2298: CLOUDSTACK-9620: Enhancements for 
managed storage
URL: https://github.com/apache/cloudstack/pull/2298#issuecomment-352092375
 
 
   Sounds good, @rhtyd - it should be pretty soon. I needed to mainly attend to 
other work over the past week or so, so I didn't have a chance to finalize what 
I was working on for VMware here (dynamic discovery). It should probably be 
ready early next week. Right now I am running my tests and making some final 
touch-up tweaks.


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

[GitBox]

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


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

[GitBox]

blueorangutan commented on issue #2318: [4.9] Smoketest health checkrun baseline
URL: https://github.com/apache/cloudstack/pull/2318#issuecomment-352054875
 
 
   @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted 
as I make progress.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd closed pull request #2318: [4.9] Smoketest health checkrun baseline

[GitBox]

rhtyd closed pull request #2318: [4.9] Smoketest health checkrun baseline
URL: https://github.com/apache/cloudstack/pull/2318
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/LICENSE b/LICENSE
index 982b15844f4..47285a452d7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014 The Apache Software Foundation
+ Copyright (c) 2014 The Apache Software Foundation
 
 
  Apache License


 


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 #2308: CLOUDSTACK-8908 After copying the template charging for that template is stopped

[GitBox]

blueorangutan commented on issue #2308: CLOUDSTACK-8908 After copying the 
template charging for that template is stopped
URL: https://github.com/apache/cloudstack/pull/2308#issuecomment-352053355
 
 
   @rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been 
kicked to run smoke tests


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2348: Remove ejb-api 3.0 dependency

[GitBox]

blueorangutan commented on issue #2348: Remove ejb-api 3.0 dependency
URL: https://github.com/apache/cloudstack/pull/2348#issuecomment-352053349
 
 
   @rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been 
kicked to run smoke tests


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2308: CLOUDSTACK-8908 After copying the template charging for that template is stopped

[GitBox]

rhtyd commented on issue #2308: CLOUDSTACK-8908 After copying the template 
charging for that template is stopped
URL: https://github.com/apache/cloudstack/pull/2308#issuecomment-352053134
 
 
   @blueorangutan test


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2348: Remove ejb-api 3.0 dependency

[GitBox]

blueorangutan commented on issue #2348: Remove ejb-api 3.0 dependency
URL: https://github.com/apache/cloudstack/pull/2348#issuecomment-352053188
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1383


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 #2348: Remove ejb-api 3.0 dependency

[GitBox]

rhtyd commented on issue #2348: Remove ejb-api 3.0 dependency
URL: https://github.com/apache/cloudstack/pull/2348#issuecomment-352053303
 
 
   @blueorangutan test


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2184: CLOUDSTACK-10003 automatic configure juniper srx/vsrx nat loopback,

[GitBox]

blueorangutan commented on issue #2184: CLOUDSTACK-10003 automatic configure 
juniper srx/vsrx nat loopback,
URL: https://github.com/apache/cloudstack/pull/2184#issuecomment-352053063
 
 
   @rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been 
kicked to run smoke tests


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2184: CLOUDSTACK-10003 automatic configure juniper srx/vsrx nat loopback,

[GitBox]

rhtyd commented on issue #2184: CLOUDSTACK-10003 automatic configure juniper 
srx/vsrx nat loopback,
URL: https://github.com/apache/cloudstack/pull/2184#issuecomment-352052969
 
 
   We don't have srx infra to test this, but we'll run regression tests and 
accept if they pass.
   @blueorangutan test


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2348: Remove ejb-api 3.0 dependency

[GitBox]

blueorangutan commented on issue #2348: Remove ejb-api 3.0 dependency
URL: https://github.com/apache/cloudstack/pull/2348#issuecomment-352047436
 
 
   @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted 
as I make progress.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2348: Remove ejb-api 3.0 dependency

[GitBox]

rhtyd commented on issue #2348: Remove ejb-api 3.0 dependency
URL: https://github.com/apache/cloudstack/pull/2348#issuecomment-352047216
 
 
   @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] syed commented on issue #2294: [CLOUDSTACK-10039] Adding allocated IOPS to storage pool response

[GitBox]

syed commented on issue #2294: [CLOUDSTACK-10039] Adding allocated IOPS to 
storage pool response
URL: https://github.com/apache/cloudstack/pull/2294#issuecomment-352034337
 
 
   Thanks @rhtyd 


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2348: Remove ejb-api 3.0 dependency

[GitBox]

blueorangutan commented on issue #2348: Remove ejb-api 3.0 dependency
URL: https://github.com/apache/cloudstack/pull/2348#issuecomment-352014853
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1382


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 #2117: CLOUDSTACK-8735:Browser Based Volume and Template Upload Test Automat?

[GitBox]

blueorangutan commented on issue #2117: CLOUDSTACK-8735:Browser Based Volume 
and Template Upload Test Automat?
URL: https://github.com/apache/cloudstack/pull/2117#issuecomment-352014855
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1380


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 #2184: CLOUDSTACK-10003 automatic configure juniper srx/vsrx nat loopback,

[GitBox]

blueorangutan commented on issue #2184: CLOUDSTACK-10003 automatic configure 
juniper srx/vsrx nat loopback,
URL: https://github.com/apache/cloudstack/pull/2184#issuecomment-352014854
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1381


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 #2308: CLOUDSTACK-8908 After copying the template charging for that template is stopped

[GitBox]

blueorangutan commented on issue #2308: CLOUDSTACK-8908 After copying the 
template charging for that template is stopped
URL: https://github.com/apache/cloudstack/pull/2308#issuecomment-352014545
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1378


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 #2139: CLOUDSTACK-9921: NPE when storage garbage collector is running.

[GitBox]

blueorangutan commented on issue #2139: CLOUDSTACK-9921: NPE when storage 
garbage collector is running.
URL: https://github.com/apache/cloudstack/pull/2139#issuecomment-352014546
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1379


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 #2301: CLOUDSTACK-10121 moveUser

[GitBox]

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


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 #2348: Remove ejb-api 3.0 dependency

[GitBox]

blueorangutan commented on issue #2348: Remove ejb-api 3.0 dependency
URL: https://github.com/apache/cloudstack/pull/2348#issuecomment-352005036
 
 
   @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted 
as I make progress.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2348: Remove ejb-api 3.0 dependency

[GitBox]

rhtyd commented on issue #2348: Remove ejb-api 3.0 dependency
URL: https://github.com/apache/cloudstack/pull/2348#issuecomment-352004902
 
 
   @blueorangutan package


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2258: Cloudstack 10064: Secondary storage Usage for uploadedVolume is not collected

[GitBox]

blueorangutan commented on issue #2258: Cloudstack 10064: Secondary storage 
Usage for uploadedVolume is not collected
URL: https://github.com/apache/cloudstack/pull/2258#issuecomment-352004459
 
 
   @rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been 
kicked to run smoke tests


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2258: Cloudstack 10064: Secondary storage Usage for uploadedVolume is not collected

[GitBox]

rhtyd commented on issue #2258: Cloudstack 10064: Secondary storage Usage for 
uploadedVolume is not collected
URL: https://github.com/apache/cloudstack/pull/2258#issuecomment-352004410
 
 
   @blueorangutan test centos7 kvm-centos7 component/test_ss_volume_usage.py
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2347: CLOUDSTACK-10166: Get accountId and domainId from VPC when tagging a NetworkACL as a user

[GitBox]

blueorangutan commented on issue #2347: CLOUDSTACK-10166: Get accountId and 
domainId from VPC when tagging a NetworkACL as a user
URL: https://github.com/apache/cloudstack/pull/2347#issuecomment-352004247
 
 
   @rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been 
kicked to run smoke tests


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2315: A comprehensive solution for CLOUDSTACK-9025 and CLOUDSTACK-10128.

[GitBox]

blueorangutan commented on issue #2315: A comprehensive solution for 
CLOUDSTACK-9025 and CLOUDSTACK-10128.
URL: https://github.com/apache/cloudstack/pull/2315#issuecomment-352004252
 
 
   @rhtyd a Trillian-Jenkins test job (centos7 mgmt + xenserver-65sp1) has been 
kicked to run smoke tests


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2347: CLOUDSTACK-10166: Get accountId and domainId from VPC when tagging a NetworkACL as a user

[GitBox]

rhtyd commented on issue #2347: CLOUDSTACK-10166: Get accountId and domainId 
from VPC when tagging a NetworkACL as a user
URL: https://github.com/apache/cloudstack/pull/2347#issuecomment-352004146
 
 
   @blueorangutan test


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2315: A comprehensive solution for CLOUDSTACK-9025 and CLOUDSTACK-10128.

[GitBox]

rhtyd commented on issue #2315: A comprehensive solution for CLOUDSTACK-9025 
and CLOUDSTACK-10128.
URL: https://github.com/apache/cloudstack/pull/2315#issuecomment-352004069
 
 
   @blueorangutan test centos7 xenserver-65sp1


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 #2348: Remove ejb-api 3.0 dependency

[GitBox]

rafaelweingartner commented on issue #2348: Remove ejb-api 3.0 dependency
URL: https://github.com/apache/cloudstack/pull/2348#issuecomment-352003985
 
 
   @rhtyd 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] blueorangutan commented on issue #2258: Cloudstack 10064: Secondary storage Usage for uploadedVolume is not collected

[GitBox]

blueorangutan commented on issue #2258: Cloudstack 10064: Secondary storage 
Usage for uploadedVolume is not collected
URL: https://github.com/apache/cloudstack/pull/2258#issuecomment-352003102
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1376


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 #2347: CLOUDSTACK-10166: Get accountId and domainId from VPC when tagging a NetworkACL as a user

[GitBox]

blueorangutan commented on issue #2347: CLOUDSTACK-10166: Get accountId and 
domainId from VPC when tagging a NetworkACL as a user
URL: https://github.com/apache/cloudstack/pull/2347#issuecomment-352003103
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1375


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 #2315: A comprehensive solution for CLOUDSTACK-9025 and CLOUDSTACK-10128.

[GitBox]

blueorangutan commented on issue #2315: A comprehensive solution for 
CLOUDSTACK-9025 and CLOUDSTACK-10128.
URL: https://github.com/apache/cloudstack/pull/2315#issuecomment-352003101
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1374


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 #2117: CLOUDSTACK-8735:Browser Based Volume and Template Upload Test Automat?

[GitBox]

blueorangutan commented on issue #2117: CLOUDSTACK-8735:Browser Based Volume 
and Template Upload Test Automat?
URL: https://github.com/apache/cloudstack/pull/2117#issuecomment-351997629
 
 
   @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted 
as I make progress.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2184: CLOUDSTACK-10003 automatic configure juniper srx/vsrx nat loopback,

[GitBox]

blueorangutan commented on issue #2184: CLOUDSTACK-10003 automatic configure 
juniper srx/vsrx nat loopback,
URL: https://github.com/apache/cloudstack/pull/2184#issuecomment-351997639
 
 
   @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted 
as I make progress.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2117: CLOUDSTACK-8735:Browser Based Volume and Template Upload Test Automat?

[GitBox]

rhtyd commented on issue #2117: CLOUDSTACK-8735:Browser Based Volume and 
Template Upload Test Automat?
URL: https://github.com/apache/cloudstack/pull/2117#issuecomment-351997517
 
 
   @blueorangutan package


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2050: CLOUDSTACK-9865: improper os types for xenserver 6.5

[GitBox]

rhtyd commented on issue #2050: CLOUDSTACK-9865: improper os types for 
xenserver 6.5
URL: https://github.com/apache/cloudstack/pull/2050#issuecomment-351997590
 
 
   @pdion891 can you fix the conflicts? /cc @syed @swill 


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 #2139: CLOUDSTACK-9921: NPE when storage garbage collector is running.

[GitBox]

blueorangutan commented on issue #2139: CLOUDSTACK-9921: NPE when storage 
garbage collector is running.
URL: https://github.com/apache/cloudstack/pull/2139#issuecomment-351997457
 
 
   @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted 
as I make progress.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2184: CLOUDSTACK-10003 automatic configure juniper srx/vsrx nat loopback,

[GitBox]

rhtyd commented on issue #2184: CLOUDSTACK-10003 automatic configure juniper 
srx/vsrx nat loopback,
URL: https://github.com/apache/cloudstack/pull/2184#issuecomment-351997478
 
 
   @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