[GitHub] blueorangutan commented on issue #2990: Security Group: add secondary ips to the correct ipset based on ip family (4.11)

2018-11-11 Thread GitBox
blueorangutan commented on issue #2990: Security Group: add secondary ips to 
the correct ipset based on ip family (4.11)
URL: https://github.com/apache/cloudstack/pull/2990#issuecomment-437783132
 
 
   Packaging result: ✔centos6 ✔centos7 ✖debian. JID-2426


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #3012: CLOUDSTACK-3009: Fixed resource calculation CPU, RAM for accounts.

2018-11-11 Thread GitBox
blueorangutan commented on issue #3012: CLOUDSTACK-3009: Fixed resource 
calculation CPU, RAM for accounts.
URL: https://github.com/apache/cloudstack/pull/3012#issuecomment-437778142
 
 
   @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 #2990: Security Group: add secondary ips to the correct ipset based on ip family (4.11)

2018-11-11 Thread GitBox
blueorangutan commented on issue #2990: Security Group: add secondary ips to 
the correct ipset based on ip family (4.11)
URL: https://github.com/apache/cloudstack/pull/2990#issuecomment-437778125
 
 
   @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 #2376: [4.11] Smoketest Health Check

2018-11-11 Thread GitBox
rhtyd commented on issue #2376: [4.11] Smoketest Health Check
URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-437778108
 
 
   @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 #2985: kvm/ceph: When create a new RBD image use modern flags/features for t…

2018-11-11 Thread GitBox
blueorangutan commented on issue #2985: kvm/ceph: When create a new RBD image 
use modern flags/features for t…
URL: https://github.com/apache/cloudstack/pull/2985#issuecomment-437778139
 
 
   @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 #2985: kvm/ceph: When create a new RBD image use modern flags/features for t…

2018-11-11 Thread GitBox
rhtyd commented on issue #2985: kvm/ceph: When create a new RBD image use 
modern flags/features for t…
URL: https://github.com/apache/cloudstack/pull/2985#issuecomment-43988
 
 
   @blueorangutan test


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


With regards,
Apache Git Services


[GitHub] rhtyd commented on issue #2990: Security Group: add secondary ips to the correct ipset based on ip family (4.11)

2018-11-11 Thread GitBox
rhtyd commented on issue #2990: Security Group: add secondary ips to the 
correct ipset based on ip family (4.11)
URL: https://github.com/apache/cloudstack/pull/2990#issuecomment-437778039
 
 
   @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 #3012: CLOUDSTACK-3009: Fixed resource calculation CPU, RAM for accounts.

2018-11-11 Thread GitBox
rhtyd commented on issue #3012: CLOUDSTACK-3009: Fixed resource calculation 
CPU, RAM for accounts.
URL: https://github.com/apache/cloudstack/pull/3012#issuecomment-43904
 
 
   @blueorangutan test


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


With regards,
Apache Git Services


[GitHub] rhtyd opened a new pull request #3022: systemvmtemplate: update debian 9.6 iso url and checksum

2018-11-11 Thread GitBox
rhtyd opened a new pull request #3022: systemvmtemplate: update debian 9.6 iso 
url and checksum
URL: https://github.com/apache/cloudstack/pull/3022
 
 
   This fixes the failing systemvmtemplate build due to 404 on old ISO url.
   
   Signed-off-by: Rohit Yadav 
   
   ## Types of changes
   
   - [ ] Breaking change (fix or feature that would cause existing 
functionality to change)
   - [ ] New feature (non-breaking change which adds functionality)
   - [x] Bug fix (non-breaking change which fixes an issue)
   - [ ] Enhancement (improves an existing feature and functionality)
   - [ ] Cleanup (Code refactoring and cleanup, that may add test cases)
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #3012: CLOUDSTACK-3009: Fixed resource calculation CPU, RAM for accounts.

2018-11-11 Thread GitBox
blueorangutan commented on issue #3012: CLOUDSTACK-3009: Fixed resource 
calculation CPU, RAM for accounts.
URL: https://github.com/apache/cloudstack/pull/3012#issuecomment-437774766
 
 
   Packaging result: ✔centos6 ✔centos7 ✖debian. JID-2425


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #3000: CLOUDSTACK-2998: Added two more device name patterns to valid bridge slaves (lo* and dummy*)

2018-11-11 Thread GitBox
blueorangutan commented on issue #3000: CLOUDSTACK-2998: Added two more device 
name patterns to valid bridge slaves (lo* and dummy*)
URL: https://github.com/apache/cloudstack/pull/3000#issuecomment-437774568
 
 
   Packaging result: ✔centos6 ✔centos7 ✖debian. JID-2424


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #2990: Security Group: add secondary ips to the correct ipset based on ip family (4.11)

2018-11-11 Thread GitBox
blueorangutan commented on issue #2990: Security Group: add secondary ips to 
the correct ipset based on ip family (4.11)
URL: https://github.com/apache/cloudstack/pull/2990#issuecomment-437774301
 
 
   Packaging result: ✔centos6 ✖centos7 ✖debian. JID-2422


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #2985: kvm/ceph: When create a new RBD image use modern flags/features for t…

2018-11-11 Thread GitBox
blueorangutan commented on issue #2985: kvm/ceph: When create a new RBD image 
use modern flags/features for t…
URL: https://github.com/apache/cloudstack/pull/2985#issuecomment-437774300
 
 
   Packaging result: ✔centos6 ✔centos7 ✖debian. JID-2423


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 (df17385 -> 375264a)

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

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


from df17385  agent: add host.reserved.mem.mb parameter documentation 
(#3016)
 add bb7493a  configdrive: Add missing ConfigDrive entries on existing 
zones after upgrade (#3007)
 new 375264a  Merge remote-tracking branch 'origin/4.11'

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


Summary of changes:
 .../java/com/cloud/network/NetworkModelImpl.java   |  37 +++
 .../java/com/cloud/network/NetworkModelTest.java   | 119 -
 2 files changed, 154 insertions(+), 2 deletions(-)



[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.11'

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

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

commit 375264aaa41d9d30558c65f510833513cff938bb
Merge: df17385 bb7493a
Author: Rohit Yadav 
AuthorDate: Mon Nov 12 12:10:26 2018 +0530

Merge remote-tracking branch 'origin/4.11'

Signed-off-by: Rohit Yadav 

 .../java/com/cloud/network/NetworkModelImpl.java   |  37 +++
 .../java/com/cloud/network/NetworkModelTest.java   | 119 -
 2 files changed, 154 insertions(+), 2 deletions(-)

diff --cc server/src/main/java/com/cloud/network/NetworkModelImpl.java
index b2915d9,000..03629cd
mode 100644,00..100644
--- a/server/src/main/java/com/cloud/network/NetworkModelImpl.java
+++ b/server/src/main/java/com/cloud/network/NetworkModelImpl.java
@@@ -1,2442 -1,0 +1,2479 @@@
 +// Licensed to the Apache Software Foundation (ASF) under one
 +// or more contributor license agreements.  See the NOTICE file
 +// distributed with this work for additional information
 +// regarding copyright ownership.  The ASF licenses this file
 +// to you under the Apache License, Version 2.0 (the
 +// "License"); you may not use this file except in compliance
 +// with the License.  You may obtain a copy of the License at
 +//
 +//   http://www.apache.org/licenses/LICENSE-2.0
 +//
 +// Unless required by applicable law or agreed to in writing,
 +// software distributed under the License is distributed on an
 +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 +// KIND, either express or implied.  See the License for the
 +// specific language governing permissions and limitations
 +// under the License.
 +
 +package com.cloud.network;
 +
 +import java.math.BigInteger;
 +import java.security.InvalidParameterException;
 +import java.security.MessageDigest;
 +import java.security.NoSuchAlgorithmException;
 +import java.util.ArrayList;
 +import java.util.Collections;
 +import java.util.HashMap;
 +import java.util.HashSet;
 +import java.util.Iterator;
 +import java.util.List;
 +import java.util.Map;
 +import java.util.Set;
 +import java.util.TreeSet;
 +
 +import javax.inject.Inject;
 +import javax.naming.ConfigurationException;
 +
++import org.apache.commons.collections.CollectionUtils;
 +import org.apache.log4j.Logger;
 +
 +import org.apache.cloudstack.acl.ControlledEntity.ACLType;
 +import 
org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
 +import org.apache.cloudstack.framework.config.ConfigKey;
 +import org.apache.cloudstack.framework.config.Configurable;
 +import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 +import org.apache.cloudstack.lb.dao.ApplicationLoadBalancerRuleDao;
 +
 +import com.cloud.api.ApiDBUtils;
 +import com.cloud.configuration.Config;
 +import com.cloud.configuration.ConfigurationManager;
 +import com.cloud.dc.DataCenter;
 +import com.cloud.dc.DataCenterVO;
 +import com.cloud.dc.PodVlanMapVO;
 +import com.cloud.dc.Vlan;
 +import com.cloud.dc.Vlan.VlanType;
 +import com.cloud.dc.VlanVO;
 +import com.cloud.dc.dao.DataCenterDao;
 +import com.cloud.dc.dao.PodVlanMapDao;
 +import com.cloud.dc.dao.VlanDao;
 +import com.cloud.domain.DomainVO;
 +import com.cloud.domain.dao.DomainDao;
 +import com.cloud.exception.InsufficientAddressCapacityException;
 +import com.cloud.exception.InvalidParameterValueException;
 +import com.cloud.exception.PermissionDeniedException;
 +import com.cloud.exception.UnsupportedServiceException;
 +import com.cloud.hypervisor.Hypervisor.HypervisorType;
 +import com.cloud.network.IpAddress.State;
 +import com.cloud.network.Network.Capability;
 +import com.cloud.network.Network.GuestType;
 +import com.cloud.network.Network.IpAddresses;
 +import com.cloud.network.Network.Provider;
 +import com.cloud.network.Network.Service;
 +import com.cloud.network.Networks.TrafficType;
 +import com.cloud.network.addr.PublicIp;
 +import com.cloud.network.dao.FirewallRulesDao;
 +import com.cloud.network.dao.IPAddressDao;
 +import com.cloud.network.dao.IPAddressVO;
 +import com.cloud.network.dao.NetworkDao;
 +import com.cloud.network.dao.NetworkDomainDao;
 +import com.cloud.network.dao.NetworkDomainVO;
 +import com.cloud.network.dao.NetworkServiceMapDao;
 +import com.cloud.network.dao.NetworkServiceMapVO;
 +import com.cloud.network.dao.NetworkVO;
 +import com.cloud.network.dao.PhysicalNetworkDao;
 +import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
 +import com.cloud.network.dao.PhysicalNetworkServiceProviderVO;
 +import com.cloud.network.dao.PhysicalNetworkTrafficTypeDao;
 +import com.cloud.network.dao.PhysicalNetworkTrafficTypeVO;
 +import com.cloud.network.dao.PhysicalNetworkVO;
 +import com.cloud.network.dao.UserIpv6AddressDao;
 +import com.cloud.network.element.IpDeployer;
 +import com.cloud.network.element.IpDeployingRequester;
 +import com.cloud.network.element.NetworkElement;
 +import com.cloud.network.element.UserDataServiceProvider;
 

[GitHub] rhtyd commented on a change in pull request #2905: Fix delete domain button in the UI to update only after deleteDomain job finishes

2018-11-11 Thread GitBox
rhtyd commented on a change in pull request #2905: Fix delete domain button in 
the UI to update only after deleteDomain job finishes
URL: https://github.com/apache/cloudstack/pull/2905#discussion_r232546521
 
 

 ##
 File path: ui/scripts/domains.js
 ##
 @@ -69,11 +69,23 @@
 async: false,
 success: function(json) {
 var jid = json.deletedomainresponse.jobid;
+var wasDomainDeletedWithSuccess = false;
+$.ajax({
+url: 
createURL("queryAsyncJobResult=" + jid),
+dataType: "json",
+async: false,
 
 Review comment:
   @rafaelweingartner sorry for a late reply, you don't need to query job 
results manually but use `args.response.success` and pass the `jobId`. Ideally 
an async notification callback could have been explored and used.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #2795: kvm: Properly report available memory to Management Server

2018-11-11 Thread GitBox
blueorangutan commented on issue #2795: kvm: Properly report available memory 
to Management Server
URL: https://github.com/apache/cloudstack/pull/2795#issuecomment-437772197
 
 
   Packaging result: ✖centos6 ✖centos7 ✖debian. JID-2421


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #3019: Adding three new settings into cloud.configuration.

2018-11-11 Thread GitBox
rhtyd commented on issue #3019: Adding three new settings into 
cloud.configuration.
URL: https://github.com/apache/cloudstack/pull/3019#issuecomment-437771901
 
 
   Ideally configkey should be checked/created by mgmt server on startup 
@mike-tutkowski not sure why they were not created, can you investigate?


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #3012: CLOUDSTACK-3009: Fixed resource calculation CPU, RAM for accounts.

2018-11-11 Thread GitBox
rhtyd commented on issue #3012: CLOUDSTACK-3009: Fixed resource calculation 
CPU, RAM for accounts.
URL: https://github.com/apache/cloudstack/pull/3012#issuecomment-437768688
 
 
   Moved to 4.11.2.0 as it sounds like a critical business issue if resource 
counts are wrong.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #3021: Skip network migration tests for not supported hypervisors instead of failing

2018-11-11 Thread GitBox
rhtyd commented on issue #3021: Skip network migration tests for not supported 
hypervisors instead of failing
URL: https://github.com/apache/cloudstack/pull/3021#issuecomment-437768248
 
 
   Still failed for xenserver, can you check @nvazquez ?


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #3020: Add KVM Guest OS mapping for Windows Server 2019

2018-11-11 Thread GitBox
rhtyd commented on issue #3020: Add KVM Guest OS mapping for Windows Server 2019
URL: https://github.com/apache/cloudstack/pull/3020#issuecomment-437768098
 
 
   LGTM, can you fix the conflict @andrijapanic ?


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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: agent: add host.reserved.mem.mb parameter documentation (#3016)

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

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


The following commit(s) were added to refs/heads/master by this push:
 new df17385  agent: add host.reserved.mem.mb parameter documentation 
(#3016)
df17385 is described below

commit df173859d701585929774817c6e338a3daada923
Author: Andrija Panic 
AuthorDate: Mon Nov 12 07:10:37 2018 +0100

agent: add host.reserved.mem.mb parameter documentation (#3016)

Document "host.reserved.mem.mb" parameter in agent.properties.
---
 agent/conf/agent.properties | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/agent/conf/agent.properties b/agent/conf/agent.properties
index 6b68568..b45526a 100644
--- a/agent/conf/agent.properties
+++ b/agent/conf/agent.properties
@@ -201,6 +201,13 @@ hypervisor.type=kvm
 # reports to the Management Server
 # Default: 0
 #
+# host.reserved.mem.mb = 0
+# How much host memory to reserve for non-allocation. 
+# A useful parameter if a node uses some other software that requires memory,
+# or in case that OOM Killer kicks in sometimes.
+# If this parameter is used, host.overcommit.mem.mb must be set to 0.
+# Default value: 0
+#
 # vm.watchdog.model=i6300esb
 # The model of Watchdog timer to present to the Guest
 # For all models refer to the libvirt documentation.



[GitHub] rhtyd commented on issue #3016: documented host.reserved.mem.mb parameter

2018-11-11 Thread GitBox
rhtyd commented on issue #3016: documented host.reserved.mem.mb parameter
URL: https://github.com/apache/cloudstack/pull/3016#issuecomment-437767848
 
 
   Merged as it's only documentation change.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #3016: documented host.reserved.mem.mb parameter

2018-11-11 Thread GitBox
rhtyd closed pull request #3016: documented host.reserved.mem.mb parameter
URL: https://github.com/apache/cloudstack/pull/3016
 
 
   

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/agent/conf/agent.properties b/agent/conf/agent.properties
index 6b68568de85..b45526aa6af 100644
--- a/agent/conf/agent.properties
+++ b/agent/conf/agent.properties
@@ -201,6 +201,13 @@ hypervisor.type=kvm
 # reports to the Management Server
 # Default: 0
 #
+# host.reserved.mem.mb = 0
+# How much host memory to reserve for non-allocation. 
+# A useful parameter if a node uses some other software that requires memory,
+# or in case that OOM Killer kicks in sometimes.
+# If this parameter is used, host.overcommit.mem.mb must be set to 0.
+# Default value: 0
+#
 # vm.watchdog.model=i6300esb
 # The model of Watchdog timer to present to the Guest
 # For all models refer to the libvirt documentation.


 


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #3013: Print log on INFO if Host reached Max Guests Limit

2018-11-11 Thread GitBox
rhtyd commented on issue #3013: Print log on INFO if Host reached Max Guests 
Limit
URL: https://github.com/apache/cloudstack/pull/3013#issuecomment-437767526
 
 
   This is only logging change, I'll go with Travis test results and merge this.


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


With regards,
Apache Git Services


[cloudstack] branch master updated: server: print log on INFO if Host reached Max Guests Limit (#3013)

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 44c080d  server: print log on INFO if Host reached Max Guests Limit 
(#3013)
44c080d is described below

commit 44c080da11aa352d33e85165248b17afcf886ced
Author: Wido den Hollander 
AuthorDate: Mon Nov 12 07:09:17 2018 +0100

server: print log on INFO if Host reached Max Guests Limit (#3013)

This should not be in DEBUG as people would want to know that the host was 
skipped
because it didn't have enough slots available to run the VM.

Signed-off-by: Wido den Hollander 
---
 server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java 
b/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java
index a9042a7..cc2d7a5 100644
--- a/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java
+++ b/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java
@@ -1126,10 +1126,8 @@ public class CapacityManagerImpl extends ManagerBase 
implements CapacityManager,
 String hypervisorVersion = host.getHypervisorVersion();
 Long maxGuestLimit = 
_hypervisorCapabilitiesDao.getMaxGuestsLimit(hypervisorType, hypervisorVersion);
 if (vmCount.longValue() >= maxGuestLimit.longValue()) {
-if (s_logger.isDebugEnabled()) {
-s_logger.debug("Host name: " + host.getName() + ", hostId: " + 
host.getId() + " already reached max Running VMs(count includes system VMs), 
limit is: " +
-maxGuestLimit + ",Running VM counts is: " + 
vmCount.longValue());
-}
+s_logger.info("Host name: " + host.getName() + ", hostId: " + 
host.getId() + " already reached max Running VMs(count includes system VMs), 
limit: " +
+maxGuestLimit + ", Running VM count: " + vmCount.longValue());
 return true;
 }
 return false;



[GitHub] rhtyd closed pull request #3013: Print log on INFO if Host reached Max Guests Limit

2018-11-11 Thread GitBox
rhtyd closed pull request #3013: Print log on INFO if Host reached Max Guests 
Limit
URL: https://github.com/apache/cloudstack/pull/3013
 
 
   

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/main/java/com/cloud/capacity/CapacityManagerImpl.java 
b/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java
index a9042a760f8..cc2d7a56b60 100644
--- a/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java
+++ b/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java
@@ -1126,10 +1126,8 @@ public boolean checkIfHostReachMaxGuestLimit(Host host) {
 String hypervisorVersion = host.getHypervisorVersion();
 Long maxGuestLimit = 
_hypervisorCapabilitiesDao.getMaxGuestsLimit(hypervisorType, hypervisorVersion);
 if (vmCount.longValue() >= maxGuestLimit.longValue()) {
-if (s_logger.isDebugEnabled()) {
-s_logger.debug("Host name: " + host.getName() + ", hostId: " + 
host.getId() + " already reached max Running VMs(count includes system VMs), 
limit is: " +
-maxGuestLimit + ",Running VM counts is: " + 
vmCount.longValue());
-}
+s_logger.info("Host name: " + host.getName() + ", hostId: " + 
host.getId() + " already reached max Running VMs(count includes system VMs), 
limit: " +
+maxGuestLimit + ", Running VM count: " + vmCount.longValue());
 return true;
 }
 return 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] rhtyd commented on a change in pull request #3012: CLOUDSTACK-3009: Fixed resource calculation CPU, RAM for accounts.

2018-11-11 Thread GitBox
rhtyd commented on a change in pull request #3012: CLOUDSTACK-3009: Fixed 
resource calculation CPU, RAM for accounts.
URL: https://github.com/apache/cloudstack/pull/3012#discussion_r232542802
 
 

 ##
 File path: test/integration/smoke/test_resource_accounting.py
 ##
 @@ -0,0 +1,252 @@
+# Licensed to the Apache Software Foundation (ASF) under one
 
 Review comment:
   Can you add this to .travis.yml as well?


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


With regards,
Apache Git Services


[GitHub] blueorangutan commented on issue #3012: CLOUDSTACK-3009: Fixed resource calculation CPU, RAM for accounts.

2018-11-11 Thread GitBox
blueorangutan commented on issue #3012: CLOUDSTACK-3009: Fixed resource 
calculation CPU, RAM for accounts.
URL: https://github.com/apache/cloudstack/pull/3012#issuecomment-437767408
 
 
   @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 #3012: CLOUDSTACK-3009: Fixed resource calculation CPU, RAM for accounts.

2018-11-11 Thread GitBox
rhtyd commented on issue #3012: CLOUDSTACK-3009: Fixed resource calculation 
CPU, RAM for accounts.
URL: https://github.com/apache/cloudstack/pull/3012#issuecomment-437767351
 
 
   @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 #3000: CLOUDSTACK-2998: Added two more device name patterns to valid bridge slaves (lo* and dummy*)

2018-11-11 Thread GitBox
blueorangutan commented on issue #3000: CLOUDSTACK-2998: Added two more device 
name patterns to valid bridge slaves (lo* and dummy*)
URL: https://github.com/apache/cloudstack/pull/3000#issuecomment-437767233
 
 
   @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 #3000: CLOUDSTACK-2998: Added two more device name patterns to valid bridge slaves (lo* and dummy*)

2018-11-11 Thread GitBox
rhtyd commented on issue #3000: CLOUDSTACK-2998: Added two more device name 
patterns to valid bridge slaves (lo* and dummy*)
URL: https://github.com/apache/cloudstack/pull/3000#issuecomment-437767167
 
 
   @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 #2993: Remove api rate limiting plugin

2018-11-11 Thread GitBox
rhtyd commented on issue #2993: Remove api rate limiting plugin
URL: https://github.com/apache/cloudstack/pull/2993#issuecomment-437767063
 
 
   Looks like this may be in use by users, we can deprecate this over time but 
that will be a long process than simply remove 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 #2992: PoC for log library surface reduction (2991)

2018-11-11 Thread GitBox
rhtyd commented on issue #2992: PoC for log library surface reduction (2991)
URL: https://github.com/apache/cloudstack/pull/2992#issuecomment-437766949
 
 
   @DaanHoogland I'll evaluate this soon and get back to you, thanks for the PR!


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


With regards,
Apache Git Services


[GitHub] blueorangutan commented on issue #2985: kvm/ceph: When create a new RBD image use modern flags/features for t…

2018-11-11 Thread GitBox
blueorangutan commented on issue #2985: kvm/ceph: When create a new RBD image 
use modern flags/features for t…
URL: https://github.com/apache/cloudstack/pull/2985#issuecomment-437766754
 
 
   @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 #2990: Security Group: add secondary ips to the correct ipset based on ip family (4.11)

2018-11-11 Thread GitBox
rhtyd commented on issue #2990: Security Group: add secondary ips to the 
correct ipset based on ip family (4.11)
URL: https://github.com/apache/cloudstack/pull/2990#issuecomment-437766723
 
 
   @wido are you lgtm on the changes and is this tested in prod?
   @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 #2990: Security Group: add secondary ips to the correct ipset based on ip family (4.11)

2018-11-11 Thread GitBox
blueorangutan commented on issue #2990: Security Group: add secondary ips to 
the correct ipset based on ip family (4.11)
URL: https://github.com/apache/cloudstack/pull/2990#issuecomment-437766748
 
 
   @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 #2985: kvm/ceph: When create a new RBD image use modern flags/features for t…

2018-11-11 Thread GitBox
rhtyd commented on issue #2985: kvm/ceph: When create a new RBD image use 
modern flags/features for t…
URL: https://github.com/apache/cloudstack/pull/2985#issuecomment-437766585
 
 
   @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 #2795: kvm: Properly report available memory to Management Server

2018-11-11 Thread GitBox
blueorangutan commented on issue #2795: kvm: Properly report available memory 
to Management Server
URL: https://github.com/apache/cloudstack/pull/2795#issuecomment-437766411
 
 
   @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


[cloudstack] branch master updated: vmware: updateVmwareDc API for updating vmware datacenter details (#2919)

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

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


The following commit(s) were added to refs/heads/master by this push:
 new d4d91f3  vmware: updateVmwareDc API for updating vmware datacenter 
details (#2919)
d4d91f3 is described below

commit d4d91f355dbc6b656f28dc0f20c0e687028bb568
Author: Rohit Yadav 
AuthorDate: Mon Nov 12 11:32:36 2018 +0530

vmware: updateVmwareDc API for updating vmware datacenter details (#2919)

This adds a new API updateVmwareDc that allows admins to update the
VMware datacenter details of a zone. It also recursively updates
the cluster_details for any username/password updates
as well as updates the url detail in cluster_details table and guid
detail in the host_details table with any newly provided vcenter
domain/ip. The update API assumes that there is only one vCenter per
zone. And, since the username/password for each VMware host could be 
different
than what gets configured for vcenter at zone level, it does not update the
username/password in host_details.

Previously, one has to manually update the db with any new vcenter details 
for the zone.

Signed-off-by: Rohit Yadav 
---
 .../src/main/java/com/cloud/host/dao/HostDao.java  |   2 +
 .../main/java/com/cloud/host/dao/HostDaoImpl.java  |  11 ++
 .../hypervisor/vmware/VmwareDatacenterService.java |   9 +-
 .../vmware/manager/VmwareManagerImpl.java  | 201 +++--
 .../api/command/admin/zone/UpdateVmwareDcCmd.java  | 131 ++
 .../vmware/VmwareDatacenterApiUnitTest.java|   6 +
 .../vmware/manager/VmwareManagerImplTest.java  | 118 
 ui/css/cloudstack3.css |   8 +
 ui/l10n/en.js  |   1 +
 ui/scripts/system.js   |  61 ++-
 10 files changed, 482 insertions(+), 66 deletions(-)

diff --git a/engine/schema/src/main/java/com/cloud/host/dao/HostDao.java 
b/engine/schema/src/main/java/com/cloud/host/dao/HostDao.java
index 2de3fcd..1fca86c 100644
--- a/engine/schema/src/main/java/com/cloud/host/dao/HostDao.java
+++ b/engine/schema/src/main/java/com/cloud/host/dao/HostDao.java
@@ -85,6 +85,8 @@ public interface HostDao extends GenericDao, 
StateDao listAllHosts(long zoneId);
 
+List listAllHostsByZoneAndHypervisorType(long zoneId, 
HypervisorType hypervisorType);
+
 List listAllHostsByType(Host.Type type);
 
 HostVO findByPublicIp(String publicIp);
diff --git a/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java 
b/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java
index 6eec7ba..8c8c082 100644
--- a/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java
@@ -229,6 +229,7 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao
 
 DcSearch = createSearchBuilder();
 DcSearch.and("dc", DcSearch.entity().getDataCenterId(), 
SearchCriteria.Op.EQ);
+DcSearch.and("hypervisorType", DcSearch.entity().getHypervisorType(), 
Op.EQ);
 DcSearch.and("type", DcSearch.entity().getType(), Op.EQ);
 DcSearch.and("status", DcSearch.entity().getStatus(), Op.EQ);
 DcSearch.and("resourceState", DcSearch.entity().getResourceState(), 
Op.EQ);
@@ -1117,6 +1118,16 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao
 }
 
 @Override
+public List listAllHostsByZoneAndHypervisorType(long zoneId, 
HypervisorType hypervisorType) {
+SearchCriteria sc = DcSearch.create();
+sc.setParameters("dc", zoneId);
+if (hypervisorType != null) {
+sc.setParameters("hypervisorType", hypervisorType.toString());
+}
+return listBy(sc);
+}
+
+@Override
 public List listClustersByHostTag(String hostTagOnOffering) {
 TransactionLegacy txn = TransactionLegacy.currentTxn();
 PreparedStatement pstmt = null;
diff --git 
a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterService.java
 
b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterService.java
index d74c123..5379253 100644
--- 
a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterService.java
+++ 
b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterService.java
@@ -22,6 +22,7 @@ import java.util.List;
 import org.apache.cloudstack.api.command.admin.zone.AddVmwareDcCmd;
 import org.apache.cloudstack.api.command.admin.zone.ListVmwareDcsCmd;
 import org.apache.cloudstack.api.command.admin.zone.RemoveVmwareDcCmd;
+import org.apache.cloudstack.api.command.admin.zone.UpdateVmwareDcCmd;
 
 import com.cloud.exception.DiscoveryException;
 import com.cloud.exception.ResourceInUseException;
@@ 

[GitHub] rhtyd closed pull request #2919: vmware: updateVmwareDc API for updating vmware datacenter details

2018-11-11 Thread GitBox
rhtyd closed pull request #2919: vmware: updateVmwareDc API for updating vmware 
datacenter details
URL: https://github.com/apache/cloudstack/pull/2919
 
 
   

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

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

diff --git a/engine/schema/src/main/java/com/cloud/host/dao/HostDao.java 
b/engine/schema/src/main/java/com/cloud/host/dao/HostDao.java
index 2de3fcd17ad..1fca86ca319 100644
--- a/engine/schema/src/main/java/com/cloud/host/dao/HostDao.java
+++ b/engine/schema/src/main/java/com/cloud/host/dao/HostDao.java
@@ -85,6 +85,8 @@
 
 List listAllHosts(long zoneId);
 
+List listAllHostsByZoneAndHypervisorType(long zoneId, 
HypervisorType hypervisorType);
+
 List listAllHostsByType(Host.Type type);
 
 HostVO findByPublicIp(String publicIp);
diff --git a/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java 
b/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java
index 6eec7baa5ad..8c8c082ed8f 100644
--- a/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java
@@ -229,6 +229,7 @@ public void init() {
 
 DcSearch = createSearchBuilder();
 DcSearch.and("dc", DcSearch.entity().getDataCenterId(), 
SearchCriteria.Op.EQ);
+DcSearch.and("hypervisorType", DcSearch.entity().getHypervisorType(), 
Op.EQ);
 DcSearch.and("type", DcSearch.entity().getType(), Op.EQ);
 DcSearch.and("status", DcSearch.entity().getStatus(), Op.EQ);
 DcSearch.and("resourceState", DcSearch.entity().getResourceState(), 
Op.EQ);
@@ -1116,6 +1117,16 @@ public HostVO findByIp(final String ipAddress) {
 return customSearch(sc, null);
 }
 
+@Override
+public List listAllHostsByZoneAndHypervisorType(long zoneId, 
HypervisorType hypervisorType) {
+SearchCriteria sc = DcSearch.create();
+sc.setParameters("dc", zoneId);
+if (hypervisorType != null) {
+sc.setParameters("hypervisorType", hypervisorType.toString());
+}
+return listBy(sc);
+}
+
 @Override
 public List listClustersByHostTag(String hostTagOnOffering) {
 TransactionLegacy txn = TransactionLegacy.currentTxn();
diff --git 
a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterService.java
 
b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterService.java
index d74c12347fe..53792539ee8 100644
--- 
a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterService.java
+++ 
b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterService.java
@@ -22,6 +22,7 @@
 import org.apache.cloudstack.api.command.admin.zone.AddVmwareDcCmd;
 import org.apache.cloudstack.api.command.admin.zone.ListVmwareDcsCmd;
 import org.apache.cloudstack.api.command.admin.zone.RemoveVmwareDcCmd;
+import org.apache.cloudstack.api.command.admin.zone.UpdateVmwareDcCmd;
 
 import com.cloud.exception.DiscoveryException;
 import com.cloud.exception.ResourceInUseException;
@@ -30,9 +31,11 @@
 
 public interface VmwareDatacenterService extends PluggableService {
 
-public VmwareDatacenterVO addVmwareDatacenter(AddVmwareDcCmd cmd) throws 
IllegalArgumentException, DiscoveryException, ResourceInUseException;
+VmwareDatacenterVO addVmwareDatacenter(AddVmwareDcCmd cmd) throws 
IllegalArgumentException, DiscoveryException, ResourceInUseException;
 
-public boolean removeVmwareDatacenter(RemoveVmwareDcCmd cmd) throws 
IllegalArgumentException, ResourceInUseException;
+VmwareDatacenter updateVmwareDatacenter(UpdateVmwareDcCmd 
updateVmwareDcCmd);
 
-public List 
listVmwareDatacenters(ListVmwareDcsCmd cmd) throws IllegalArgumentException, 
CloudRuntimeException;
+boolean removeVmwareDatacenter(RemoveVmwareDcCmd cmd) throws 
IllegalArgumentException, ResourceInUseException;
+
+List listVmwareDatacenters(ListVmwareDcsCmd 
cmd) throws IllegalArgumentException, CloudRuntimeException;
 }
diff --git 
a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
 
b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
index f586f393821..643d3cebb7c 100644
--- 
a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
+++ 
b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
@@ -16,6 +16,42 @@
 // under the License.
 package com.cloud.hypervisor.vmware.manager;
 
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.rmi.RemoteException;
+import java.time.Duration;

[GitHub] rhtyd commented on issue #2795: kvm: Properly report available memory to Management Server

2018-11-11 Thread GitBox
rhtyd commented on issue #2795: kvm: Properly report available memory to 
Management Server
URL: https://github.com/apache/cloudstack/pull/2795#issuecomment-437766250
 
 
   @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 #3007: Add missing ConfigDrive entries on existing zones after upgrade

2018-11-11 Thread GitBox
rhtyd closed pull request #3007: Add missing ConfigDrive entries on existing 
zones after upgrade
URL: https://github.com/apache/cloudstack/pull/3007
 
 
   

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/NetworkModelImpl.java 
b/server/src/com/cloud/network/NetworkModelImpl.java
index 31cdf914d5f..4dae7437ae9 100644
--- a/server/src/com/cloud/network/NetworkModelImpl.java
+++ b/server/src/com/cloud/network/NetworkModelImpl.java
@@ -34,6 +34,7 @@
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.acl.ControlledEntity.ACLType;
@@ -202,6 +203,8 @@ public void setNetworkElements(List 
networkElements) {
 private ProjectAccountDao _projectAccountDao;
 @Inject
 NetworkOfferingDetailsDao _ntwkOffDetailsDao;
+@Inject
+private NetworkService _networkService;
 
 private final HashMap _systemNetworks = new 
HashMap(5);
 static Long s_privateOfferingId = null;
@@ -2113,10 +2116,44 @@ public boolean start() {
 }
 }
 }
+
+//After network elements are configured correctly, verify ConfigDrive 
entries on enabled zones
+verifyDisabledConfigDriveEntriesOnEnabledZones();
+
 s_logger.info("Started Network Model");
 return true;
 }
 
+/**
+ * Verifies ConfigDrive entries on a zone and adds disabled ConfigDrive 
provider if missing.
+ */
+protected void addDisabledConfigDriveEntriesOnZone(DataCenterVO zone) {
+if (zone.getNetworkType() == DataCenter.NetworkType.Advanced) {
+List physicalNetworks = 
_physicalNetworkDao.listByZoneAndTrafficType(
+zone.getId(), TrafficType.Guest);
+for (PhysicalNetworkVO physicalNetworkVO : physicalNetworks) {
+PhysicalNetworkServiceProviderVO provider = 
_pNSPDao.findByServiceProvider(
+physicalNetworkVO.getId(), 
Provider.ConfigDrive.getName());
+if (provider == null) {
+_networkService.addProviderToPhysicalNetwork(
+physicalNetworkVO.getId(), 
Provider.ConfigDrive.getName(), null, null);
+}
+}
+}
+}
+
+/**
+ * Verifies ConfigDrive entries on enabled zones, adds disabled 
ConfigDrive provider if missing.
+ */
+protected void verifyDisabledConfigDriveEntriesOnEnabledZones() {
+List zones = _dcDao.listEnabledZones();
+if (CollectionUtils.isNotEmpty(zones)) {
+for (DataCenterVO zone : zones) {
+addDisabledConfigDriveEntriesOnZone(zone);
+}
+}
+}
+
 @Override
 public boolean stop() {
 return true;
diff --git a/server/test/com/cloud/network/NetworkModelTest.java 
b/server/test/com/cloud/network/NetworkModelTest.java
index ba575420ed8..f707329557a 100644
--- a/server/test/com/cloud/network/NetworkModelTest.java
+++ b/server/test/com/cloud/network/NetworkModelTest.java
@@ -19,18 +19,32 @@
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyLong;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isNull;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.spy;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import com.cloud.dc.DataCenter;
+import com.cloud.dc.DataCenterVO;
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.network.dao.PhysicalNetworkDao;
+import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
+import com.cloud.network.dao.PhysicalNetworkServiceProviderVO;
+import com.cloud.network.dao.PhysicalNetworkVO;
 import junit.framework.Assert;
 
 import org.junit.Before;
@@ -48,11 +62,64 @@
 import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.net.Ip;
 import com.cloud.network.Network.Provider;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
 
 public class NetworkModelTest {
+
+@Mock
+private DataCenterDao dataCenterDao;
+@Mock
+private PhysicalNetworkDao physicalNetworkDao;
+@Mock
+private PhysicalNetworkServiceProviderDao 
physicalNetworkServiceProviderDao;
+@Mock
+private NetworkService 

[cloudstack] branch 4.11 updated (7d8eb37 -> bb7493a)

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

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


from 7d8eb37  [4.11] Fix set initial reservation on public IP ranges (#2980)
 add bb7493a  configdrive: Add missing ConfigDrive entries on existing 
zones after upgrade (#3007)

No new revisions were added by this update.

Summary of changes:
 server/src/com/cloud/network/NetworkModelImpl.java |  37 +++
 .../test/com/cloud/network/NetworkModelTest.java   | 119 -
 2 files changed, 154 insertions(+), 2 deletions(-)



[GitHub] rhtyd commented on issue #2583: CPU cores per socket setting not functional

2018-11-11 Thread GitBox
rhtyd commented on issue #2583: CPU cores per socket setting not functional
URL: https://github.com/apache/cloudstack/issues/2583#issuecomment-437765128
 
 
   @bdonnahue there is no strict date however we were aiming for late-oct, 
mid-nov; but we have had blockers/bugs because of which we're at RC4.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #2856: VR dhcp domain-name-servers

2018-11-11 Thread GitBox
rhtyd commented on issue #2856: VR dhcp domain-name-servers
URL: https://github.com/apache/cloudstack/issues/2856#issuecomment-437764914
 
 
   it looks like how you may have setup your env, I could not reproduce. cc-ing 
for ideas - @PaulAngus @nvazquez @DaanHoogland @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] rhtyd commented on issue #2906: Shared Networks documentation

2018-11-11 Thread GitBox
rhtyd commented on issue #2906: Shared Networks documentation
URL: https://github.com/apache/cloudstack/issues/2906#issuecomment-437764789
 
 
   It depends but yes @izenk supported services could be external, by default 
these supported services (dhcp and dns) are provided by the VR.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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-documentation] branch master updated (849727c -> c4241fc)

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

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


from 849727c  updated jasypt version for change db password (#19)
 add 4667dbd  Snapshots, not live migrations ? (#10)
 new c4241fc  Merge pull request #20 from apache/4.11

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


Summary of changes:
 source/installguide/hypervisor/kvm.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)



[cloudstack-documentation] 01/01: Merge pull request #20 from apache/4.11

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

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

commit c4241fcc541106c2af73b2163981929e3dd7c920
Merge: 849727c 4667dbd
Author: Rohit Yadav 
AuthorDate: Mon Nov 12 11:17:46 2018 +0530

Merge pull request #20 from apache/4.11

Snapshots, not live migrations ? (#10)

 source/installguide/hypervisor/kvm.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)



[cloudstack-documentation] branch 4.11 updated: Snapshots, not live migrations ? (#10)

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

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


The following commit(s) were added to refs/heads/4.11 by this push:
 new 4667dbd  Snapshots, not live migrations ? (#10)
4667dbd is described below

commit 4667dbd493f7f25d9c998104bbc472ba8b7b4f0c
Author: Andrija Panic 
AuthorDate: Mon Nov 12 06:47:22 2018 +0100

Snapshots, not live migrations ? (#10)

If memory serves me correctly, this was only related to snapshots (copy 
over from Primary to Secondary Stor.) - and has nothing to do with live 
migrations ???
---
 source/installguide/hypervisor/kvm.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/installguide/hypervisor/kvm.rst 
b/source/installguide/hypervisor/kvm.rst
index 1ea8eec..c5cc5ff 100644
--- a/source/installguide/hypervisor/kvm.rst
+++ b/source/installguide/hypervisor/kvm.rst
@@ -1091,13 +1091,13 @@ installed on all of your KVM hosts.
 As this package often is not available in standard distribution repos, you 
will need
 to install the package from your preferred source. 
 
-Live Migration
+Volume snapshots
 ^^
-CloudStack uses the qemu-img to perform live migrations.  In CentOS > 6.3, the 
qemu-img
+CloudStack uses the qemu-img to perform snapshots.  In CentOS >= 6.5, the 
qemu-img
 supplied by RedHat/CentOS ceased to include a '-s' switch which performs 
snapshots. The
 '-s' switch has been restored in latest CentOS/RHEL 7.x versions.
 
-In order to be able to perform live migrations on CentOS 6.x (greater than 
6.3) you must
+In order to be able to perform volume snapshots on CentOS 6.x (greater than 
6.4) you must
 replace your version of qemu-img with one which has been patched to include 
the '-s'
 switch.
 



[GitHub] blueorangutan commented on issue #3021: Skip network migration tests for not supported hypervisors instead of failing

2018-11-11 Thread GitBox
blueorangutan commented on issue #3021: Skip network migration tests for not 
supported hypervisors instead of failing
URL: https://github.com/apache/cloudstack/pull/3021#issuecomment-437716782
 
 
   Trillian test result (tid-3160)
   Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 22865 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3021-t3160-kvm-centos7.zip
   Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
   Smoke tests completed. 67 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] blueorangutan commented on issue #3021: Skip network migration tests for not supported hypervisors instead of failing

2018-11-11 Thread GitBox
blueorangutan commented on issue #3021: Skip network migration tests for not 
supported hypervisors instead of failing
URL: https://github.com/apache/cloudstack/pull/3021#issuecomment-437715673
 
 
   Trillian test result (tid-3159)
   Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
   Total time taken: 22052 seconds
   Marvin logs: 
https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3021-t3159-xenserver-71.zip
   Intermittent failure detected: /marvin/tests/smoke/test_migration.py
   Intermittent failure detected: /marvin/tests/smoke/test_scale_vm.py
   Smoke tests completed. 65 look OK, 2 have error(s)
   Only failed tests results shown below:
   
   
   Test | Result | Time (s) | Test File
   --- | --- | --- | ---
   test_01_native_to_native_network_migration | `Error` | 0.00 | 
test_migration.py
   test_02_native_to_native_vpc_migration | `Error` | 0.00 | test_migration.py
   test_01_scale_vm | `Error` | 13.44 | test_scale_vm.py
   


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


With regards,
Apache Git Services


[cloudstack] branch master updated: Fix delete domain button in the UI to update only after job finishes (#2905)

2018-11-11 Thread rafael
This is an automated email from the ASF dual-hosted git repository.

rafael 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 63094b2  Fix delete domain button in the UI to update only after job 
finishes (#2905)
63094b2 is described below

commit 63094b2fbf7a8ee7e6f4d109c9d33a155358eaa7
Author: Rafael Weingärtner 
AuthorDate: Sun Nov 11 18:41:37 2018 -0200

Fix delete domain button in the UI to update only after job finishes (#2905)

When the “deleteDomain” command is sent via UI, the HTML is already updated 
assuming that the “deleteDomain” command will actually delete it. However, 
there are cases (domain with allocated resources) that will not allow ACS to 
remove the command; as a consequence, the UI will not be in sync with ACS 
state, which can lead to misunderstandings.
---
 ui/scripts/domains.js | 12 
 1 file changed, 12 insertions(+)

diff --git a/ui/scripts/domains.js b/ui/scripts/domains.js
index 1f65ff4..9e96f49 100644
--- a/ui/scripts/domains.js
+++ b/ui/scripts/domains.js
@@ -69,11 +69,23 @@
 async: false,
 success: function(json) {
 var jid = json.deletedomainresponse.jobid;
+var wasDomainDeletedWithSuccess = false;
+$.ajax({
+url: 
createURL("queryAsyncJobResult=" + jid),
+dataType: "json",
+async: false,
+success: function(json) {
+wasDomainDeletedWithSuccess = 
json.queryasyncjobresultresponse.jobresultcode ==  0;
+}
+});
 args.response.success({
 _custom: {
 jobId: jid
 }
 });
+if(!wasDomainDeletedWithSuccess){
+return;
+}
 
 // Quick fix for proper UI reaction to 
delete domain
 var $item = 
$('.name.selected').closest('li');



[GitHub] rafaelweingartner closed pull request #2905: Fix delete domain button in the UI to update only after deleteDomain job finishes

2018-11-11 Thread GitBox
rafaelweingartner closed pull request #2905: Fix delete domain button in the UI 
to update only after deleteDomain job finishes
URL: https://github.com/apache/cloudstack/pull/2905
 
 
   

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/ui/scripts/domains.js b/ui/scripts/domains.js
index 1f65ff4bdae..9e96f494219 100644
--- a/ui/scripts/domains.js
+++ b/ui/scripts/domains.js
@@ -69,11 +69,23 @@
 async: false,
 success: function(json) {
 var jid = json.deletedomainresponse.jobid;
+var wasDomainDeletedWithSuccess = false;
+$.ajax({
+url: 
createURL("queryAsyncJobResult=" + jid),
+dataType: "json",
+async: false,
+success: function(json) {
+wasDomainDeletedWithSuccess = 
json.queryasyncjobresultresponse.jobresultcode ==  0;
+}
+});
 args.response.success({
 _custom: {
 jobId: jid
 }
 });
+if(!wasDomainDeletedWithSuccess){
+return;
+}
 
 // Quick fix for proper UI reaction to 
delete domain
 var $item = 
$('.name.selected').closest('li');


 


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #2997: Allow KVM VM live migration with ROOT volume on file storage type

2018-11-11 Thread GitBox
blueorangutan commented on issue #2997: Allow KVM VM live migration with ROOT 
volume on file storage type
URL: https://github.com/apache/cloudstack/pull/2997#issuecomment-437687960
 
 
   Packaging result: ✔centos6 ✔centos7 ✖debian. JID-2420


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #2997: Allow KVM VM live migration with ROOT volume on file storage type

2018-11-11 Thread GitBox
nvazquez commented on issue #2997: Allow KVM VM live migration with ROOT volume 
on file storage type
URL: https://github.com/apache/cloudstack/pull/2997#issuecomment-437685967
 
 
   @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 #2997: Allow KVM VM live migration with ROOT volume on file storage type

2018-11-11 Thread GitBox
blueorangutan commented on issue #2997: Allow KVM VM live migration with ROOT 
volume on file storage type
URL: https://github.com/apache/cloudstack/pull/2997#issuecomment-437685988
 
 
   @nvazquez a Jenkins job has been kicked to build packages. I'll keep you 
posted as I make progress.


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


With regards,
Apache Git Services


[GitHub] blueorangutan commented on issue #3021: Skip network migration tests for not supported hypervisors instead of failing

2018-11-11 Thread GitBox
blueorangutan commented on issue #3021: Skip network migration tests for not 
supported hypervisors instead of failing
URL: https://github.com/apache/cloudstack/pull/3021#issuecomment-437685855
 
 
   @nvazquez a Trillian-Jenkins matrix job (centos6 mgmt + xs71, centos7 mgmt + 
vmware65, centos7 mgmt + kvmcentos7) 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 #3021: Skip network migration tests for not supported hypervisors instead of failing

2018-11-11 Thread GitBox
nvazquez commented on issue #3021: Skip network migration tests for not 
supported hypervisors instead of failing
URL: https://github.com/apache/cloudstack/pull/3021#issuecomment-437685831
 
 
   @blueorangutan test matrix


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #3021: Skip network migration tests for not supported hypervisors instead of failing

2018-11-11 Thread GitBox
blueorangutan commented on issue #3021: Skip network migration tests for not 
supported hypervisors instead of failing
URL: https://github.com/apache/cloudstack/pull/3021#issuecomment-437685666
 
 
   Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2419


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above 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 #3021: Skip network migration tests for not supported hypervisors instead of failing

2018-11-11 Thread GitBox
blueorangutan commented on issue #3021: Skip network migration tests for not 
supported hypervisors instead of failing
URL: https://github.com/apache/cloudstack/pull/3021#issuecomment-437683376
 
 
   @nvazquez 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] nvazquez commented on issue #3021: Skip network migration tests for not supported hypervisors instead of failing

2018-11-11 Thread GitBox
nvazquez commented on issue #3021: Skip network migration tests for not 
supported hypervisors instead of failing
URL: https://github.com/apache/cloudstack/pull/3021#issuecomment-437683364
 
 
   @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 #3021: Skip network migration tests for not supported hypervisors instead of failing

2018-11-11 Thread GitBox
blueorangutan commented on issue #3021: Skip network migration tests for not 
supported hypervisors instead of failing
URL: https://github.com/apache/cloudstack/pull/3021#issuecomment-437667168
 
 
   Packaging result: ✔centos6 ✔centos7 ✖debian. JID-2418


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


With regards,
Apache Git Services