[GitHub] sachinnitw1317 commented on issue #2204: [CLOUDSTACK-10025] Adding Support for NoVNC Console for KVM and XENSERVER

2017-12-10 Thread GitBox
sachinnitw1317 commented on issue #2204: [CLOUDSTACK-10025] Adding Support for 
NoVNC Console for KVM and XENSERVER
URL: https://github.com/apache/cloudstack/pull/2204#issuecomment-350647294
 
 
   Hey, I reported the keyboard problem earlier as well. If you do a right 
click -> reload frame it will start taking your keyboard strokes. I never got 
the fix though. Let me  know if you need any help from me.


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] asfbot commented on issue #2214: Speed-up VR initialisation/configuration

2017-12-10 Thread GitBox
asfbot commented on issue #2214: Speed-up VR initialisation/configuration
URL: https://github.com/apache/cloudstack/pull/2214#issuecomment-350644818
 
 
   Mohammad Aladwan  on d...@cloudstack.apache.org replies:
   hi,
   
   please i want to leave this group,i am not sure how i  can leave it
   
   
   my best regards


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

2017-12-10 Thread GitBox
asfbot commented on issue #2211: CLOUDSTACK-10013: Migrate systemvmtemplate to 
Debian9
URL: https://github.com/apache/cloudstack/pull/2211#issuecomment-350644278
 
 
   Mohammad Aladwan  on d...@cloudstack.apache.org replies:
   hi,
   
   please i want to leave this group,i am not sure how i  can leave it
   
   
   my best regards


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


With regards,
Apache Git Services


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

2017-12-10 Thread GitBox
blueorangutan commented on issue #2211: CLOUDSTACK-10013: Migrate 
systemvmtemplate to Debian9
URL: https://github.com/apache/cloudstack/pull/2211#issuecomment-350634517
 
 
   Trillian test result (tid-1766)
   Environment: vmware-55u3 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 33097 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2211-t1766-vmware-55u3.zip
   Test completed. Failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   ContextSuite context=TestNetworkACL>:setup | `Error` | 0.00 | 
test_network_acl.py
   test_3d_gpu_support | `Error` | 1515.01 | test_deploy_vgpu_enabled_vm.py
   test_00_deploy_vm_root_resize | `Error` | 5.68 | 
test_deploy_vm_root_resize.py
   ContextSuite context=TestDeployVmRootSize>:teardown | `Error` | 0.12 | 
test_deploy_vm_root_resize.py
   ContextSuite context=TestDeployVmWithVariedPlanners>:setup | `Error` | 0.00 
| test_deploy_vms_with_varied_deploymentplanners.py
   ContextSuite context=TestDeployVmWithUserData>:setup | `Error` | 0.00 | 
test_deploy_vm_with_userdata.py
   ContextSuite context=TestInternalLb>:setup | `Error` | 0.00 | 
test_internal_lb.py
   ContextSuite context=TestIsolatedNetworksPasswdServer>:setup | `Error` | 
0.00 | test_password_server.py
   ContextSuite context=TestLoadBalance>:setup | `Error` | 0.00 | 
test_loadbalance.py
   test_list_vms_metrics | `Error` | 0.15 | test_metrics_api.py
   test_nic_secondaryip_add_remove | `Error` | 0.10 | 
test_multipleips_per_nic.py
   ContextSuite context=TestPortForwardingRules>:setup | `Error` | 0.00 | 
test_portforwardingrules.py
   test_01_deploy_vms_storage_tags | `Error` | 40.80 | test_primary_storage.py
   test_01_deploy_vms_storage_tags | `Error` | 40.85 | test_primary_storage.py
   ContextSuite context=TestStorageTags>:teardown | `Error` | 216.59 | 
test_primary_storage.py
   ContextSuite context=TestPrivateGwACL>:setup | `Error` | 0.00 | 
test_privategw_acl.py
   ContextSuite context=TestRouterDns>:setup | `Error` | 0.00 | 
test_router_dns.py
   ContextSuite context=TestRouterDnsService>:setup | `Error` | 0.00 | 
test_router_dnsservice.py
   ContextSuite context=TestRouterIpTablesPolicies>:setup | `Error` | 0.00 | 
test_routers_iptables_default_policy.py
   ContextSuite context=TestVPCIpTablesPolicies>:setup | `Error` | 0.00 | 
test_routers_iptables_default_policy.py
   test_01_isolate_network_FW_PF_default_routes_egress_true | `Error` | 0.18 | 
test_routers_network_ops.py
   test_02_isolate_network_FW_PF_default_routes_egress_false | `Error` | 0.17 | 
test_routers_network_ops.py
   ContextSuite context=TestRedundantIsolateNetworks>:teardown | `Error` | 0.00 
| test_routers_network_ops.py
   ContextSuite context=TestRouterServices>:setup | `Error` | 0.00 | 
test_routers.py
   ContextSuite context=TestServiceOfferings>:setup | `Error` | 0.25 | 
test_service_offerings.py
   ContextSuite context=TestSnapshotRootDisk>:setup | `Error` | 0.00 | 
test_snapshots.py
   test_05_stop_ssvm | `Failure` | 297.42 | test_ssvm.py
   test_06_stop_cpvm | `Failure` | 289.58 | test_ssvm.py
   test_08_reboot_cpvm | `Failure` | 0.04 | test_ssvm.py
   test_09_destroy_ssvm | `Error` | 366.22 | test_ssvm.py
   test_01_volume_usage | `Error` | 26.06 | test_usage.py
   test_01_create_volume | `Error` | 25.43 | test_volumes.py
   test_02_attach_volume | `Error` | 15.15 | test_volumes.py
   test_03_download_attached_volume | `Error` | 5.09 | test_volumes.py
   test_04_delete_attached_volume | `Error` | 5.12 | test_volumes.py
   test_05_detach_volume | `Error` | 5.10 | test_volumes.py
   test_06_download_detached_volume | `Error` | 5.10 | test_volumes.py
   test_07_resize_fail | `Error` | 5.22 | test_volumes.py
   test_08_resize_volume | `Error` | 5.09 | test_volumes.py
   test_09_delete_detached_volume | `Error` | 20.27 | test_volumes.py
   ContextSuite context=TestVolumes>:teardown | `Error` | 1.25 | test_volumes.py
   ContextSuite context=TestVPCRedundancy>:teardown | `Error` | 0.00 | 
test_vpc_redundant.py
   ContextSuite context=TestRVPCSite2SiteVpn>:teardown | `Error` | 0.00 | 
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

2017-12-10 Thread GitBox
blueorangutan commented on issue #2211: CLOUDSTACK-10013: Migrate 
systemvmtemplate to Debian9
URL: https://github.com/apache/cloudstack/pull/2211#issuecomment-350628189
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1359


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


With regards,
Apache Git Services


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

2017-12-10 Thread GitBox
blueorangutan commented on issue #2211: CLOUDSTACK-10013: Migrate 
systemvmtemplate to Debian9
URL: https://github.com/apache/cloudstack/pull/2211#issuecomment-350626501
 
 
   Trillian test result (tid-1763)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 30181 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2211-t1763-kvm-centos7.zip
   Test completed. Failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   ContextSuite context=TestSnapshotRootDisk>:setup | `Error` | 0.00 | 
test_snapshots.py
   ContextSuite context=TestISOUsage>:setup | `Error` | 0.00 | test_usage.py
   test_01_template_usage | `Error` | 50.55 | test_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 #2211: CLOUDSTACK-10013: Migrate systemvmtemplate to Debian9

2017-12-10 Thread GitBox
blueorangutan commented on issue #2211: CLOUDSTACK-10013: Migrate 
systemvmtemplate to Debian9
URL: https://github.com/apache/cloudstack/pull/2211#issuecomment-350622490
 
 
   Trillian test result (tid-1764)
   Environment: xenserver-65sp1 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 27678 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2211-t1764-xenserver-65sp1.zip
   Test completed. Failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_04_change_offering_small | `Failure` | 32.61 | test_service_offerings.py
   ContextSuite context=TestSnapshotRootDisk>:setup | `Error` | 0.00 | 
test_snapshots.py
   test_01_volume_usage | `Error` | 25.71 | test_usage.py
   test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL | `Failure` | 402.30 | 
test_vpc_redundant.py
   test_05_rvpc_multi_tiers | `Failure` | 359.00 | test_vpc_redundant.py
   


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


With regards,
Apache Git Services


[cloudstack] 01/01: fsck on systemvm boot

2017-12-10 Thread 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 eea06cd989addf73c707ca96c1cb3e7f5cba90d0
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] branch debian9-systemvmtemplate updated (c9d783a -> eea06cd)

2017-12-10 Thread 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.


 discard c9d783a  fsck on systemvm boot
 new eea06cd  fsck on systemvm boot

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

 * -- * -- B -- O -- O -- O   (c9d783a)
\
 N -- N -- N   refs/heads/debian9-systemvmtemplate (eea06cd)

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

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

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


Summary of changes:
 tools/appliance/definitions/systemvmtemplate/finalize.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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


[cloudstack] branch debian9-systemvmtemplate updated: fsck on systemvm boot

2017-12-10 Thread 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


The following commit(s) were added to refs/heads/debian9-systemvmtemplate by 
this push:
 new c9d783a  fsck on systemvm boot
c9d783a is described below

commit c9d783a8d425c09708f8bdb9beeb969ed792da83
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 +-
 3 files changed, 5 insertions(+), 4 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"

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


[GitHub] rhtyd commented on issue #2134: [Testing]: vm migration

2017-12-10 Thread GitBox
rhtyd commented on issue #2134: [Testing]: vm migration
URL: https://github.com/apache/cloudstack/pull/2134#issuecomment-350585915
 
 
   Closed this PR as this was experimental work between Abhi, and colleagues. 
This is not maintained, worked upon anymore.


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 #2134: [Testing]: vm migration

2017-12-10 Thread GitBox
rhtyd closed pull request #2134: [Testing]: vm migration
URL: https://github.com/apache/cloudstack/pull/2134
 
 
   

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

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

diff --git 
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
 
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 848cd7f524b..02bdd7ca13c 100644
--- 
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ 
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -3499,7 +3499,6 @@ protected Answer execute(MigrateWithStorageCommand cmd) {
 ManagedObjectReference morDc = null;
 ManagedObjectReference morDcOfTargetHost = null;
 ManagedObjectReference morTgtHost = new ManagedObjectReference();
-ManagedObjectReference morTgtDatastore = new ManagedObjectReference();
 VirtualMachineRelocateSpec relocateSpec = new 
VirtualMachineRelocateSpec();
 List diskLocators = new 
ArrayList();
 VirtualMachineRelocateSpecDiskLocator diskLocator = null;
@@ -3554,8 +3553,9 @@ protected Answer execute(MigrateWithStorageCommand cmd) {
 s_logger.error(msg);
 throw new Exception(msg);
 }
-morTgtDatastore = morDsAtTarget;
-
+if (morDsAtSource == null) {
+s_logger.debug("Source data store is null for srcHyperHost 
" + srcHyperHost.getHyperHostName() + " uuid = " + filerTo.getUuid());
+}
 // If host version is below 5.1 then simultaneous change of 
VM's datastore and host is not supported.
 // So since only the datastore will be changed first, ensure 
the target datastore is mounted on source host.
 if (srcHostApiVersion.compareTo("5.1") < 0) {
@@ -3589,11 +3589,18 @@ protected Answer execute(MigrateWithStorageCommand cmd) 
{
 throw new Exception("Target VMFS datastore: " + 
tgtDsPath + " is not accessible on source host: " + _hostName);
 }
 }
-morTgtDatastore = morDsAtSource;
+}
+else {
+if (morDsAtSource == null) {
+String msg = "Unable to find the source datastore: " + 
filerTo.getUuid() + " on source host: " + srcHyperHost.getHyperHostName()
++ " to execute MigrateWithStorageCommand";
+s_logger.error(msg);
+throw new Exception(msg);
+}
 }
 
 if (volume.getType() == Volume.Type.ROOT) {
-relocateSpec.setDatastore(morTgtDatastore);
+relocateSpec.setDatastore(morDsAtTarget);
 }
 diskLocator = new VirtualMachineRelocateSpecDiskLocator();
 diskLocator.setDatastore(morDsAtSource);


 


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 #2204: [CLOUDSTACK-10025] Adding Support for NoVNC Console for KVM and XENSERVER

2017-12-10 Thread GitBox
rhtyd commented on issue #2204: [CLOUDSTACK-10025] Adding Support for NoVNC 
Console for KVM and XENSERVER
URL: https://github.com/apache/cloudstack/pull/2204#issuecomment-350585600
 
 
   @syed ping?


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 #2214: Speed-up VR initialisation/configuration

2017-12-10 Thread GitBox
rhtyd closed pull request #2214: Speed-up VR initialisation/configuration
URL: https://github.com/apache/cloudstack/pull/2214
 
 
   

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/systemvm/patches/debian/buildsystemvm.sh 
b/systemvm/patches/debian/buildsystemvm.sh
index a34b1dd0a61..f8726439925 100755
--- a/systemvm/patches/debian/buildsystemvm.sh
+++ b/systemvm/patches/debian/buildsystemvm.sh
@@ -228,7 +228,7 @@ cat > etc/init.d/iptables-persistent << EOF
 #!/bin/sh
 ### BEGIN INIT INFO
 # Provides:  iptables
-# Required-Start:mountkernfs $local_fs
+# Required-Start:mountkernfs $local_fs cloud-early-init
 # Required-Stop: $local_fs
 # Should-Start:  cloud-early-config
 # Default-Start: S
@@ -418,6 +418,8 @@ services() {
   
   /bin/cp -r ${scriptdir}/config/* ./
   chroot . chkconfig xl2tpd off
+  chroot . chkconfig --add cloud-early-init
+  chroot . chkconfig cloud-early-init on
   chroot . chkconfig --add cloud-early-config
   chroot . chkconfig cloud-early-config on
   chroot . chkconfig --add iptables-persistent
diff --git a/systemvm/patches/debian/config/etc/init.d/cloud 
b/systemvm/patches/debian/config/etc/init.d/cloud
index f9a9915223e..47dd47b74da 100755
--- a/systemvm/patches/debian/config/etc/init.d/cloud
+++ b/systemvm/patches/debian/config/etc/init.d/cloud
@@ -1,11 +1,11 @@
-#!/bin/bash 
+#!/bin/bash
 ### BEGIN INIT INFO
 # Provides:  cloud
-# Required-Start:mountkernfs $local_fs cloud-early-config
+# Required-Start:mountkernfs $local_fs cloud-early-init
 # Required-Stop: $local_fs
-# Should-Start:  
-# Should-Stop:   
-# Default-Start: 
+# Should-Start:
+# Should-Stop:
+# Default-Start:
 # Default-Stop:  0 1 6
 # Short-Description:   Start up the CloudStack cloud service
 ### END INIT INFO
@@ -44,7 +44,7 @@ for i in $CMDLINE
   do
 # search for foo=bar pattern and cut out foo
 FIRSTPATTERN=$(echo $i | cut -d= -f1)
-case $FIRSTPATTERN in 
+case $FIRSTPATTERN in
   type)
   TYPE=$(echo $i | cut -d= -f2)
   ;;
@@ -104,7 +104,7 @@ start() {
  then
(cd $CLOUDSTACK_HOME/systemvm; nohup ./run.sh > $LOG_FILE 2>&1 & )
pid=$(get_pids)
-   echo $pid > /var/run/cloud.pid 
+   echo $pid > /var/run/cloud.pid
  fi
  _success
else
@@ -137,7 +137,7 @@ status() {
   return 0
 }
 
-[ "$ENABLED" != 0 ] || exit 0 
+[ "$ENABLED" != 0 ] || exit 0
 
 case "$1" in
start) start
diff --git a/systemvm/patches/debian/config/etc/init.d/cloud-early-config 
b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
index 3bdebdbb798..cfbdd90f1cb 100755
--- a/systemvm/patches/debian/config/etc/init.d/cloud-early-config
+++ b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
@@ -1,10 +1,10 @@
 #!/bin/bash
 ### BEGIN INIT INFO
 # Provides:  cloud-early-config
-# Required-Start:mountkernfs $local_fs
-# Required-Stop: $local_fs
-# Should-Start:  
-# Should-Stop:   
+# Required-Start:mountkernfs $local_fs cloud-early-init
+# Required-Stop: $local_fs cloud-early-init
+# Should-Start:
+# Should-Stop:
 # Default-Start: S
 # Default-Stop:  0 6
 # Short-Description: configure according to cmdline
@@ -43,7 +43,7 @@ rm -f /var/cache/cloud/boot_up_done
 . /lib/lsb/init-functions
 
 log_it() {
-  echo "$(date) $@" >> /var/log/cloud.log
+  echo "$(date) cloud-early-config $@" >> /var/log/cloud.log
   log_action_msg "$@"
 }
 
@@ -52,11 +52,11 @@ init_interfaces_orderby_macs() {
 total_nics=${#macs[@]}
 interface_file=${2:-"/etc/network/interfaces"}
 rule_file=${3:-"/etc/udev/rules.d/70-persistent-net.rules"}
-
+
 echo -n "auto lo" > $interface_file
 for((i=0; i> $interface_file
 fi
@@ -70,7 +70,7 @@ EOF
 echo "" > $rule_file
 for((i=0; i < ${#macs[@]}; i++))
 do
-echo "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", 
ATTR{address}==\"${macs[$i]}\", NAME=\"eth$i\"" >> $rule_file 
+echo "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", 
ATTR{address}==\"${macs[$i]}\", NAME=\"eth$i\"" >> $rule_file
 done
 }
 
@@ -151,7 +151,7 @@ get_boot_params() {
   chmod go-rwx /root/.ssh/authorized_keys
   ;;
  vmware)
-  vmtoolsd --cmd 'machine.id.get' > /var/cache/cloud/cmdline 
+  vmtoolsd --cmd 'machine.id.get' > /var/cache/cloud/cmdline
   ;;
  virtualpc|hyperv)
   # Hyper-V is recognized as virtualpc hypervisor type. Boot args are 
passed using KVP Daemon
@@ -183,7 +183,6 @@ patch() {
   local cdrom_dev=
   mkdir -p $PATCH_MOUNT
 
-
   if [ -e /dev/xvdd ]; then

[GitHub] rhtyd commented on issue #2214: Speed-up VR initialisation/configuration

2017-12-10 Thread GitBox
rhtyd commented on issue #2214: Speed-up VR initialisation/configuration
URL: https://github.com/apache/cloudstack/pull/2214#issuecomment-350585533
 
 
   Thanks @PaulAngus and @DagSonsteboSB for the initial work, I've used the 
concepts to polish the implementation in #2211 and we're able to show that 
patching is do-able without needing reboot. With that I'll close this PR since 
it's not maintained and rest of work has already continued in #2211. Again, 
many thanks for the effort. 


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 #1603: Vrouter fixes pylint

2017-12-10 Thread GitBox
rhtyd closed pull request #1603: Vrouter fixes pylint
URL: https://github.com/apache/cloudstack/pull/1603
 
 
   

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/systemvm/patches/debian/config/opt/cloud/bin/baremetal-vr.py 
b/systemvm/patches/debian/config/opt/cloud/bin/baremetal-vr.py
index 51ab5822353..24538af5885 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/baremetal-vr.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/baremetal-vr.py
@@ -15,8 +15,6 @@
 #specific language governing permissions and limitations
 #under the License.
 
-__author__ = 'frank'
-
 import subprocess
 import urllib
 import hmac
@@ -27,6 +25,8 @@
 
 from flask import Flask
 
+__author__ = 'frank'
+
 app = Flask(__name__)
 
 logger = logging.getLogger('baremetal-vr')
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/configure.py 
b/systemvm/patches/debian/config/opt/cloud/bin/configure.py
index dd164a2aae6..524bc6ac852 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/configure.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/configure.py
@@ -16,28 +16,20 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-import sys
-import os
 import base64
-
-from merge import DataBag
-from pprint import pprint
-import subprocess
 import logging
-import re
-import time
-import shutil
-import os.path
 import os
+import os.path
+import re
+import sys
 from fcntl import flock, LOCK_EX, LOCK_UN
 
-from cs.CsDatabag import CsDataBag, CsCmdLine
-import cs.CsHelper
+from cs.CsDatabag import CsDataBag
+from cs import CsHelper
 from cs.CsNetfilter import CsNetfilters
 from cs.CsDhcp import CsDhcp
-from cs.CsRedundant import *
+from cs.CsRedundant import CsRedundant
 from cs.CsFile import CsFile
-from cs.CsApp import CsApache, CsDnsmasq
 from cs.CsMonitor import CsMonitor
 from cs.CsLoadBalancer import CsLoadBalancer
 from cs.CsConfig import CsConfig
@@ -46,9 +38,8 @@
 
 
 class CsPassword(CsDataBag):
-
-TOKEN_FILE="/tmp/passwdsrvrtoken"
-
+TOKEN_FILE = "/tmp/passwdsrvrtoken"
+
 def process(self):
 for item in self.dbag:
 if item == "id":
@@ -61,7 +52,7 @@ def __update(self, vm_ip, password):
 tokenFile = open(self.TOKEN_FILE)
 token = tokenFile.read()
 except IOError:
-logging.debug("File %s does not exist" % self.TOKEN_FILE)
+logging.debug("File %s does not exist", self.TOKEN_FILE)
 
 ips_cmd = "ip addr show | grep inet | awk '{print $2}'"
 ips = CsHelper.execute(ips_cmd)
@@ -69,19 +60,28 @@ def __update(self, vm_ip, password):
 server_ip = ip.split('/')[0]
 proc = CsProcess(['/opt/cloud/bin/passwd_server_ip.py', server_ip])
 if proc.find():
-update_command = 'curl --header "DomU_Request: save_password" 
"http://{SERVER_IP}:8080/; -F "ip={VM_IP}" -F "password={PASSWORD}" ' \
-'-F "token={TOKEN}" >/dev/null 2>/dev/null 
&'.format(SERVER_IP=server_ip, VM_IP=vm_ip, PASSWORD=password, TOKEN=token)
+update_command = (
+'curl --header "DomU_Request: save_password"'
+' "http://{SERVER_IP}:8080/; -F "ip={VM_IP}"'
+' -F "password={PASSWORD}" -F "token={TOKEN}"'
+'>/dev/null 2>/dev/null &'.format(
+SERVER_IP=server_ip,
+VM_IP=vm_ip,
+PASSWORD=password,
+TOKEN=token,
+)
+)
 result = CsHelper.execute(update_command)
-logging.debug("Update password server result ==> %s" % result)
+logging.debug("Update password server result ==> %s", result)
 
 
 class CsAcl(CsDataBag):
-"""
-Deal with Network acls
+"""Deal with Network acls
 """
 
 class AclIP():
-""" For type Virtual Router """
+"""For type Virtual Router
+"""
 
 def __init__(self, obj, fw):
 self.fw = fw.get_fw()
@@ -99,7 +99,7 @@ def __init__(self, obj, fw):
 
 self.rule['allowed'] = True
 self.rule['action'] = "ACCEPT"
-
+
 if self.rule['type'] == 'all' and not obj['source_cidr_list']:
 self.rule['cidr'] = ['0.0.0.0/0']
 else:
@@ -118,14 +118,14 @@ def add_rule(self, cidr):
 if "icmp_type" in self.rule.keys() and self.rule['icmp_type'] != 
-1:
 icmp_type = self.rule['icmp_type']
 if "icmp_code" in self.rule.keys() and rule['icmp_code'] != -1:
-icmp_type = "%s/%s" % (self.rule['icmp_type'], 

[GitHub] rhtyd commented on issue #1603: Vrouter fixes pylint

2017-12-10 Thread GitBox
rhtyd commented on issue #1603: Vrouter fixes pylint
URL: https://github.com/apache/cloudstack/pull/1603#issuecomment-350583532
 
 
   Thanks @romain-dartigues for your PR, I've included similar changes in PR 
#2211 and added pylint/pep checks to Travis. Due to duplicate nature of work 
and that this PR has not received much activity in last 1+ year I'll close 
this. Many thanks again for your hard work and initiative.


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


With regards,
Apache Git Services


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

2017-12-10 Thread 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


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

commit 42e7fcd04a7cbbc186e63497db81521bb1de6b58
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" '].


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

2017-12-10 Thread GitBox
blueorangutan commented on issue #2211: CLOUDSTACK-10013: Migrate 
systemvmtemplate to Debian9
URL: https://github.com/apache/cloudstack/pull/2211#issuecomment-350582038
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1358


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


With regards,
Apache Git Services


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

2017-12-10 Thread GitBox
blueorangutan commented on issue #2211: CLOUDSTACK-10013: Migrate 
systemvmtemplate to Debian9
URL: https://github.com/apache/cloudstack/pull/2211#issuecomment-350559753
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1357


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


With regards,
Apache Git Services


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

2017-12-10 Thread GitBox
blueorangutan commented on issue #2211: CLOUDSTACK-10013: Migrate 
systemvmtemplate to Debian9
URL: https://github.com/apache/cloudstack/pull/2211#issuecomment-350507686
 
 
   Trillian test result (tid-1759)
   Environment: xenserver-65sp1 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 31521 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2211-t1759-xenserver-65sp1.zip
   Test completed. Failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_02_create_template_with_checksum_sha1 | `Error` | 5.23 | 
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.22 | 
test_templates.py
   test_01_volume_usage | `Error` | 20.87 | test_usage.py
   test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL | `Failure` | 457.99 | 
test_vpc_redundant.py
   test_05_rvpc_multi_tiers | `Failure` | 465.32 | test_vpc_redundant.py
   


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


With regards,
Apache Git Services


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

2017-12-10 Thread GitBox
blueorangutan commented on issue #2211: CLOUDSTACK-10013: Migrate 
systemvmtemplate to Debian9
URL: https://github.com/apache/cloudstack/pull/2211#issuecomment-350507602
 
 
   Trillian test result (tid-1760)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 26029 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2211-t1760-kvm-centos7.zip
   Test completed. Failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_01_sys_vm_start | `Failure` | 0.16 | test_secondary_storage.py
   test_05_stop_ssvm | `Error` | 5.23 | test_ssvm.py
   test_09_destroy_ssvm | `Error` | 5.19 | test_ssvm.py
   test_02_create_template_with_checksum_sha1 | `Error` | 5.22 | 
test_templates.py
   test_03_create_template_with_checksum_sha256 | `Error` | 5.27 | 
test_templates.py
   test_04_create_template_with_checksum_md5 | `Error` | 5.25 | 
test_templates.py
   test_08_migrate_vm | `Error` | 35.90 | test_vm_life_cycle.py
   test_05_rvpc_multi_tiers | `Failure` | 362.65 | test_vpc_redundant.py
   test_05_rvpc_multi_tiers | `Error` | 408.59 | test_vpc_redundant.py
   


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


With regards,
Apache Git Services


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

2017-12-10 Thread GitBox
blueorangutan commented on issue #2211: CLOUDSTACK-10013: Migrate 
systemvmtemplate to Debian9
URL: https://github.com/apache/cloudstack/pull/2211#issuecomment-350458330
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1356


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] dmytro-shevchenko opened a new pull request #2357: CLOUDSTACK-10182 Restrict volumes and templates download per user for security purposes

2017-12-10 Thread GitBox
dmytro-shevchenko opened a new pull request #2357: CLOUDSTACK-10182 Restrict 
volumes and templates download per user for security purposes
URL: https://github.com/apache/cloudstack/pull/2357
 
 
   https://issues.apache.org/jira/browse/CLOUDSTACK-10182


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


With regards,
Apache Git Services


[cloudstack] branch debian9-systemvmtemplate updated: refactor tests, introduce a new get_test_template that returns a small testing template such as macchinina etc.

2017-12-10 Thread 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


The following commit(s) were added to refs/heads/debian9-systemvmtemplate by 
this push:
 new d9a3a23  refactor tests, introduce a new get_test_template that 
returns a small testing template such as macchinina etc.
d9a3a23 is described below

commit d9a3a23fce7b22b817efe4b9a96b1592e64220db
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
+++ 

[GitHub] krissterckx commented on a change in pull request #2259: CLOUDSTACK-10024: Network migration support

2017-12-10 Thread GitBox
krissterckx commented on a change in pull request #2259: CLOUDSTACK-10024: 
Network migration support
URL: https://github.com/apache/cloudstack/pull/2259#discussion_r155959221
 
 

 ##
 File path: test/integration/plugins/nuagevsp/test_nuage_network_migration.py
 ##
 @@ -0,0 +1,1949 @@
+# 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.
+
+""" Network migration test with Nuage VSP SDN plugin
+"""
+# Import Local Modules
+from nuageTestCase import nuageTestCase
+from marvin.lib.base import (Account, Host)
+from marvin.lib.utils import is_server_ssh_ready
+from marvin.cloudstackAPI import updateZone
+
+# Import System Modules
+from nose.plugins.attrib import attr
+import time
+import base64
+import unittest
+import re
+
+
+class TestNuageMigration(nuageTestCase):
+"""Test Native to Nuage Migration
+"""
+
+@classmethod
+def setUpClass(cls):
+super(TestNuageMigration, cls).setUpClass()
+
+if not hasattr(cls.vsp_physical_network, "tags") \
+or cls.vsp_physical_network.tags != 'nuage':
+raise unittest.SkipTest("Require migrateACS configuration - skip")
+
+# create a native vpc offering
+cls.native_vpc_offering = cls.create_VpcOffering(cls.test_data
+ ["vpc_offering"])
+# create a nuage vpc offering
+cls.nuage_vpc_offering = \
+cls.create_VpcOffering(cls.test_data["nuagevsp"]["vpc_offering"])
+
+# tier network offerings
+cls.nuage_vpc_network_offering = \
+cls.create_NetworkOffering(cls.test_data["nuagevsp"]
+   ["vpc_network_offering"])
+cls.native_vpc_network_offering = \
+cls.create_NetworkOffering(cls.test_data
+   ["nw_offering_isolated_vpc"])
+
+# create a Nuage isolated network offering with vr
+cls.nuage_isolated_network_offering = cls.create_NetworkOffering(
+cls.test_data["nuagevsp"]["isolated_network_offering"], True)
+
+# create a Nuage isolated network offering with vr and persistent
+cls.nuage_isolated_network_offering_persistent = \
+cls.create_NetworkOffering(
+cls.test_data["nuagevsp"]
+["isolated_network_offering_persistent"],
+True)
+
+# create a Nuage isolated network offering without vr
+cls.nuage_isolated_network_offering_without_vr = \
+cls.create_NetworkOffering(
+cls.test_data["nuagevsp"]
+["isolated_network_offering_without_vr"],
+True)
+
+# create a Nuage isolated network offering without vr but persistent
+cls.nuage_isolated_network_offering_without_vr_persistent = \
+cls.create_NetworkOffering(
+cls.test_data["nuagevsp"]
+["isolated_network_offering_without_vr_persistent"],
+True)
+
+# create a native isolated network offering
+cls.native_isolated_network_offering = cls.create_NetworkOffering(
+cls.test_data["isolated_network_offering"], True)
+
+# create a native persistent isolated network offering
+cls.native_isolated_network_offering_persistent = \
+cls.create_NetworkOffering(
+cls.test_data["nw_off_isolated_persistent"], True)
+
+# create a native persistent staticNat isolated network offering
+cls.native_isolated_network_staticnat_offering_persistent = \
+cls.create_NetworkOffering(
+cls.test_data["isolated_staticnat_network_offering"], True)
+
+# create a Native shared network offering
+cls.native_shared_network_offering = cls.create_NetworkOffering(
+cls.test_data["shared_network_offering"], False)
+
+# create a Nuage shared network offering
+cls.nuage_shared_network_offering = cls.create_NetworkOffering(
+cls.test_data["nuagevsp"]["shared_nuage_network_offering"],
+False)
+
+cls.vmware_info = None
+
+cls._cleanup = [
+cls.nuage_isolated_network_offering,
+

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

2017-12-10 Thread GitBox
blueorangutan commented on issue #2211: CLOUDSTACK-10013: Migrate 
systemvmtemplate to Debian9
URL: https://github.com/apache/cloudstack/pull/2211#issuecomment-350559753
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1357


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


With regards,
Apache Git Services


[cloudstack] branch debian9-systemvmtemplate updated: using debian 9.3.0 now :)

2017-12-10 Thread 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


The following commit(s) were added to refs/heads/debian9-systemvmtemplate by 
this push:
 new f86ca55  using debian 9.3.0 now :)
f86ca55 is described below

commit f86ca5517195fe0f662c2acb0accbd786b172693
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: update per new macchinina template

2017-12-10 Thread 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


The following commit(s) were added to refs/heads/debian9-systemvmtemplate by 
this push:
 new 5d0fabb  update per new macchinina template
5d0fabb is described below

commit 5d0fabbd8eca9d5d344998425e96200a8c739d6c
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 9feb9b7..8666090 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -2272,7 +2272,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
---