[GitHub] marcaurele commented on issue #2373: CLOUDSTACK-10202:createSnapshotPolicy API create multiple entries in DB for same parameters.

[GitBox]

marcaurele commented on issue #2373: CLOUDSTACK-10202:createSnapshotPolicy API 
create multiple entries in DB for same parameters.
URL: https://github.com/apache/cloudstack/pull/2373#issuecomment-353274356
 
 
   I'm not convinced that such a fix is needed. In what scenario do you need to 
send multiple identical requests?


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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] marcaurele commented on a change in pull request #2373: CLOUDSTACK-10202:createSnapshotPolicy API create multiple entries in DB for same parameters.

[GitBox]

marcaurele commented on a change in pull request #2373: 
CLOUDSTACK-10202:createSnapshotPolicy API create multiple entries in DB for 
same parameters.
URL: https://github.com/apache/cloudstack/pull/2373#discussion_r158208194
 
 

 ##
 File path: server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
 ##
 @@ -854,15 +856,18 @@ public SnapshotPolicyVO 
createPolicy(CreateSnapshotPolicyCmd cmd, Account policy
 throw new InvalidParameterValueException("Max number of 
snapshots shouldn't exceed the " + message + " level snapshot limit");
 }
 }
-SnapshotPolicyVO policy = 
_snapshotPolicyDao.findOneByVolumeInterval(volumeId, intvType);
-if (policy == null) {
-policy = new SnapshotPolicyVO(volumeId, cmd.getSchedule(), 
timezoneId, intvType, cmd.getMaxSnaps(), display);
-policy = _snapshotPolicyDao.persist(policy);
-_snapSchedMgr.scheduleNextSnapshotJob(policy);
-} else {
-try {
+
+final GlobalLock createSnapshotPolicyLock = 
GlobalLock.getInternLock("createSnapshotPolicy");
 
 Review comment:
   Would be more effective to append the volume id in the lock name to avoid 
locking the call for all snapshot policy.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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-353269253
 
 
   Trillian test result (tid-1851)
   Environment: vmware-55u3 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 40948 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2211-t1851-vmware-55u3.zip
   Smoke tests completed. 65 look OK, 1 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_05_rvpc_multi_tiers | `Failure` | 599.37 | test_vpc_redundant.py
   test_05_rvpc_multi_tiers | `Error` | 660.48 | 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] marcaurele commented on a change in pull request #2211: CLOUDSTACK-10013: Migrate systemvmtemplate to Debian9

[GitBox]

marcaurele commented on a change in pull request #2211: CLOUDSTACK-10013: 
Migrate systemvmtemplate to Debian9
URL: https://github.com/apache/cloudstack/pull/2211#discussion_r158202337
 
 

 ##
 File path: systemvm/debian/opt/cloud/bin/cs/CsDhcp.py
 ##
 @@ -80,7 +80,7 @@ def configure_server(self):
 # DNS search order
 if gn.get_dns() and device:
 sline = "dhcp-option=tag:interface-%s-%s,6" % (device, idx)
-dns_list = [x for x in gn.get_dns() if x is not None]
+dns_list = [x for x in gn.get_dns() if not (not x)]
 
 Review comment:
   `not (not x))` Why a double negation?


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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] marcaurele commented on a change in pull request #2211: CLOUDSTACK-10013: Migrate systemvmtemplate to Debian9

[GitBox]

marcaurele commented on a change in pull request #2211: CLOUDSTACK-10013: 
Migrate systemvmtemplate to Debian9
URL: https://github.com/apache/cloudstack/pull/2211#discussion_r158201994
 
 

 ##
 File path: python/lib/cloudutils/utilities.py
 ##
 @@ -216,8 +216,8 @@ def isKVMEnabled(self):
 class serviceOpsRedhat7(serviceOps):
 def isServiceRunning(self, servicename):
 try:
-o = bash("systemctl status " + servicename)
-if "running" in o.getStdout() or "start" in o.getStdout() or 
"Running" in o.getStdout():
+o = bash("systemctl is-active " + servicename)
+if "inactive" not in o.getStdout():
 
 Review comment:
   if statement can be simplified to: `return "inactive" not in o.getStdout()`


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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] marcaurele commented on a change in pull request #2211: CLOUDSTACK-10013: Migrate systemvmtemplate to Debian9

[GitBox]

marcaurele commented on a change in pull request #2211: CLOUDSTACK-10013: 
Migrate systemvmtemplate to Debian9
URL: https://github.com/apache/cloudstack/pull/2211#discussion_r158201460
 
 

 ##
 File path: tools/appliance/systemvmtemplate/scripts/definition.rb
 ##
 @@ -29,7 +29,7 @@
 :os_type_id => 'Debian_64',
 :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'
+:iso_md5 => 
'8775231d6f56a3d8f116eb64fe048f5cbd2ea0f8c092a1cb7608bcb4106f9c85cb69ce68f53bd381019ab40f1c0316843036daf3fd9107c81c58a240334cc747'
 
 Review comment:
   md5 can't be that lengthy. Is this parameter really checked somewhere since 
it cannot match? This line is the sha512 signature


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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] marcaurele commented on a change in pull request #2211: CLOUDSTACK-10013: Migrate systemvmtemplate to Debian9

[GitBox]

marcaurele commented on a change in pull request #2211: CLOUDSTACK-10013: 
Migrate systemvmtemplate to Debian9
URL: https://github.com/apache/cloudstack/pull/2211#discussion_r158200899
 
 

 ##
 File path: engine/schema/src/com/cloud/upgrade/dao/Upgrade41000to41100.java
 ##
 @@ -52,8 +64,181 @@ public boolean supportsRollingUpgrade() {
 
 @Override
 public void performDataMigration(Connection conn) {
+updateSystemVmTemplates(conn);
 }
 
+@SuppressWarnings("serial")
+private void updateSystemVmTemplates(final Connection conn) {
+LOG.debug("Updating System Vm template IDs");
+// Get all hypervisors in use
+final Set hypervisorsListInUse = new 
HashSet();
+try (PreparedStatement pstmt = conn.prepareStatement("select 
distinct(hypervisor_type) from `cloud`.`cluster` where removed is null"); 
ResultSet rs = pstmt.executeQuery()) {
+while (rs.next()) {
+switch (Hypervisor.HypervisorType.getType(rs.getString(1))) {
+case XenServer:
+
hypervisorsListInUse.add(Hypervisor.HypervisorType.XenServer);
+break;
+case KVM:
+
hypervisorsListInUse.add(Hypervisor.HypervisorType.KVM);
+break;
+case VMware:
+
hypervisorsListInUse.add(Hypervisor.HypervisorType.VMware);
+break;
+case Hyperv:
+
hypervisorsListInUse.add(Hypervisor.HypervisorType.Hyperv);
+break;
+case LXC:
+
hypervisorsListInUse.add(Hypervisor.HypervisorType.LXC);
+break;
+case Ovm3:
+
hypervisorsListInUse.add(Hypervisor.HypervisorType.Ovm3);
+break;
+default:
+break;
+}
+}
+} catch (final SQLException e) {
+LOG.error("updateSystemVmTemplates: Exception caught while getting 
hypervisor types from clusters: " + e.getMessage());
+throw new CloudRuntimeException("updateSystemVmTemplates:Exception 
while getting hypervisor types from clusters", e);
+}
+
+final Map NewTemplateNameList = new 
HashMap() {
+{
+put(Hypervisor.HypervisorType.KVM, "systemvm-kvm-4.11");
+put(Hypervisor.HypervisorType.VMware, "systemvm-vmware-4.11");
+put(Hypervisor.HypervisorType.XenServer, 
"systemvm-xenserver-4.11");
+put(Hypervisor.HypervisorType.Hyperv, "systemvm-hyperv-4.11");
+put(Hypervisor.HypervisorType.LXC, "systemvm-lxc-4.11");
+put(Hypervisor.HypervisorType.Ovm3, "systemvm-ovm3-4.11");
+}
+};
+
+final Map 
routerTemplateConfigurationNames = new HashMap() {
+{
+put(Hypervisor.HypervisorType.KVM, "router.template.kvm");
+put(Hypervisor.HypervisorType.VMware, 
"router.template.vmware");
+put(Hypervisor.HypervisorType.XenServer, 
"router.template.xenserver");
+put(Hypervisor.HypervisorType.Hyperv, 
"router.template.hyperv");
+put(Hypervisor.HypervisorType.LXC, "router.template.lxc");
+put(Hypervisor.HypervisorType.Ovm3, "router.template.ovm3");
+}
+};
+
+final Map newTemplateUrl = new 
HashMap() {
+{
+// FIXME: upload templates
+put(Hypervisor.HypervisorType.KVM, 
"https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.0-kvm.qcow2.bz2;);
+put(Hypervisor.HypervisorType.VMware, 
"https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.0-vmware.ova;);
+put(Hypervisor.HypervisorType.XenServer, 
"https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.0-xen.vhd.bz2;);
+put(Hypervisor.HypervisorType.Hyperv, 
"https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.0-hyperv.vhd.zip;);
+put(Hypervisor.HypervisorType.LXC, 
"https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.0-kvm.qcow2.bz2;);
+put(Hypervisor.HypervisorType.Ovm3, 
"https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.0-ovm.raw.bz2;);
+}
+};
+
+final Map newTemplateChecksum = new 
HashMap() {
+{
+// FIXME: update checksums?
+put(Hypervisor.HypervisorType.KVM, 

[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-353259640
 
 
   Trillian test result (tid-1854)
   Environment: vmware-65 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 27124 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2211-t1854-vmware-65.zip
   Smoke tests completed. 66 look OK, 0 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   


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


With regards,
Apache Git Services

[GitHub] niteshsarda opened a new pull request #2373: CLOUDSTACK-10202:createSnapshotPolicy API create multiple entries in DB for same parameters.

[GitBox]

niteshsarda opened a new pull request #2373: 
CLOUDSTACK-10202:createSnapshotPolicy API create multiple entries in DB for 
same parameters.
URL: https://github.com/apache/cloudstack/pull/2373
 
 
   **ISSUE :**
   createSnapshotPolicy API create multiple entries in DB for same parameters, 
if multiple threads are executed in parallel.
   
   **STEPS TO REPRODUCE :**
   1. Created a new machine having root and data disk.
   2. Make sure that no existing snapshot policy is present for the volume.
   3. Execute multiple threads in parallel for createSnapshotPolicy API having 
all required parameters exactly same.
   4. Verify table snapshot_policy in DB, will get multiple entries for same 
policy.
   5. Once again execute same multiple threads, by changing any API parameter, 
will see that existing entries are getting modified in DB and no new entries 
are added.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #2259: CLOUDSTACK-10024: Network migration support

[GitBox]

blueorangutan commented on issue #2259: CLOUDSTACK-10024: Network migration 
support
URL: https://github.com/apache/cloudstack/pull/2259#issuecomment-353250736
 
 
   Trillian test result (tid-1847)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 34856 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2259-t1847-kvm-centos7.zip
   Smoke tests completed. 61 look OK, 6 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   ContextSuite context=TestDeployVirtioSCSIVM>:teardown | `Error` | 50.73 | 
test_deploy_virtio_scsi_vm.py
   test_01_internallb_roundrobin_1VPC_3VM_HTTP_port80 | `Failure` | 255.03 | 
test_internal_lb.py
   test_01_vpc_privategw_acl | `Failure` | 86.85 | test_privategw_acl.py
   test_02_vpc_privategw_static_routes | `Failure` | 238.53 | 
test_privategw_acl.py
   test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 198.16 | 
test_privategw_acl.py
   test_04_rvpc_privategw_static_routes | `Failure` | 334.25 | 
test_privategw_acl.py
   test_02_create_template_with_checksum_sha1 | `Error` | 5.21 | 
test_templates.py
   test_03_create_template_with_checksum_sha256 | `Error` | 5.22 | 
test_templates.py
   test_04_create_template_with_checksum_md5 | `Error` | 5.26 | 
test_templates.py
   test_01_vpc_remote_access_vpn | `Error` | 55.90 | test_vpc_vpn.py
   test_02_cancel_host_maintenace_with_migration_jobs | `Error` | 202.12 | 
test_host_maintenance.py
   


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


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #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-353245912
 
 
   Trillian test result (tid-1850)
   Environment: xenserver-65sp1 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 31332 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2211-t1850-xenserver-65sp1.zip
   Smoke tests completed. 65 look OK, 1 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_04_extract_Iso | `Failure` | 5.10 | test_iso.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 #2304: CLOUDSTACK-10127: KVM + Ovs: Incorrect devId on static nat

[GitBox]

blueorangutan commented on issue #2304: CLOUDSTACK-10127: KVM + Ovs: Incorrect 
devId on static nat
URL: https://github.com/apache/cloudstack/pull/2304#issuecomment-353236302
 
 
   Trillian test result (tid-1852)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 24225 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2304-t1852-kvm-centos7.zip
   Smoke tests completed. 51 look OK, 3 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_02_edit_iso | `Failure` | 0.08 | test_iso.py
   test_05_iso_permissions | `Failure` | 0.07 | test_iso.py
   test_04_rvpc_privategw_static_routes | `Failure` | 447.95 | 
test_privategw_acl.py
   test_10_attachAndDetach_iso | `Error` | 31.96 | test_vm_life_cycle.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 #2035: CLOUDSTACK-9867:VM snapshot on primary storage usage metrics

[GitBox]

blueorangutan commented on issue #2035: CLOUDSTACK-9867:VM snapshot on primary 
storage usage metrics
URL: https://github.com/apache/cloudstack/pull/2035#issuecomment-353234519
 
 
   Trillian test result (tid-1846)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 36054 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2035-t1846-kvm-centos7.zip
   Smoke tests completed. 62 look OK, 5 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_isolate_network_password_server | `Failure` | 126.57 | 
test_password_server.py
   test_01_vpc_privategw_acl | `Failure` | 87.41 | test_privategw_acl.py
   test_02_vpc_privategw_static_routes | `Failure` | 319.93 | 
test_privategw_acl.py
   test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 229.05 | 
test_privategw_acl.py
   test_04_rvpc_privategw_static_routes | `Failure` | 596.73 | 
test_privategw_acl.py
   test_02_create_template_with_checksum_sha1 | `Error` | 5.25 | 
test_templates.py
   test_03_create_template_with_checksum_sha256 | `Error` | 5.28 | 
test_templates.py
   test_04_create_template_with_checksum_md5 | `Error` | 5.23 | 
test_templates.py
   test_01_VPC_nics_after_destroy | `Failure` | 887.36 | test_vpc_router_nics.py
   test_01_vpc_remote_access_vpn | `Error` | 55.86 | 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-353227368
 
 
   Trillian test result (tid-1848)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 24537 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2211-t1848-kvm-centos7.zip
   Smoke tests completed. 65 look OK, 1 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_04_rvpc_network_garbage_collector_nics | `Failure` | 284.53 | 
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] wido commented on issue #2046: CLOUDSTACK-7958: Add configuration for limit to CIDRs for Admin API calls

[GitBox]

wido commented on issue #2046: CLOUDSTACK-7958: Add configuration for limit to 
CIDRs for Admin API calls
URL: https://github.com/apache/cloudstack/pull/2046#issuecomment-353223857
 
 
   I will fix fhe conflicts asap


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #1934: [CLOUDSTACK-9772] Template: perform a HEAD request to check file size from a URL

[GitBox]

blueorangutan commented on issue #1934: [CLOUDSTACK-9772] Template: perform a 
HEAD request to check file size from a URL
URL: https://github.com/apache/cloudstack/pull/1934#issuecomment-353217491
 
 
   Trillian test result (tid-1843)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 37009 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr1934-t1843-kvm-centos7.zip
   Smoke tests completed. 61 look OK, 6 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_01_vpc_privategw_acl | `Failure` | 81.88 | test_privategw_acl.py
   test_02_vpc_privategw_static_routes | `Failure` | 228.37 | 
test_privategw_acl.py
   test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 228.48 | 
test_privategw_acl.py
   test_04_rvpc_privategw_static_routes | `Failure` | 425.00 | 
test_privategw_acl.py
   test_01_RVR_Network_FW_PF_SSH_default_routes_egress_true | `Failure` | 
406.98 | test_routers_network_ops.py
   test_02_create_template_with_checksum_sha1 | `Error` | 5.32 | 
test_templates.py
   test_03_create_template_with_checksum_sha256 | `Error` | 5.26 | 
test_templates.py
   test_04_create_template_with_checksum_md5 | `Error` | 5.22 | 
test_templates.py
   test_04_extract_template | `Failure` | 132.29 | test_templates.py
   test_06_download_detached_volume | `Failure` | 147.62 | test_volumes.py
   test_01_vpc_remote_access_vpn | `Error` | 56.04 | test_vpc_vpn.py
   test_hostha_kvm_host_fencing | `Failure` | 792.77 | test_hostha_kvm.py
   


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


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2368: CLOUDSTACK-10126: Separate Subnet for SSVM and CPVM

[GitBox]

blueorangutan commented on issue #2368: CLOUDSTACK-10126: Separate Subnet for 
SSVM and CPVM
URL: https://github.com/apache/cloudstack/pull/2368#issuecomment-353214171
 
 
   Trillian test result (tid-1844)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 35357 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2368-t1844-kvm-centos7.zip
   Smoke tests completed. 62 look OK, 5 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_01_vpc_privategw_acl | `Failure` | 71.98 | test_privategw_acl.py
   test_02_vpc_privategw_static_routes | `Failure` | 264.34 | 
test_privategw_acl.py
   test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 168.34 | 
test_privategw_acl.py
   test_04_rvpc_privategw_static_routes | `Failure` | 324.34 | 
test_privategw_acl.py
   test_02_RVR_Network_FW_PF_SSH_default_routes_egress_false | `Failure` | 
349.12 | test_routers_network_ops.py
   test_02_create_template_with_checksum_sha1 | `Error` | 5.29 | 
test_templates.py
   test_03_create_template_with_checksum_sha256 | `Error` | 15.46 | 
test_templates.py
   test_04_create_template_with_checksum_md5 | `Error` | 15.36 | 
test_templates.py
   test_01_volume_usage | `Failure` | 917.39 | test_usage.py
   test_01_vpc_remote_access_vpn | `Error` | 131.79 | 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] borisstoyanov commented on issue #2360: Adding nuage VSD managed network support to CloudStack.

[GitBox]

borisstoyanov commented on issue #2360: Adding nuage VSD managed network 
support to CloudStack.
URL: https://github.com/apache/cloudstack/pull/2360#issuecomment-353199909
 
 
   @krissterckx can you please remind be over the weekend, cause we're running 
pretty hot at our lab at the moment. 


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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-353199011
 
 
   Trillian test result (tid-1842)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 35955 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2301-t1842-kvm-centos7.zip
   Smoke tests completed. 62 look OK, 5 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_oobm_zchange_password | `Error` | 10.27 | test_outofbandmanagement.py
   test_01_vpc_privategw_acl | `Failure` | 61.84 | test_privategw_acl.py
   test_02_vpc_privategw_static_routes | `Failure` | 279.43 | 
test_privategw_acl.py
   test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 143.66 | 
test_privategw_acl.py
   test_04_rvpc_privategw_static_routes | `Failure` | 435.19 | 
test_privategw_acl.py
   test_02_create_template_with_checksum_sha1 | `Error` | 5.27 | 
test_templates.py
   test_03_create_template_with_checksum_sha256 | `Error` | 5.28 | 
test_templates.py
   test_04_create_template_with_checksum_md5 | `Error` | 5.40 | 
test_templates.py
   test_01_vpc_remote_access_vpn | `Failure` | 71.14 | test_vpc_vpn.py
   test_hostha_kvm_host_fencing | `Error` | 1117.65 | test_hostha_kvm.py
   


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


With regards,
Apache Git Services

[GitHub] voloshanenko commented on issue #2367: Fix ACL_INBOUND/OUTBOUND rules for PrivateGateway

[GitBox]

voloshanenko commented on issue #2367: Fix ACL_INBOUND/OUTBOUND rules for 
PrivateGateway
URL: https://github.com/apache/cloudstack/pull/2367#issuecomment-353189844
 
 
   Hrm .. only test_01 can somehow relate to this patch . Will check
   
   All other - something very strange
   
   ??, 20 ???. 2017 ?. ? 23:37, Blue Orangutan Build Things <
   notificati...@github.com>:
   
   > *Trillian test result (tid-1840)*
   > Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   > Total time taken: 34293 seconds
   > Marvin logs:
   > 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2367-t1840-kvm-centos7.zip
   > Smoke tests completed. 63 look OK, 4 have error(s)
   > Only failed tests results shown below:
   > Test Result Time (s) Test File
   > ContextSuite context=TestDeployVirtioSCSIVM>:setup Error 0.00
   > test_deploy_virtio_scsi_vm.py
   > test_01_vpc_privategw_acl Failure 72.29 test_privategw_acl.py
   > test_02_vpc_privategw_static_routes Failure 243.56 test_privategw_acl.py
   > test_03_vpc_privategw_restart_vpc_cleanup Failure 203.33
   > test_privategw_acl.py
   > test_04_rvpc_privategw_static_routes Failure 399.80 test_privategw_acl.py
   > test_02_create_template_with_checksum_sha1 Error 5.22 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_vpc_remote_access_vpn Error 60.89 test_vpc_vpn.py
   >
   > ?
   > You are receiving this because you authored the thread.
   > Reply to this email directly, view it on GitHub
   > ,
   > or mute the thread
   > 

   > .
   >
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #2367: Fix ACL_INBOUND/OUTBOUND rules for PrivateGateway

[GitBox]

blueorangutan commented on issue #2367: Fix ACL_INBOUND/OUTBOUND rules for 
PrivateGateway
URL: https://github.com/apache/cloudstack/pull/2367#issuecomment-353189373
 
 
   Trillian test result (tid-1840)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 34293 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2367-t1840-kvm-centos7.zip
   Smoke tests completed. 63 look OK, 4 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   ContextSuite context=TestDeployVirtioSCSIVM>:setup | `Error` | 0.00 | 
test_deploy_virtio_scsi_vm.py
   test_01_vpc_privategw_acl | `Failure` | 72.29 | test_privategw_acl.py
   test_02_vpc_privategw_static_routes | `Failure` | 243.56 | 
test_privategw_acl.py
   test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 203.33 | 
test_privategw_acl.py
   test_04_rvpc_privategw_static_routes | `Failure` | 399.80 | 
test_privategw_acl.py
   test_02_create_template_with_checksum_sha1 | `Error` | 5.22 | 
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_vpc_remote_access_vpn | `Error` | 60.89 | 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 #2365: CLOUDSTACK-10197: Rename xentools iso for XenServer 7.0+

[GitBox]

blueorangutan commented on issue #2365: CLOUDSTACK-10197: Rename xentools iso 
for XenServer 7.0+
URL: https://github.com/apache/cloudstack/pull/2365#issuecomment-353180221
 
 
   @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 #2365: CLOUDSTACK-10197: Rename xentools iso for XenServer 7.0+

[GitBox]

rhtyd commented on issue #2365: CLOUDSTACK-10197: Rename xentools iso for 
XenServer 7.0+
URL: https://github.com/apache/cloudstack/pull/2365#issuecomment-353180027
 
 
   @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] rhtyd commented on issue #2208: CLOUDSTACK-9542 make listNics and ListUserVms return uniform NIC data

[GitBox]

rhtyd commented on issue #2208: CLOUDSTACK-9542 make listNics and ListUserVms 
return uniform NIC data
URL: https://github.com/apache/cloudstack/pull/2208#issuecomment-353178407
 
 
   Tests lgtm, additional review required for merging 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 #2208: CLOUDSTACK-9542 make listNics and ListUserVms return uniform NIC data

[GitBox]

blueorangutan commented on issue #2208: CLOUDSTACK-9542 make listNics and 
ListUserVms return uniform NIC data
URL: https://github.com/apache/cloudstack/pull/2208#issuecomment-353176011
 
 
   Trillian test result (tid-1841)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 30267 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2208-t1841-kvm-centos7.zip
   Smoke tests completed. 64 look OK, 3 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_01_vpc_privategw_acl | `Failure` | 46.77 | test_privategw_acl.py
   test_02_vpc_privategw_static_routes | `Failure` | 148.00 | 
test_privategw_acl.py
   test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 193.41 | 
test_privategw_acl.py
   test_04_rvpc_privategw_static_routes | `Failure` | 304.25 | 
test_privategw_acl.py
   test_02_create_template_with_checksum_sha1 | `Error` | 5.24 | 
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 | `Error` | 45.86 | 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 #2365: CLOUDSTACK-10197: Rename xentools iso for XenServer 7.0+

[GitBox]

blueorangutan commented on issue #2365: CLOUDSTACK-10197: Rename xentools iso 
for XenServer 7.0+
URL: https://github.com/apache/cloudstack/pull/2365#issuecomment-353164684
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1449


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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-353163961
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1448


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #2344: CLOUDSTACK-10163: Component tests sanity

[GitBox]

rhtyd commented on issue #2344: CLOUDSTACK-10163: Component tests sanity
URL: https://github.com/apache/cloudstack/pull/2344#issuecomment-353160818
 
 
   Looks like wildcard passing of component tests did not work, this only ran 
smoke tests. Maybe use jenkins directly to kick component tests @borisstoyanov? 


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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] krissterckx commented on issue #2360: Adding nuage VSD managed network support to CloudStack.

[GitBox]

krissterckx commented on issue #2360: Adding nuage VSD managed network support 
to CloudStack.
URL: https://github.com/apache/cloudstack/pull/2360#issuecomment-353159504
 
 
   @borisstoyanov can you launch trillian to this one as well ? Thanks


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


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2365: CLOUDSTACK-10197: Rename xentools iso for XenServer 7.0+

[GitBox]

blueorangutan commented on issue #2365: CLOUDSTACK-10197: Rename xentools iso 
for XenServer 7.0+
URL: https://github.com/apache/cloudstack/pull/2365#issuecomment-353157252
 
 
   @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 #2365: CLOUDSTACK-10197: Rename xentools iso for XenServer 7.0+

[GitBox]

rhtyd commented on issue #2365: CLOUDSTACK-10197: Rename xentools iso for 
XenServer 7.0+
URL: https://github.com/apache/cloudstack/pull/2365#issuecomment-353156904
 
 
   Okay
   @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] khos2ow commented on issue #2365: CLOUDSTACK-10197: Rename xentools iso for XenServer 7.0+

[GitBox]

khos2ow commented on issue #2365: CLOUDSTACK-10197: Rename xentools iso for 
XenServer 7.0+
URL: https://github.com/apache/cloudstack/pull/2365#issuecomment-353156142
 
 
   @rhtyd should be fine now, there was a code-style issue which I fixed it.


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


With regards,
Apache Git Services

[GitHub] rhtyd commented on issue #2304: CLOUDSTACK-10127: KVM + Ovs: Incorrect devId on static nat

[GitBox]

rhtyd commented on issue #2304: CLOUDSTACK-10127: KVM + Ovs: Incorrect devId on 
static nat
URL: https://github.com/apache/cloudstack/pull/2304#issuecomment-353155743
 
 
   @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 #2304: CLOUDSTACK-10127: KVM + Ovs: Incorrect devId on static nat

[GitBox]

blueorangutan commented on issue #2304: CLOUDSTACK-10127: KVM + Ovs: Incorrect 
devId on static nat
URL: https://github.com/apache/cloudstack/pull/2304#issuecomment-353155898
 
 
   @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-353155905
 
 
   @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 #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-353155613
 
 
   @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 #2365: CLOUDSTACK-10197: Rename xentools iso for XenServer 7.0+

[GitBox]

rhtyd commented on issue #2365: CLOUDSTACK-10197: Rename xentools iso for 
XenServer 7.0+
URL: https://github.com/apache/cloudstack/pull/2365#issuecomment-353155323
 
 
   @khos2ow let me if you've addressed the issues, so I can kick another round 
of testing? 


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


With regards,
Apache Git Services

[cloudstack] branch master updated: CLOUDSTACK-9595: Fix regression introduced in #1762 (#2370)

[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 0e3ddb2  CLOUDSTACK-9595: Fix regression introduced in #1762 (#2370)
0e3ddb2 is described below

commit 0e3ddb2975d352a3af744454b0b1891b79188aee
Author: Rohit Yadav 
AuthorDate: Thu Dec 21 00:31:51 2017 +0530

CLOUDSTACK-9595: Fix regression introduced in #1762 (#2370)

The `assignDedicateIpAddress` previously had marked the newly fetched
IP as allocated but now it does not do that. This fails for VPCs
where SNATs IP are retained as allocating and not allocated after
creation.

Signed-off-by: Rohit Yadav 
---
 .../src/com/cloud/network/IpAddressManagerImpl.java  | 20 +---
 test/integration/smoke/test_vpc_vpn.py   |  1 +
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/server/src/com/cloud/network/IpAddressManagerImpl.java 
b/server/src/com/cloud/network/IpAddressManagerImpl.java
index ef6584f..4f3fc51 100644
--- a/server/src/com/cloud/network/IpAddressManagerImpl.java
+++ b/server/src/com/cloud/network/IpAddressManagerImpl.java
@@ -291,8 +291,8 @@ public class IpAddressManagerImpl extends ManagerBase 
implements IpAddressManage
 
 SearchBuilder AssignIpAddressSearch;
 SearchBuilder AssignIpAddressFromPodVlanSearch;
-private final Object _allocatedLock = new Object();
-private final Object _allocatingLock = new Object();
+private static final Object allocatedLock = new Object();
+private static final Object allocatingLock = new Object();
 
 static Boolean rulesContinueOnErrFlag = true;
 
@@ -834,7 +834,7 @@ public class IpAddressManagerImpl extends ManagerBase 
implements IpAddressManage
 @DB
 @Override
 public void markPublicIpAsAllocated(final IPAddressVO addr) {
-synchronized (_allocatedLock) {
+synchronized (allocatedLock) {
 Transaction.execute(new TransactionCallbackNoReturn() {
 @Override
 public void doInTransactionWithoutResult(TransactionStatus 
status) {
@@ -857,6 +857,8 @@ public class IpAddressManagerImpl extends ManagerBase 
implements IpAddressManage
 
_resourceLimitMgr.incrementResourceCount(owner.getId(), ResourceType.public_ip);
 }
 }
+} else {
+s_logger.error("Failed to mark public IP as 
allocated with id=" + addr.getId() + " address=" + addr.getAddress());
 }
 }
 }
@@ -867,14 +869,18 @@ public class IpAddressManagerImpl extends ManagerBase 
implements IpAddressManage
 
 @DB
 private void markPublicIpAsAllocating(final IPAddressVO addr) {
-synchronized (_allocatingLock) {
+synchronized (allocatingLock) {
 Transaction.execute(new TransactionCallbackNoReturn() {
 @Override
 public void doInTransactionWithoutResult(TransactionStatus 
status) {
 
 if (_ipAddressDao.lockRow(addr.getId(), true) != null) {
 addr.setState(IpAddress.State.Allocating);
-_ipAddressDao.update(addr.getId(), addr);
+if (!_ipAddressDao.update(addr.getId(), addr)) {
+s_logger.error("Failed to update public IP as 
allocating with id=" + addr.getId() + " and address=" + addr.getAddress());
+}
+} else {
+s_logger.error("Failed to lock row to mark public IP 
as allocating with id=" + addr.getId() + " and address=" + addr.getAddress());
 }
 }
 });
@@ -935,8 +941,8 @@ public class IpAddressManagerImpl extends ManagerBase 
implements IpAddressManage
 displayIp = vpc.isDisplay();
 }
 
-return fetchNewPublicIp(dcId, null, null, owner, 
VlanType.VirtualNetwork, guestNtwkId, isSourceNat, false, null, false, vpcId, 
displayIp);
-
+ip = fetchNewPublicIp(dcId, null, null, owner, 
VlanType.VirtualNetwork, guestNtwkId, isSourceNat, true, null, false, vpcId, 
displayIp);
+return ip;
 } finally {
 if (owner != null) {
 if (s_logger.isDebugEnabled()) {
diff --git a/test/integration/smoke/test_vpc_vpn.py 
b/test/integration/smoke/test_vpc_vpn.py
index ddf7693..df60686 100644
--- a/test/integration/smoke/test_vpc_vpn.py
+++ b/test/integration/smoke/test_vpc_vpn.py
@@ -390,6 +390,7 @@ class TestVpcRemoteAccessVpn(cloudstackTestCase):
 finally:
 self.logger.debug("Acquired public ip address: OK")
 
+vpn = None
   

[GitHub] rhtyd closed pull request #2370: CLOUDSTACK-9595: Fix regression introduced in #1762

[GitBox]

rhtyd closed pull request #2370: CLOUDSTACK-9595: Fix regression introduced in 
#1762
URL: https://github.com/apache/cloudstack/pull/2370
 
 
   

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

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

diff --git a/server/src/com/cloud/network/IpAddressManagerImpl.java 
b/server/src/com/cloud/network/IpAddressManagerImpl.java
index 7961d07fc6c..6af6b0340f8 100644
--- a/server/src/com/cloud/network/IpAddressManagerImpl.java
+++ b/server/src/com/cloud/network/IpAddressManagerImpl.java
@@ -291,8 +291,8 @@
 
 SearchBuilder AssignIpAddressSearch;
 SearchBuilder AssignIpAddressFromPodVlanSearch;
-private final Object _allocatedLock = new Object();
-private final Object _allocatingLock = new Object();
+private static final Object allocatedLock = new Object();
+private static final Object allocatingLock = new Object();
 
 static Boolean rulesContinueOnErrFlag = true;
 
@@ -835,7 +835,7 @@ public IPAddressVO doInTransaction(TransactionStatus 
status) throws Insufficient
 @DB
 @Override
 public void markPublicIpAsAllocated(final IPAddressVO addr) {
-synchronized (_allocatedLock) {
+synchronized (allocatedLock) {
 Transaction.execute(new TransactionCallbackNoReturn() {
 @Override
 public void doInTransactionWithoutResult(TransactionStatus 
status) {
@@ -858,6 +858,8 @@ public void doInTransactionWithoutResult(TransactionStatus 
status) {
 
_resourceLimitMgr.incrementResourceCount(owner.getId(), ResourceType.public_ip);
 }
 }
+} else {
+s_logger.error("Failed to mark public IP as 
allocated with id=" + addr.getId() + " address=" + addr.getAddress());
 }
 }
 }
@@ -868,14 +870,18 @@ public void 
doInTransactionWithoutResult(TransactionStatus status) {
 
 @DB
 private void markPublicIpAsAllocating(final IPAddressVO addr) {
-synchronized (_allocatingLock) {
+synchronized (allocatingLock) {
 Transaction.execute(new TransactionCallbackNoReturn() {
 @Override
 public void doInTransactionWithoutResult(TransactionStatus 
status) {
 
 if (_ipAddressDao.lockRow(addr.getId(), true) != null) {
 addr.setState(IpAddress.State.Allocating);
-_ipAddressDao.update(addr.getId(), addr);
+if (!_ipAddressDao.update(addr.getId(), addr)) {
+s_logger.error("Failed to update public IP as 
allocating with id=" + addr.getId() + " and address=" + addr.getAddress());
+}
+} else {
+s_logger.error("Failed to lock row to mark public IP 
as allocating with id=" + addr.getId() + " and address=" + addr.getAddress());
 }
 }
 });
@@ -936,8 +942,8 @@ public PublicIp assignDedicateIpAddress(Account owner, 
final Long guestNtwkId, f
 displayIp = vpc.isDisplay();
 }
 
-return fetchNewPublicIp(dcId, null, null, owner, 
VlanType.VirtualNetwork, guestNtwkId, isSourceNat, false, null, false, vpcId, 
displayIp);
-
+ip = fetchNewPublicIp(dcId, null, null, owner, 
VlanType.VirtualNetwork, guestNtwkId, isSourceNat, true, null, false, vpcId, 
displayIp);
+return ip;
 } finally {
 if (owner != null) {
 if (s_logger.isDebugEnabled()) {
diff --git a/test/integration/smoke/test_vpc_vpn.py 
b/test/integration/smoke/test_vpc_vpn.py
index ddf76930050..df60686f229 100644
--- a/test/integration/smoke/test_vpc_vpn.py
+++ b/test/integration/smoke/test_vpc_vpn.py
@@ -390,6 +390,7 @@ def test_01_vpc_remote_access_vpn(self):
 finally:
 self.logger.debug("Acquired public ip address: OK")
 
+vpn = None
 try:
 vpn = Vpn.create(self.apiclient,
  publicipid=ip.id,


 


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #2370: CLOUDSTACK-9595: Fix regression introduced in #1762

[GitBox]

rhtyd commented on issue #2370: CLOUDSTACK-9595: Fix regression introduced in 
#1762
URL: https://github.com/apache/cloudstack/pull/2370#issuecomment-353152782
 
 
   Tests LGTM, the new vpc vpn failure is due to create vpn user failing. I'll 
merge this based on tests and two code reviews. 


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #2370: CLOUDSTACK-9595: Fix regression introduced in #1762

[GitBox]

blueorangutan commented on issue #2370: CLOUDSTACK-9595: Fix regression 
introduced in #1762
URL: https://github.com/apache/cloudstack/pull/2370#issuecomment-353149646
 
 
   Trillian test result (tid-1839)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 28609 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2370-t1839-kvm-centos7.zip
   Smoke tests completed. 63 look OK, 4 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_01_vpc_privategw_acl | `Failure` | 41.24 | test_privategw_acl.py
   test_02_vpc_privategw_static_routes | `Failure` | 137.19 | 
test_privategw_acl.py
   test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 116.94 | 
test_privategw_acl.py
   test_04_rvpc_privategw_static_routes | `Failure` | 222.45 | 
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.15 | 
test_templates.py
   test_01_volume_usage | `Failure` | 856.60 | test_usage.py
   test_01_vpc_remote_access_vpn | `Failure` | 65.69 | 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 #2097: [4.11] CLOUDSTACK-9813: Extending Config Drive support

[GitBox]

blueorangutan commented on issue #2097: [4.11] CLOUDSTACK-9813: Extending 
Config Drive support
URL: https://github.com/apache/cloudstack/pull/2097#issuecomment-353144379
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1447


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #2304: CLOUDSTACK-10127: KVM + Ovs: Incorrect devId on static nat

[GitBox]

blueorangutan commented on issue #2304: CLOUDSTACK-10127: KVM + Ovs: Incorrect 
devId on static nat
URL: https://github.com/apache/cloudstack/pull/2304#issuecomment-353143771
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1446


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #2097: [4.11] CLOUDSTACK-9813: Extending Config Drive support

[GitBox]

blueorangutan commented on issue #2097: [4.11] CLOUDSTACK-9813: Extending 
Config Drive support
URL: https://github.com/apache/cloudstack/pull/2097#issuecomment-353137492
 
 
   @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 #2097: [4.11] CLOUDSTACK-9813: Extending Config Drive support

[GitBox]

rhtyd commented on issue #2097: [4.11] CLOUDSTACK-9813: Extending Config Drive 
support
URL: https://github.com/apache/cloudstack/pull/2097#issuecomment-353137269
 
 
   @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 #2344: CLOUDSTACK-10163: Component tests sanity

[GitBox]

blueorangutan commented on issue #2344: CLOUDSTACK-10163: Component tests sanity
URL: https://github.com/apache/cloudstack/pull/2344#issuecomment-353136667
 
 
   Trillian test result (tid-1838)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 30522 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2344-t1838-kvm-centos7.zip
   Smoke tests completed. 63 look OK, 4 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_01_vpc_privategw_acl | `Failure` | 57.06 | test_privategw_acl.py
   test_02_vpc_privategw_static_routes | `Failure` | 163.20 | 
test_privategw_acl.py
   test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 128.13 | 
test_privategw_acl.py
   test_04_rvpc_privategw_static_routes | `Failure` | 299.39 | 
test_privategw_acl.py
   ContextSuite context=TestSnapshotRootDisk>:setup | `Error` | 0.00 | 
test_snapshots.py
   test_02_create_template_with_checksum_sha1 | `Error` | 15.32 | 
test_templates.py
   test_03_create_template_with_checksum_sha256 | `Error` | 5.24 | 
test_templates.py
   test_04_create_template_with_checksum_md5 | `Error` | 5.23 | 
test_templates.py
   test_01_vpc_remote_access_vpn | `Error` | 50.78 | test_vpc_vpn.py
   
   
   Additional tests completed. 1 look ok, 0 have error(s)
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   


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


With regards,
Apache Git Services

[GitHub] blueorangutan commented on issue #2304: CLOUDSTACK-10127: KVM + Ovs: Incorrect devId on static nat

[GitBox]

blueorangutan commented on issue #2304: CLOUDSTACK-10127: KVM + Ovs: Incorrect 
devId on static nat
URL: https://github.com/apache/cloudstack/pull/2304#issuecomment-353135123
 
 
   @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 #2304: CLOUDSTACK-10127: KVM + Ovs: Incorrect devId on static nat

[GitBox]

rhtyd commented on issue #2304: CLOUDSTACK-10127: KVM + Ovs: Incorrect devId on 
static nat
URL: https://github.com/apache/cloudstack/pull/2304#issuecomment-353134963
 
 
   Thanks @fmaximus I'll kick another round of tests
   @blueorangutan package 


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


With regards,
Apache Git Services

[GitHub] rhtyd closed pull request #2366: CLOUDSTACK-10168 - VR duplicate entries in /etc/hosts when reusing VM name

[GitBox]

rhtyd closed pull request #2366: CLOUDSTACK-10168 - VR duplicate entries in 
/etc/hosts when reusing VM name
URL: https://github.com/apache/cloudstack/pull/2366
 
 
   

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

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

diff --git a/api/src/com/cloud/offering/ServiceOffering.java 
b/api/src/com/cloud/offering/ServiceOffering.java
index 394605daeda..196d2b4eb47 100644
--- a/api/src/com/cloud/offering/ServiceOffering.java
+++ b/api/src/com/cloud/offering/ServiceOffering.java
@@ -31,7 +31,7 @@
 public static final String routerDefaultOffUniqueName = 
"Cloud.Com-SoftwareRouter";
 public static final String elbVmDefaultOffUniqueName = 
"Cloud.Com-ElasticLBVm";
 public static final String internalLbVmDefaultOffUniqueName = 
"Cloud.Com-InternalLBVm";
-// leaving cloud.com references as these are identifyers and no real world 
adresses (check against DB)
+// leaving cloud.com references as these are identifyers and no real world 
addresses (check against DB)
 
 public enum StorageType {
 local, shared
diff --git 
a/core/src/com/cloud/agent/resource/virtualnetwork/model/VmDhcpConfig.java 
b/core/src/com/cloud/agent/resource/virtualnetwork/model/VmDhcpConfig.java
index 28e6b9bef2a..150b8cf5665 100644
--- a/core/src/com/cloud/agent/resource/virtualnetwork/model/VmDhcpConfig.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/model/VmDhcpConfig.java
@@ -22,10 +22,10 @@
 public class VmDhcpConfig extends ConfigBase {
 private String hostName;
 private String macAddress;
-private String ipv4Adress;
+private String ipv4Address;
 private String ipv6Address;
 private String ipv6Duid;
-private String dnsAdresses;
+private String dnsAddresses;
 private String defaultGateway;
 private String staticRoutes;
 private boolean defaultEntry;
@@ -34,15 +34,15 @@ public VmDhcpConfig() {
 super(VM_DHCP);
 }
 
-public VmDhcpConfig(String hostName, String macAddress, String ipv4Adress, 
String ipv6Address, String ipv6Duid, String dnsAdresses, String defaultGateway,
+public VmDhcpConfig(String hostName, String macAddress, String 
ipv4Address, String ipv6Address, String ipv6Duid, String dnsAddresses, String 
defaultGateway,
 String staticRoutes, boolean defaultEntry) {
 super(VM_DHCP);
 this.hostName = hostName;
 this.macAddress = macAddress;
-this.ipv4Adress = ipv4Adress;
+this.ipv4Address = ipv4Address;
 this.ipv6Address = ipv6Address;
 this.ipv6Duid = ipv6Duid;
-this.dnsAdresses = dnsAdresses;
+this.dnsAddresses = dnsAddresses;
 this.defaultGateway = defaultGateway;
 this.staticRoutes = staticRoutes;
 this.defaultEntry = defaultEntry;
@@ -64,12 +64,12 @@ public void setMacAddress(String macAddress) {
 this.macAddress = macAddress;
 }
 
-public String getIpv4Adress() {
-return ipv4Adress;
+public String getIpv4Address() {
+return ipv4Address;
 }
 
-public void setIpv4Adress(String ipv4Adress) {
-this.ipv4Adress = ipv4Adress;
+public void setIpv4Address(String ipv4Address) {
+this.ipv4Address = ipv4Address;
 }
 
 public String getIpv6Address() {
@@ -88,12 +88,12 @@ public void setIpv6Duid(String ipv6Duid) {
 this.ipv6Duid = ipv6Duid;
 }
 
-public String getDnsAdresses() {
-return dnsAdresses;
+public String getDnsAddresses() {
+return dnsAddresses;
 }
 
-public void setDnsAdresses(String dnsAdresses) {
-this.dnsAdresses = dnsAdresses;
+public void setDnsAddresses(String dnsAddresses) {
+this.dnsAddresses = dnsAddresses;
 }
 
 public String getDefaultGateway() {
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22.java 
b/engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22.java
index ef2a3178336..90070dc3a78 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade218to22.java
@@ -641,13 +641,13 @@ protected void upgradeDirectUserIpAddress(Connection 
conn, long dcId, long netwo
 s_logger.debug("Marking " + allocatedIps.size() + " ip 
addresses to belong to network " + networkId);
 s_logger.debug("Updating mac addresses for data center id=" + 
dcId + ". Found " + allocatedIps.size() + " ip addresses to update");
 for (Object[] allocatedIp : allocatedIps) {
-try (PreparedStatement selectMacAdresses = 
conn.prepareStatement("SELECT mac_address FROM data_center WHERE id = ?");) {
-selectMacAdresses.setLong(1, dcId);
-try (ResultSet selectedMacAdresses = 

[cloudstack] branch master updated: CLOUDSTACK-10168: VR duplicate entries in /etc/hosts when reusing VM name (#2366)

[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 80a6961  CLOUDSTACK-10168: VR duplicate entries in /etc/hosts when 
reusing VM name (#2366)
80a6961 is described below

commit 80a6961b5d155b0203c41d992acc293c1428255c
Author: Bitworks Software, Ltd 
AuthorDate: Thu Dec 21 00:49:12 2017 +0700

CLOUDSTACK-10168: VR duplicate entries in /etc/hosts when reusing VM name 
(#2366)

Bug is fixed. Fixed typo 'adress' to 'address' everywhere which leads to 
correct generation for agent communication json dhcp command.
---
 api/src/com/cloud/offering/ServiceOffering.java|  2 +-
 .../virtualnetwork/model/VmDhcpConfig.java | 26 +++---
 .../src/com/cloud/upgrade/dao/Upgrade218to22.java  | 10 -
 .../com/cloud/network/IpAddressManagerImpl.java|  2 +-
 .../src/com/cloud/network/vpc/VpcManagerImpl.java  |  2 +-
 .../configuration/ConfigurationManagerTest.java|  8 +++
 .../debian/config/opt/cloud/bin/configure.py   |  2 +-
 .../debian/config/opt/cloud/bin/cs/CsDhcp.py   | 12 +-
 .../patches/debian/config/opt/cloud/bin/cs_dhcp.py | 23 +++
 .../debian/config/opt/cloud/testdata/dhcp0001.json |  2 +-
 .../component/test_escalations_networks.py | 10 -
 test/systemvm/test_update_config.py|  8 +++
 12 files changed, 56 insertions(+), 51 deletions(-)

diff --git a/api/src/com/cloud/offering/ServiceOffering.java 
b/api/src/com/cloud/offering/ServiceOffering.java
index 394605d..196d2b4 100644
--- a/api/src/com/cloud/offering/ServiceOffering.java
+++ b/api/src/com/cloud/offering/ServiceOffering.java
@@ -31,7 +31,7 @@ public interface ServiceOffering extends DiskOffering, 
InfrastructureEntity, Int
 public static final String routerDefaultOffUniqueName = 
"Cloud.Com-SoftwareRouter";
 public static final String elbVmDefaultOffUniqueName = 
"Cloud.Com-ElasticLBVm";
 public static final String internalLbVmDefaultOffUniqueName = 
"Cloud.Com-InternalLBVm";
-// leaving cloud.com references as these are identifyers and no real world 
adresses (check against DB)
+// leaving cloud.com references as these are identifyers and no real world 
addresses (check against DB)
 
 public enum StorageType {
 local, shared
diff --git 
a/core/src/com/cloud/agent/resource/virtualnetwork/model/VmDhcpConfig.java 
b/core/src/com/cloud/agent/resource/virtualnetwork/model/VmDhcpConfig.java
index 28e6b9b..150b8cf 100644
--- a/core/src/com/cloud/agent/resource/virtualnetwork/model/VmDhcpConfig.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/model/VmDhcpConfig.java
@@ -22,10 +22,10 @@ package com.cloud.agent.resource.virtualnetwork.model;
 public class VmDhcpConfig extends ConfigBase {
 private String hostName;
 private String macAddress;
-private String ipv4Adress;
+private String ipv4Address;
 private String ipv6Address;
 private String ipv6Duid;
-private String dnsAdresses;
+private String dnsAddresses;
 private String defaultGateway;
 private String staticRoutes;
 private boolean defaultEntry;
@@ -34,15 +34,15 @@ public class VmDhcpConfig extends ConfigBase {
 super(VM_DHCP);
 }
 
-public VmDhcpConfig(String hostName, String macAddress, String ipv4Adress, 
String ipv6Address, String ipv6Duid, String dnsAdresses, String defaultGateway,
+public VmDhcpConfig(String hostName, String macAddress, String 
ipv4Address, String ipv6Address, String ipv6Duid, String dnsAddresses, String 
defaultGateway,
 String staticRoutes, boolean defaultEntry) {
 super(VM_DHCP);
 this.hostName = hostName;
 this.macAddress = macAddress;
-this.ipv4Adress = ipv4Adress;
+this.ipv4Address = ipv4Address;
 this.ipv6Address = ipv6Address;
 this.ipv6Duid = ipv6Duid;
-this.dnsAdresses = dnsAdresses;
+this.dnsAddresses = dnsAddresses;
 this.defaultGateway = defaultGateway;
 this.staticRoutes = staticRoutes;
 this.defaultEntry = defaultEntry;
@@ -64,12 +64,12 @@ public class VmDhcpConfig extends ConfigBase {
 this.macAddress = macAddress;
 }
 
-public String getIpv4Adress() {
-return ipv4Adress;
+public String getIpv4Address() {
+return ipv4Address;
 }
 
-public void setIpv4Adress(String ipv4Adress) {
-this.ipv4Adress = ipv4Adress;
+public void setIpv4Address(String ipv4Address) {
+this.ipv4Address = ipv4Address;
 }
 
 public String getIpv6Address() {
@@ -88,12 +88,12 @@ public class VmDhcpConfig extends ConfigBase {
 this.ipv6Duid = ipv6Duid;
 }
 
-public String getDnsAdresses() {
-return dnsAdresses;
+public String getDnsAddresses() 

[GitHub] rhtyd commented on issue #2366: CLOUDSTACK-10168 - VR duplicate entries in /etc/hosts when reusing VM name

[GitBox]

rhtyd commented on issue #2366: CLOUDSTACK-10168 - VR duplicate entries in 
/etc/hosts when reusing VM name
URL: https://github.com/apache/cloudstack/pull/2366#issuecomment-353133825
 
 
   Tests LGTM, merging based on two lgtms and 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 commented on issue #2370: CLOUDSTACK-9595: Fix regression introduced in #1762

[GitBox]

rhtyd commented on issue #2370: CLOUDSTACK-9595: Fix regression introduced in 
#1762
URL: https://github.com/apache/cloudstack/pull/2370#issuecomment-353133140
 
 
   Thanks for confirming @yvsubhash, I'll merge the fix once test results 
arrive. 


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #1762: CLOUDSTACK-9595 Transactions are not getting retried in case of datab?

[GitBox]

rhtyd commented on issue #1762: CLOUDSTACK-9595 Transactions are not getting 
retried in case of datab?
URL: https://github.com/apache/cloudstack/pull/1762#issuecomment-353132788
 
 
   Thanks @yvsubhash for confirming about passing the assign=true.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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] yvsubhash commented on issue #2370: CLOUDSTACK-9595: Fix regression introduced in #1762

[GitBox]

yvsubhash commented on issue #2370: CLOUDSTACK-9595: Fix regression introduced 
in #1762
URL: https://github.com/apache/cloudstack/pull/2370#issuecomment-353131666
 
 
   @rhtyd  Code changes are fine LGTM for code


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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] yvsubhash commented on a change in pull request #1762: CLOUDSTACK-9595 Transactions are not getting retried in case of datab?

[GitBox]

yvsubhash commented on a change in pull request #1762: CLOUDSTACK-9595 
Transactions are not getting retried in case of datab?
URL: https://github.com/apache/cloudstack/pull/1762#discussion_r158089016
 
 

 ##
 File path: server/src/com/cloud/network/IpAddressManagerImpl.java
 ##
 @@ -901,40 +916,28 @@ public PublicIp assignDedicateIpAddress(Account owner, 
final Long guestNtwkId, f
 
 PublicIp ip = null;
 try {
-ip = Transaction.execute(new 
TransactionCallbackWithException() {
-@Override
-public PublicIp doInTransaction(TransactionStatus status) 
throws InsufficientAddressCapacityException {
-Account owner = _accountDao.acquireInLockTable(ownerId);
-
-if (owner == null) {
-// this ownerId comes from owner or type Account. See 
the class "AccountVO" and the annotations in that class
-// to get the table name and field name that is 
queried to fill this ownerid.
-ConcurrentOperationException ex = new 
ConcurrentOperationException("Unable to lock account");
-throw ex;
-}
-if (s_logger.isDebugEnabled()) {
-s_logger.debug("lock account " + ownerId + " is 
acquired");
-}
-boolean displayIp = true;
-if (guestNtwkId != null) {
-Network ntwk = _networksDao.findById(guestNtwkId);
-displayIp = ntwk.getDisplayNetwork();
-} else if (vpcId != null) {
-VpcVO vpc = _vpcDao.findById(vpcId);
-displayIp = vpc.isDisplay();
-}
+Account ownerAccount = _accountDao.acquireInLockTable(ownerId);
 
-PublicIp ip = fetchNewPublicIp(dcId, null, null, owner, 
VlanType.VirtualNetwork, guestNtwkId, isSourceNat, false, null, false, vpcId, 
displayIp);
-IPAddressVO publicIp = ip.ip();
-
-markPublicIpAsAllocated(publicIp);
-_ipAddressDao.update(publicIp.getId(), publicIp);
+if (ownerAccount == null) {
+// this ownerId comes from owner or type Account. See the 
class "AccountVO" and the annotations in that class
+// to get the table name and field name that is queried to 
fill this ownerid.
+ConcurrentOperationException ex = new 
ConcurrentOperationException("Unable to lock account");
+throw ex;
+}
+if (s_logger.isDebugEnabled()) {
+s_logger.debug("lock account " + ownerId + " is acquired");
+}
+boolean displayIp = true;
+if (guestNtwkId != null) {
+Network ntwk = _networksDao.findById(guestNtwkId);
+displayIp = ntwk.getDisplayNetwork();
+} else if (vpcId != null) {
+VpcVO vpc = _vpcDao.findById(vpcId);
+displayIp = vpc.isDisplay();
+}
 
-return ip;
-}
-});
+return fetchNewPublicIp(dcId, null, null, owner, 
VlanType.VirtualNetwork, guestNtwkId, isSourceNat, false, null, false, vpcId, 
displayIp);
 
 Review comment:
   @rhtyd  Passing true to fetchNewPublicIp went in as a separate commit 
internally and got missed out while moving to ACS.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #1762: CLOUDSTACK-9595 Transactions are not getting retried in case of datab?

[GitBox]

rhtyd commented on issue #1762: CLOUDSTACK-9595 Transactions are not getting 
retried in case of datab?
URL: https://github.com/apache/cloudstack/pull/1762#issuecomment-353131261
 
 
   @yvsubhash I read through your comment but this is not acceptable as it 
causes a regression. I'm not sure about the fix I did as that's more of a 
band-aid fix I did. Irrespective of what you suggested, the issue remains that 
snat IP for new vpcs stay in allocating state. Please review my fix if that is 
acceptable or propose a new one, since it's failing tests for others the 
original commit would need to be either reverted or a proper regression fix 
need to be 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 #2366: CLOUDSTACK-10168 - VR duplicate entries in /etc/hosts when reusing VM name

[GitBox]

blueorangutan commented on issue #2366: CLOUDSTACK-10168 - VR duplicate entries 
in /etc/hosts when reusing VM name
URL: https://github.com/apache/cloudstack/pull/2366#issuecomment-353129413
 
 
   Trillian test result (tid-1836)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 31616 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2366-t1836-kvm-centos7.zip
   Smoke tests completed. 63 look OK, 4 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_01_vpc_privategw_acl | `Failure` | 57.68 | test_privategw_acl.py
   test_02_vpc_privategw_static_routes | `Failure` | 243.89 | 
test_privategw_acl.py
   test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 153.24 | 
test_privategw_acl.py
   test_04_rvpc_privategw_static_routes | `Failure` | 309.27 | 
test_privategw_acl.py
   test_02_create_template_with_checksum_sha1 | `Error` | 5.24 | 
test_templates.py
   test_03_create_template_with_checksum_sha256 | `Error` | 5.24 | 
test_templates.py
   test_04_create_template_with_checksum_md5 | `Error` | 5.22 | 
test_templates.py
   test_01_vpc_remote_access_vpn | `Error` | 55.83 | test_vpc_vpn.py
   test_hostha_kvm_host_recovering | `Error` | 25.73 | test_hostha_kvm.py
   


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


With regards,
Apache Git Services

[GitHub] yvsubhash commented on a change in pull request #1762: CLOUDSTACK-9595 Transactions are not getting retried in case of datab?

[GitBox]

yvsubhash commented on a change in pull request #1762: CLOUDSTACK-9595 
Transactions are not getting retried in case of datab?
URL: https://github.com/apache/cloudstack/pull/1762#discussion_r158084129
 
 

 ##
 File path: server/src/com/cloud/network/IpAddressManagerImpl.java
 ##
 @@ -836,35 +835,51 @@ public IPAddressVO doInTransaction(TransactionStatus 
status) throws Insufficient
 @DB
 @Override
 public void markPublicIpAsAllocated(final IPAddressVO addr) {
-
-Transaction.execute(new TransactionCallbackNoReturn() {
-@Override
-public void doInTransactionWithoutResult(TransactionStatus status) 
{
-Account owner = 
_accountMgr.getAccount(addr.getAllocatedToAccountId());
-synchronized (this) {
+synchronized (_allocatedLock) {
+Transaction.execute(new TransactionCallbackNoReturn() {
+@Override
+public void doInTransactionWithoutResult(TransactionStatus 
status) {
+Account owner = 
_accountMgr.getAccount(addr.getAllocatedToAccountId());
 if (_ipAddressDao.lockRow(addr.getId(), true) != null) {
 IPAddressVO userIp = 
_ipAddressDao.findById(addr.getId());
 if (userIp.getState() == IpAddress.State.Allocating || 
addr.getState() == IpAddress.State.Free) {
 addr.setState(IpAddress.State.Allocated);
-_ipAddressDao.update(addr.getId(), addr);
-// Save usage event
-if (owner.getAccountId() != 
Account.ACCOUNT_ID_SYSTEM) {
-VlanVO vlan = 
_vlanDao.findById(addr.getVlanId());
-String guestType = 
vlan.getVlanType().toString();
-if (!isIpDedicated(addr)) {
-
UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_IP_ASSIGN, 
owner.getId(), addr.getDataCenterId(), addr.getId(),
-addr.getAddress().toString(),
-addr.isSourceNat(), guestType, 
addr.getSystem(), addr.getClass().getName(), addr.getUuid());
-}
-if (updateIpResourceCount(addr)) {
-
_resourceLimitMgr.incrementResourceCount(owner.getId(), ResourceType.public_ip);
+if (_ipAddressDao.update(addr.getId(), addr)) {
+// Save usage event
+if (owner.getAccountId() != 
Account.ACCOUNT_ID_SYSTEM) {
+VlanVO vlan = 
_vlanDao.findById(addr.getVlanId());
+String guestType = 
vlan.getVlanType().toString();
+if (!isIpDedicated(addr)) {
+
UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_IP_ASSIGN, 
owner.getId(), addr.getDataCenterId(), addr.getId(),
+addr.getAddress().toString(),
+addr.isSourceNat(), guestType, 
addr.getSystem(), addr.getClass().getName(), addr.getUuid());
+}
+if (updateIpResourceCount(addr)) {
+
_resourceLimitMgr.incrementResourceCount(owner.getId(), ResourceType.public_ip);
+}
 }
 }
 }
 }
 }
-}
-});
+});
+}
+}
+
+@DB
+private void markPublicIpAsAllocating(final IPAddressVO addr) {
+synchronized (_allocatingLock) {
+Transaction.execute(new TransactionCallbackNoReturn() {
+@Override
+public void doInTransactionWithoutResult(TransactionStatus 
status) {
+
+if (_ipAddressDao.lockRow(addr.getId(), true) != null) {
 
 Review comment:
   @rhtyd  this is because bulk locking got removed earlier in the above line. 
so avoid two threads picking same ip
-  addrs = _ipAddressDao.lockRows(sc, filter, true);
+ addrs = _ipAddressDao.search(sc, filter, false);


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


With regards,
Apache Git Services

[GitHub] fmaximus commented on issue #2304: CLOUDSTACK-10127: KVM + Ovs: Incorrect devId on static nat

[GitBox]

fmaximus commented on issue #2304: CLOUDSTACK-10127: KVM + Ovs: Incorrect devId 
on static nat
URL: https://github.com/apache/cloudstack/pull/2304#issuecomment-353125917
 
 
   Rewrite using Mac Address, should work now.
   Checked the implementation for PrivateGateway on LinuxBridge.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #2203: [CLOUDSTACK-10029] All private, public, and guest interfaceses are marked as untagged ca?

[GitBox]

blueorangutan commented on issue #2203: [CLOUDSTACK-10029] All private, public, 
and guest interfaceses are marked as untagged ca?
URL: https://github.com/apache/cloudstack/pull/2203#issuecomment-353114636
 
 
   Trillian test result (tid-1837)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 27967 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2203-t1837-kvm-centos7.zip
   Smoke tests completed. 63 look OK, 4 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_01_vpc_privategw_acl | `Failure` | 61.22 | test_privategw_acl.py
   test_02_vpc_privategw_static_routes | `Failure` | 252.63 | 
test_privategw_acl.py
   test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 116.80 | 
test_privategw_acl.py
   test_04_rvpc_privategw_static_routes | `Failure` | 328.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.15 | 
test_templates.py
   test_05_rvpc_multi_tiers | `Failure` | 189.93 | test_vpc_redundant.py
   test_01_vpc_remote_access_vpn | `Error` | 50.53 | 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] krissterckx commented on issue #2259: CLOUDSTACK-10024: Network migration support

[GitBox]

krissterckx commented on issue #2259: CLOUDSTACK-10024: Network migration 
support
URL: https://github.com/apache/cloudstack/pull/2259#issuecomment-353110179
 
 
   @borisstoyanov , see above post :
   
   Verify Migration for an isolated network nativeOnly ... === TestName: 
test_14_native_to_native_network_migration | Status : SUCCESS ===
   ok
   Verify Migration for a vpc network nativeOnly ... === TestName: 
test_15_native_to_native_vpc_migration | Status : SUCCESS ===
   ok
   
   thank, Kris


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


With regards,
Apache Git Services

[GitHub] bwsw commented on issue #2366: CLOUDSTACK-10168 - VR duplicate entries in /etc/hosts when reusing VM name

[GitBox]

bwsw commented on issue #2366: CLOUDSTACK-10168 - VR duplicate entries in 
/etc/hosts when reusing VM name
URL: https://github.com/apache/cloudstack/pull/2366#issuecomment-353107677
 
 
   @rhtyd 
   @wido 
   Also, I haven't found if IPv6 dns resolution is implemented in VR dnsmasq 
currently, at least ipv6 records are not written into /etc/hosts. Can you 
clarify?


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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] Slair1 closed pull request #2372: Cloudstack-10201: catalina log rotate

[GitBox]

Slair1 closed pull request #2372: Cloudstack-10201: catalina log rotate
URL: https://github.com/apache/cloudstack/pull/2372
 
 
   

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

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

diff --git a/server/conf/cloudstack-catalina.logrotate 
b/server/conf/cloudstack-catalina.logrotate
index 498f690dd07..0df2e21715a 100644
--- a/server/conf/cloudstack-catalina.logrotate
+++ b/server/conf/cloudstack-catalina.logrotate
@@ -23,4 +23,5 @@
 compress
 missingok
 create 0644 cloud cloud
+su root cloud
 }
\ No newline at end of file


 


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


With regards,
Apache Git Services

[GitHub] Slair1 commented on issue #2372: Cloudstack-10201: catalina log rotate

[GitBox]

Slair1 commented on issue #2372: Cloudstack-10201: catalina log rotate
URL: https://github.com/apache/cloudstack/pull/2372#issuecomment-353098577
 
 
   Thanks @rhtyd you are correct, this is no longer an issue with embedded 
Jetty.  The file I'm editing is still in master, but isn't installed any longer 
by cloud.spec
   


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


With regards,
Apache Git Services

[cloudstack] branch master updated: README: Happy Holidays, may the cloud be with you in 2018! (#2371)

[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 044636c  README: Happy Holidays, may the cloud be with you in 2018! 
(#2371)
044636c is described below

commit 044636ca878901764f6e5dd7525257230257d349
Author: Rohit Yadav 
AuthorDate: Wed Dec 20 21:08:53 2017 +0530

README: Happy Holidays, may the cloud be with you in 2018! (#2371)
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 17a7a8f..41d00bc 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Apache CloudStack [![Build 
Status](https://travis-ci.org/apache/cloudstack.svg?branch=master)](https://travis-ci.org/apache/cloudstack)
 [![Coverity Scan Build 
Status](https://scan.coverity.com/projects/943/badge.svg)](https://scan.coverity.com/projects/943)
 
-![Apache CloudStack](tools/logo/apache_cloudstack.png)
+![Apache CloudStack](tools/logo/acsxmas.jpg)
 
 Apache CloudStack is open source software designed to deploy and manage large
 networks of virtual machines, as a highly available, highly scalable

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

[GitHub] rhtyd closed pull request #2371: README: Happy Holidays, may the cloud be with you in 2018!

[GitBox]

rhtyd closed pull request #2371: README: Happy Holidays, may the cloud be with 
you in 2018!
URL: https://github.com/apache/cloudstack/pull/2371
 
 
   

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/README.md b/README.md
index 17a7a8f7bd9..41d00bcd511 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Apache CloudStack [![Build 
Status](https://travis-ci.org/apache/cloudstack.svg?branch=master)](https://travis-ci.org/apache/cloudstack)
 [![Coverity Scan Build 
Status](https://scan.coverity.com/projects/943/badge.svg)](https://scan.coverity.com/projects/943)
 
-![Apache CloudStack](tools/logo/apache_cloudstack.png)
+![Apache CloudStack](tools/logo/acsxmas.jpg)
 
 Apache CloudStack is open source software designed to deploy and manage large
 networks of virtual machines, as a highly available, highly scalable


 


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


With regards,
Apache Git Services

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

[GitBox]

khos2ow 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-353096454
 
 
   @rhtyd I checked and I believe the failure is not related to the change, can 
you please run the CI job again?


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #2372: Cloudstack-10201: catalina log rotate

[GitBox]

rhtyd commented on issue #2372: Cloudstack-10201: catalina log rotate
URL: https://github.com/apache/cloudstack/pull/2372#issuecomment-353095733
 
 
   @Slair1 current master and starting 4.11, we'll have embedded Jetty so 
please check if this is still relevant for current master?


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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-353091097
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1445


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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] Slair1 opened a new pull request #2372: Cloudstack-10201: catalina log rotate

[GitBox]

Slair1 opened a new pull request #2372: Cloudstack-10201: catalina log rotate
URL: https://github.com/apache/cloudstack/pull/2372
 
 
   Receive following message in "var/spool/mail/root:
   ---
   /etc/cron.daily/logrotate:
   
   error: skipping "/var/log/cloudstack/management/catalina.out" because parent 
directory has insecure permissions (It's world writable or writable by group 
which is not "root") Set "su" directive in config file to tell logrotate which 
user/group should be used for rotation.
   ---
   
   As error states, group is "cloud":
   -
   [root@labcloud01b ~]# ls -l /var/log/cloudstack/
   total 64
   drwxrwx---. 2 root root 6 Dec 18 23:41 ipallocator
   drwxrwx---. 2 root cloud 28672 Dec 20 14:35 management
   drwxrwx---. 2 root cloud 12288 Dec 20 00:15 usage
   -
   
   Need to update "cloudstack-catalina.logrotate" with su info


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #2035: CLOUDSTACK-9867:VM snapshot on primary storage usage metrics

[GitBox]

blueorangutan commented on issue #2035: CLOUDSTACK-9867:VM snapshot on primary 
storage usage metrics
URL: https://github.com/apache/cloudstack/pull/2035#issuecomment-353086873
 
 
   @nvazquez 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] nvazquez commented on issue #2035: CLOUDSTACK-9867:VM snapshot on primary storage usage metrics

[GitBox]

nvazquez commented on issue #2035: CLOUDSTACK-9867:VM snapshot on primary 
storage usage metrics
URL: https://github.com/apache/cloudstack/pull/2035#issuecomment-353086617
 
 
   @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

[cloudstack] branch debian9-systemvmtemplate updated: Fix travis due to L2 PR merge, and changes to test_network.py

[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 7709d34  Fix travis due to L2 PR merge, and changes to test_network.py
7709d34 is described below

commit 7709d34cafdf1dba71ba430c9d61f4884c25cd96
Author: Rohit Yadav 
AuthorDate: Wed Dec 20 20:16:25 2017 +0530

Fix travis due to L2 PR merge, and changes to test_network.py

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

diff --git a/test/integration/smoke/test_network.py 
b/test/integration/smoke/test_network.py
index 742243d..1a0d1a7 100644
--- a/test/integration/smoke/test_network.py
+++ b/test/integration/smoke/test_network.py
@@ -1300,6 +1300,7 @@ class TestL2Networks(cloudstackTestCase):
 # Get Zone, Domain and templates
 cls.domain = get_domain(cls.apiclient)
 cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
+cls.hypervisor = testClient.getHypervisorInfo()
 cls.services['mode'] = cls.zone.networktype
 # Create Accounts & networks
 cls.account = Account.create(
@@ -1308,10 +1309,10 @@ class TestL2Networks(cloudstackTestCase):
 admin=True,
 domainid=cls.domain.id
 )
-cls.template = get_template(
+cls.template = get_test_template(
 cls.apiclient,
 cls.zone.id,
-cls.services["ostype"]
+cls.hypervisor
 )
 cls.service_offering = ServiceOffering.create(
 cls.apiclient,

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

[GitHub] smeetsr commented on issue #2259: CLOUDSTACK-10024: Network migration support

[GitBox]

smeetsr commented on issue #2259: CLOUDSTACK-10024: Network migration support
URL: https://github.com/apache/cloudstack/pull/2259#issuecomment-353081818
 
 
   Verify Migration for an isolated network without VMs ... === TestName: 
test_01_native_to_nuage_network_migration_novms | Status : SUCCESS ===
   ok
   Verify Migration for an isolated network with stopped VMs ... === TestName: 
test_02_native_to_nuage_network_migration_stoppedvms | Status : SUCCESS ===
   ok
   Verify traffic after Migration of a non-persistent isolated network ... === 
TestName: test_03_migrate_native_nonpersistent_network_to_nuage_traffic | 
Status : FAILED ===
   FAIL due to testbedissue - rerun of this test was fine.
   Verify traffic after Migration of a persistent isolated network ... === 
TestName: test_04_migrate_native_persistentnetwork_to_nuage_traffic | Status : 
SUCCESS ===
   ok
   Verify Nic migration of GuestVm in an isolated network ... === TestName: 
test_05_native_to_nuage_nic_migration | Status : SUCCESS ===
   ok
   Verify Nic migration of GuestVm in a non-persistent isolated network ... === 
TestName: test_06_migrate_native_nonpersistent_nic_to_nuage_traffic | Status : 
SUCCESS ===
   ok
   Verify Nic migration of GuestVm in a persistent isolated network ... === 
TestName: test_07_migrate_native_persistent_nic_to_nuage_traffic | Status : 
SUCCESS ===
   ok
   Verify MultiNic migration of GuestVm with multiple isolated networks ... === 
TestName: test_08_migrate_native_multinic_to_nuage_traffic | Status : SUCCESS 
===
   ok
   Verify StaticNat migration of GuestVm in a persistent isolated network ... 
=== TestName: test_09_migrate_native_persist_staticnat_to_nuage_traffic | 
Status : SUCCESS ===
   ok
   test_10_migrate_native_vpc 
(nuagevsp.test_nuage_network_migration.TestNuageMigration) ... === TestName: 
test_10_migrate_native_vpc | Status : SUCCESS ===
   ok
   Verify StaticNat migration of GuestVm in a vpc network ... === TestName: 
test_11_migrate_native_vpc_staticnat_to_nuage_traffic | Status : SUCCESS ===
   ok
   Verify MultiNic migration of GuestVm in multiple networks ... === TestName: 
test_12_migrate_native_vpc_multinic_to_nuage_traffic | Status : SUCCESS ===
   ok
   Verify migration of GuestVm with ip .2 still works ... === TestName: 
test_13_verify_guestvmip2_when_migrating_to_nuage | Status : SUCCESS ===
   ok
   Verify Migration for an isolated network nativeOnly ... === TestName: 
test_14_native_to_native_network_migration | Status : SUCCESS ===
   ok
   Verify Migration for a vpc network nativeOnly ... === TestName: 
test_15_native_to_native_vpc_migration | Status : SUCCESS ===
   ok
   
   [runinfo.txt](https://github.com/apache/cloudstack/files/1575879/runinfo.txt)
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #2340: CLOUDSTACK-10106: GPU/vGPU Support on VMware

[GitBox]

blueorangutan commented on issue #2340: CLOUDSTACK-10106: GPU/vGPU Support on 
VMware
URL: https://github.com/apache/cloudstack/pull/2340#issuecomment-353080694
 
 
   @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 #2340: CLOUDSTACK-10106: GPU/vGPU Support on VMware

[GitBox]

rhtyd commented on issue #2340: CLOUDSTACK-10106: GPU/vGPU Support on VMware
URL: https://github.com/apache/cloudstack/pull/2340#issuecomment-353080606
 
 
   Re-review requested.
   @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 #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-352655838
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1412


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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-353067108
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1443


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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: Misc fixes to allow upload template/iso tests to work

[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 913f49e  Misc fixes to allow upload template/iso tests to work
913f49e is described below

commit 913f49e315f4159827a52bdbf37ce5e490c3fa97
Author: Rohit Yadav 
AuthorDate: Wed Dec 20 20:08:17 2017 +0530

Misc fixes to allow upload template/iso tests to work

I'll meld this with other commits, keeping this as a separate commit for 
now.

Signed-off-by: Rohit Yadav 
---
 .../cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java  | 8 ++--
 systemvm/debian/etc/apache2/vhost.template| 3 +++
 tools/appliance/systemvmtemplate/scripts/cleanup.sh   | 3 +--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git 
a/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java 
b/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
index ac5b48a..63a44b8 100644
--- 
a/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
+++ 
b/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
@@ -29,6 +29,7 @@ import javax.naming.ConfigurationException;
 
 import org.apache.cloudstack.ca.CAManager;
 import org.apache.cloudstack.ca.SetupCertificateCommand;
+import org.apache.cloudstack.config.ApiServiceConfiguration;
 import org.apache.cloudstack.framework.ca.Certificate;
 import org.apache.cloudstack.utils.security.KeyStoreUtils;
 import org.apache.log4j.Logger;
@@ -66,7 +67,6 @@ import com.trilead.ssh2.Connection;
 
 public abstract class LibvirtServerDiscoverer extends DiscovererBase 
implements Discoverer, Listener, ResourceStateAdapter {
 private static final Logger s_logger = 
Logger.getLogger(LibvirtServerDiscoverer.class);
-private String _hostIp;
 private final int _waitTime = 5; /* wait for 5 minutes */
 private String _kvmPrivateNic;
 private String _kvmPublicNic;
@@ -291,7 +291,7 @@ public abstract class LibvirtServerDiscoverer extends 
DiscovererBase implements
 
 setupAgentSecurity(sshConnection, agentIp, hostname);
 
-String parameters = " -m " + StringUtils.shuffleCSVList(_hostIp) + 
" -z " + dcId + " -p " + podId + " -c " + clusterId + " -g " + guid + " -a";
+String parameters = " -m " + 
StringUtils.shuffleCSVList(ApiServiceConfiguration.ManagementHostIPAdr.value()) 
+ " -z " + dcId + " -p " + podId + " -c " + clusterId + " -g " + guid + " -a";
 
 parameters += " --pubNic=" + kvmPublicNic;
 parameters += " --prvNic=" + kvmPrivateNic;
@@ -395,10 +395,6 @@ public abstract class LibvirtServerDiscoverer extends 
DiscovererBase implements
 _kvmGuestNic = _kvmPrivateNic;
 }
 
-_hostIp = _configDao.getValue("host");
-if (_hostIp == null) {
-throw new ConfigurationException("Can't get host IP");
-}
 
_resourceMgr.registerResourceStateAdapter(this.getClass().getSimpleName(), 
this);
 return true;
 }
diff --git a/systemvm/debian/etc/apache2/vhost.template 
b/systemvm/debian/etc/apache2/vhost.template
index f393db5..caded8c 100644
--- a/systemvm/debian/etc/apache2/vhost.template
+++ b/systemvm/debian/etc/apache2/vhost.template
@@ -83,6 +83,9 @@
Allow from 127.0.0.0/255.0.0.0 ::1/128

 
+   # Include CORS configuration **IF SET**
+   IncludeOptional /etc/apache2/[cC][oO][rR][sS].conf
+
#   SSL Engine Switch:
#   Enable/Disable SSL for this virtual host.
SSLEngine on
diff --git a/tools/appliance/systemvmtemplate/scripts/cleanup.sh 
b/tools/appliance/systemvmtemplate/scripts/cleanup.sh
index eed29af..27de669 100644
--- a/tools/appliance/systemvmtemplate/scripts/cleanup.sh
+++ b/tools/appliance/systemvmtemplate/scripts/cleanup.sh
@@ -21,8 +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 wamerican \
-debconf-i18n sharutils gnupg gnupg-agent
+task-english task-ssh-server tasksel tasksel-data laptop-detect wamerican 
sharutils
 
   apt-get -y autoremove --purge
   apt-get autoclean

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

[GitHub] nitin-maharana commented on issue #2371: README: Happy Holidays, may the cloud be with you in 2018!

[GitBox]

nitin-maharana commented on issue #2371: README: Happy Holidays, may the cloud 
be with you in 2018!
URL: https://github.com/apache/cloudstack/pull/2371#issuecomment-353078676
 
 
   Happy Holiday Everyone!! 


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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] nitin-maharana commented on issue #2340: CLOUDSTACK-10106: GPU/vGPU Support on VMware

[GitBox]

nitin-maharana commented on issue #2340: CLOUDSTACK-10106: GPU/vGPU Support on 
VMware
URL: https://github.com/apache/cloudstack/pull/2340#issuecomment-353078017
 
 
   @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 #2259: CLOUDSTACK-10024: Network migration support

[GitBox]

blueorangutan commented on issue #2259: CLOUDSTACK-10024: Network migration 
support
URL: https://github.com/apache/cloudstack/pull/2259#issuecomment-353071506
 
 
   @borisstoyanov a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has 
been kicked to run smoke tests


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


With regards,
Apache Git Services

[GitHub] borisstoyanov commented on issue #2259: CLOUDSTACK-10024: Network migration support

[GitBox]

borisstoyanov commented on issue #2259: CLOUDSTACK-10024: Network migration 
support
URL: https://github.com/apache/cloudstack/pull/2259#issuecomment-353071314
 
 
   @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 #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-353067108
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1443


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #2368: CLOUDSTACK-10126: Separate Subnet for SSVM and CPVM

[GitBox]

blueorangutan commented on issue #2368: CLOUDSTACK-10126: Separate Subnet for 
SSVM and CPVM
URL: https://github.com/apache/cloudstack/pull/2368#issuecomment-353065599
 
 
   @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 #2368: CLOUDSTACK-10126: Separate Subnet for SSVM and CPVM

[GitBox]

rhtyd commented on issue #2368: CLOUDSTACK-10126: Separate Subnet for SSVM and 
CPVM
URL: https://github.com/apache/cloudstack/pull/2368#issuecomment-353065396
 
 
   Ignoring build deb/pkg failure due to env issues, I'll kick tests.
   @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 #2368: CLOUDSTACK-10126: Separate Subnet for SSVM and CPVM

[GitBox]

blueorangutan commented on issue #2368: CLOUDSTACK-10126: Separate Subnet for 
SSVM and CPVM
URL: https://github.com/apache/cloudstack/pull/2368#issuecomment-353062497
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1442


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #2259: CLOUDSTACK-10024: Network migration support

[GitBox]

blueorangutan commented on issue #2259: CLOUDSTACK-10024: Network migration 
support
URL: https://github.com/apache/cloudstack/pull/2259#issuecomment-353061633
 
 
   Packaging result: ?centos6 ?centos7 ?debian. JID-1441


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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] gsirett commented on issue #2371: README: Happy Holidays, may the cloud be with you in 2018!

[GitBox]

gsirett commented on issue #2371: README: Happy Holidays, may the cloud be with 
you in 2018!
URL: https://github.com/apache/cloudstack/pull/2371#issuecomment-353061533
 
 
   
   Happy Christmas everybody - heres to a really exciting new year. Lots of 
great things to come for cloudstack 
   @rhtyd  - any chance you could squash that commit ?


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


With regards,
Apache Git Services

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

[GitBox]

rhtyd commented on issue #2211: CLOUDSTACK-10013: Migrate systemvmtemplate to 
Debian9
URL: https://github.com/apache/cloudstack/pull/2211#issuecomment-353060428
 
 
   Thanks @rafaelweingartner, as you can imagine this work has been going for 
4-5 months now.
   I'll do another round of manual testing and see if there are minor issues to 
be fixed. After that I'll kick another round of smoketests on KVM, XenServer 
and VMware since master has changed. If we've 100% pass again, I'll kick 
component tests before this gets merged.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #2211: CLOUDSTACK-10013: Migrate systemvmtemplate to Debian9

[GitBox]

rafaelweingartner commented on issue #2211: CLOUDSTACK-10013: Migrate 
systemvmtemplate to Debian9
URL: https://github.com/apache/cloudstack/pull/2211#issuecomment-353060972
 
 
   Awesome, thanks @rhtyd and all others that worked here.
   


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


With regards,
Apache Git Services

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

[GitBox]

rhtyd commented on issue #2211: CLOUDSTACK-10013: Migrate systemvmtemplate to 
Debian9
URL: https://github.com/apache/cloudstack/pull/2211#issuecomment-353060428
 
 
   Thanks @rafaelweingartner, as you can imagine this work has been going for 
4-5 months now.
   I'll do another round of manual testing and see if there are minor issues to 
be fixed. After that I'll kick another round of smoketests on KVM, XenServer 
and VMware since master has changed. If we've 100% pass again, I'll kick 
component tests this gets merged.


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


With regards,
Apache Git Services

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

[GitBox]

DaanHoogland commented on issue #2211: CLOUDSTACK-10013: Migrate 
systemvmtemplate to Debian9
URL: https://github.com/apache/cloudstack/pull/2211#issuecomment-353060783
 
 
   > What I am against is something that we see sometimes, where people use one 
commit per file/change. Then, a single issue that is being tackled in a PR 
becomes 100+ commits?
   
   Guilty as charged. I like working that way. but we can certainly try and 
change me (:-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

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

[GitBox]

rhtyd commented on issue #2211: CLOUDSTACK-10013: Migrate systemvmtemplate to 
Debian9
URL: https://github.com/apache/cloudstack/pull/2211#issuecomment-353060428
 
 
   Thanks @rafaelweingartner
   I'll do another round of manual testing and see if there are minor issues to 
be fixed. After that I'll kick another round of smoketests on KVM, XenServer 
and VMware since master has changed. If we've 100% pass again, I'll kick 
component tests this gets merged.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #2211: CLOUDSTACK-10013: Migrate systemvmtemplate to Debian9

[GitBox]

rafaelweingartner commented on issue #2211: CLOUDSTACK-10013: Migrate 
systemvmtemplate to Debian9
URL: https://github.com/apache/cloudstack/pull/2211#issuecomment-353059274
 
 
   @Daan, @rohit there is no need to squash.
   
   I like the idea/philosophy of self-contained commits. This means, one commit 
per issue, which is normally the case of PRs. This PR, however, is a different 
case. Frankly speaking, when I talked about squashing, I only saw the number 
`23` in the commits tab, but I did not open it. Looking at the commits I do 
think that it is good this way. It is my bad that I did not notice this before.
   
   What I am against is something that we see sometimes, where people use one 
commit per file/change. Then, a single issue that is being tackled in a PR 
becomes 100+ commits?


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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] 05/22: 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 5097ad6bf70247557d8082459b11393d7e6af8f4
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] branch debian9-systemvmtemplate updated (b51f4c6 -> 9a104cf)

[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 b51f4c6  CLOUDSTACK-9595: Fix regression introduced in #1762
omit 777caae  CLOUDSTACK-10001: Fix incorrect total host memory in responses
omit cf43c76  CLOUDSTACK-10013: Add systemvm 4.11 migration in 4.10->4.11 
upgrade path
omit 61bc2ce  CLOUDSTACK-10194: Use packer for building systemvmtemplates
omit bfbdb9d  CLOUDSTACK-10193: Use other64Linux for systemvms on VMware
omit 8b46214  CLOUDSTACK-10013: Fix VMware related issues and fix misc tests
omit 4f9a5db  CLOUDSTACK-9953: Resize root disk for VMware when full clone 
is enabled
omit 97c1b03  CLOUDSTACK-9501: route is not available by default on CentOS7 
(#1637)
omit 30439da  CLOUDSTACK-10187: Don't delete vifs for VPCs with source nat
omit 7ceb159  CLOUDSTACK-10193: Fix smoke tests failures with new 
systemvmtemplate
omit c16b66d  CLOUDSTACK-10181: Skip rVR test cases for VMware until 
supported
omit 548ce71  CLOUDSTACK-10013: SystemVM codebase refactorings and 
improvements
omit 2cf5078  CLOUDSTACK-10013: Make the generated VR/json files unique 
(ports #1470)
omit ad342eb  CLOUDSTACK-10010: Port marvin test from #2190 by @swill
omit bafab64  CLOUDSTACK-10013: Fix ipsec VPN configuration
omit f6d15de  CLOUDSTACK-10013: SystemVM.iso refactoring and cleanups
omit 37169eb  CLOUDSTACK-10129: UX improvements and event timeline
omit 635acff  CLOUDSTACK-9348: Improve Nio SSH handshake buffers
omit 7034b52  CLOUDSTACK-7853: Fix ping timeout edge case and refactor code
omit 32b78ac  CLOUDSTACK-10013: Debian9 SystemVM appliance improvements
omit 1da69e5  CLOUDSTACK-10013: Make Debian9 systemvmtemplates work with 
systemd
omit ed39ad1  CLOUDSTACK-10013: Migrate systemvmtemplate to Debian9
 add 13c325a  CLOUDSTACK-10102: New network type L2 (#2281)
 add cd637fd  CLOUDSTACK-9875: Unable to re-apply Explicit dedication to VM 
(#2042)
 new 20c3a6c  CLOUDSTACK-10013: Migrate systemvmtemplate to Debian9
 new 69ea1f0  CLOUDSTACK-10013: Make Debian9 systemvmtemplates work with 
systemd
 new 633bf8f  CLOUDSTACK-10013: Debian9 SystemVM appliance improvements
 new 5070e6a  CLOUDSTACK-7853: Fix ping timeout edge case and refactor code
 new 5097ad6  CLOUDSTACK-9348: Improve Nio SSH handshake buffers
 new a14e920  CLOUDSTACK-10129: UX improvements and event timeline
 new 8d3a80f  CLOUDSTACK-10013: SystemVM.iso refactoring and cleanups
 new ac649c6  CLOUDSTACK-10013: Fix ipsec VPN configuration
 new ed4ddab  CLOUDSTACK-10010: Port marvin test from #2190 by @swill
 new b9dc9fa  CLOUDSTACK-10013: Make the generated VR/json files unique 
(ports #1470)
 new 51e2195  CLOUDSTACK-10013: SystemVM codebase refactorings and 
improvements
 new 219f0b3b CLOUDSTACK-10181: Skip rVR test cases for VMware until 
supported
 new 84a0fa7  CLOUDSTACK-10193: Fix smoke tests failures with new 
systemvmtemplate
 new 8cf74e8  CLOUDSTACK-10187: Don't delete vifs for VPCs with source nat
 new 4df18a3  CLOUDSTACK-9501: route is not available by default on CentOS7 
(#1637)
 new 54a5cf0  CLOUDSTACK-9953: Resize root disk for VMware when full clone 
is enabled
 new b7b7964  CLOUDSTACK-10013: Fix VMware related issues and fix misc tests
 new 712b8e7  CLOUDSTACK-10193: Use other64Linux for systemvms on VMware
 new 562ab07  CLOUDSTACK-10194: Use packer for building systemvmtemplates
 new 3606cb4  CLOUDSTACK-10013: Add systemvm 4.11 migration in 4.10->4.11 
upgrade path
 new 131386c  CLOUDSTACK-10001: Fix incorrect total host memory in responses
 new 9a104cf  CLOUDSTACK-9595: Fix regression introduced in #1762

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   (b51f4c6)
\
 N -- N -- N   refs/heads/debian9-systemvmtemplate (9a104cf)

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 22 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:
 api/src/com/cloud/network/Network.java |   2 +-
 .../engine/orchestration/NetworkOrchestrator.java  |  10 +-
 .../schema/src/com/cloud/vm/dao/UserVmDaoImpl.java |  28 

[cloudstack] 20/22: CLOUDSTACK-10013: Add systemvm 4.11 migration in 4.10->4.11 upgrade path

[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 3606cb4c0ca5a5f47761d2b920909992c8013b4c
Author: Rohit Yadav 
AuthorDate: Tue Dec 19 11:06:59 2017 +0530

CLOUDSTACK-10013: Add systemvm 4.11 migration in 4.10->4.11 upgrade path

This moves the systevmtemplate migration logic from previous upgrade path
to 4.10.0.0->4.11.0.0 upgrade path.

Signed-off-by: Rohit Yadav 
---
 .../com/cloud/upgrade/dao/Upgrade41000to41100.java | 189 -
 .../com/cloud/upgrade/dao/Upgrade4930to41000.java  | 184 +---
 2 files changed, 191 insertions(+), 182 deletions(-)

diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade41000to41100.java 
b/engine/schema/src/com/cloud/upgrade/dao/Upgrade41000to41100.java
index c59ead9..fbe9d78 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade41000to41100.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade41000to41100.java
@@ -17,13 +17,25 @@
 
 package com.cloud.upgrade.dao;
 
-import com.cloud.utils.exception.CloudRuntimeException;
-
 import java.io.InputStream;
 import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.log4j.Logger;
+
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.utils.exception.CloudRuntimeException;
 
 public class Upgrade41000to41100 implements DbUpgrade {
 
+final static Logger LOG = Logger.getLogger(Upgrade41000to41100.class);
+
 @Override
 public String[] getUpgradableVersionRange() {
 return new String[] {"4.10.0.0", "4.11.0.0"};
@@ -52,8 +64,181 @@ public class Upgrade41000to41100 implements DbUpgrade {
 
 @Override
 public void performDataMigration(Connection conn) {
+updateSystemVmTemplates(conn);
 }
 
+@SuppressWarnings("serial")
+private void updateSystemVmTemplates(final Connection conn) {
+LOG.debug("Updating System Vm template IDs");
+// Get all hypervisors in use
+final Set hypervisorsListInUse = new 
HashSet();
+try (PreparedStatement pstmt = conn.prepareStatement("select 
distinct(hypervisor_type) from `cloud`.`cluster` where removed is null"); 
ResultSet rs = pstmt.executeQuery()) {
+while (rs.next()) {
+switch (Hypervisor.HypervisorType.getType(rs.getString(1))) {
+case XenServer:
+
hypervisorsListInUse.add(Hypervisor.HypervisorType.XenServer);
+break;
+case KVM:
+
hypervisorsListInUse.add(Hypervisor.HypervisorType.KVM);
+break;
+case VMware:
+
hypervisorsListInUse.add(Hypervisor.HypervisorType.VMware);
+break;
+case Hyperv:
+
hypervisorsListInUse.add(Hypervisor.HypervisorType.Hyperv);
+break;
+case LXC:
+
hypervisorsListInUse.add(Hypervisor.HypervisorType.LXC);
+break;
+case Ovm3:
+
hypervisorsListInUse.add(Hypervisor.HypervisorType.Ovm3);
+break;
+default:
+break;
+}
+}
+} catch (final SQLException e) {
+LOG.error("updateSystemVmTemplates: Exception caught while getting 
hypervisor types from clusters: " + e.getMessage());
+throw new CloudRuntimeException("updateSystemVmTemplates:Exception 
while getting hypervisor types from clusters", e);
+}
+
+final Map NewTemplateNameList = new 
HashMap() {
+{
+put(Hypervisor.HypervisorType.KVM, "systemvm-kvm-4.11");
+put(Hypervisor.HypervisorType.VMware, "systemvm-vmware-4.11");
+put(Hypervisor.HypervisorType.XenServer, 
"systemvm-xenserver-4.11");
+put(Hypervisor.HypervisorType.Hyperv, "systemvm-hyperv-4.11");
+put(Hypervisor.HypervisorType.LXC, "systemvm-lxc-4.11");
+put(Hypervisor.HypervisorType.Ovm3, "systemvm-ovm3-4.11");
+}
+};
+
+final Map 
routerTemplateConfigurationNames = new HashMap() {
+{
+put(Hypervisor.HypervisorType.KVM, "router.template.kvm");
+put(Hypervisor.HypervisorType.VMware, 
"router.template.vmware");
+put(Hypervisor.HypervisorType.XenServer, 

[cloudstack] 10/22: 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 b9dc9fa5ab85564c500a8ae2f86b7aabeb93c50a
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 51b9737..ebd36bd 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
@@ -330,6 +330,9 @@ public class LibvirtComputingResource extends 
ServerResourceBase implements Serv
 if (details == null) {
 details = parser.getLines();
 }
+
+

[cloudstack] 06/22: 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 a14e9209d0b2875e00317bd9a443e00971d63e81
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
+++