[GitHub] [cloudstack] blueorangutan commented on pull request #4131: [HEALTH] Master/4.15 Health Check please don't merge this

2020-06-19 Thread GitBox


blueorangutan commented on pull request #4131:
URL: https://github.com/apache/cloudstack/pull/4131#issuecomment-646947187


   @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 to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] rhtyd commented on pull request #4131: [HEALTH] Master/4.15 Health Check please don't merge this

2020-06-19 Thread GitBox


rhtyd commented on pull request #4131:
URL: https://github.com/apache/cloudstack/pull/4131#issuecomment-646947083


   @blueorangutan test



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] blueorangutan commented on pull request #4150: [HEALTH][4.14] Health Check Run

2020-06-19 Thread GitBox


blueorangutan commented on pull request #4150:
URL: https://github.com/apache/cloudstack/pull/4150#issuecomment-646946844


   @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 to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] rhtyd commented on pull request #4150: [HEALTH][4.14] Health Check Run

2020-06-19 Thread GitBox


rhtyd commented on pull request #4150:
URL: https://github.com/apache/cloudstack/pull/4150#issuecomment-646946789


   @blueorangutan package
   
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] blueorangutan commented on pull request #4131: [HEALTH] Master/4.15 Health Check please don't merge this

2020-06-19 Thread GitBox


blueorangutan commented on pull request #4131:
URL: https://github.com/apache/cloudstack/pull/4131#issuecomment-646946734


   Packaging result: ✔centos7 ✔debian. JID-1423



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] blueorangutan commented on pull request #4148: server: Do not resize volume of running vm on KVM host if host is not Up or not Enabled

2020-06-19 Thread GitBox


blueorangutan commented on pull request #4148:
URL: https://github.com/apache/cloudstack/pull/4148#issuecomment-646945394


   Packaging result: ✔centos7 ✔debian. JID-1422



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] blueorangutan commented on pull request #4131: [HEALTH] Master/4.15 Health Check please don't merge this

2020-06-19 Thread GitBox


blueorangutan commented on pull request #4131:
URL: https://github.com/apache/cloudstack/pull/4131#issuecomment-646943510


   @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 to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] rhtyd commented on pull request #4131: [HEALTH] Master/4.15 Health Check please don't merge this

2020-06-19 Thread GitBox


rhtyd commented on pull request #4131:
URL: https://github.com/apache/cloudstack/pull/4131#issuecomment-646943392


   @blueorangutan package
   
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




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

2020-06-19 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 972d2e201c017befae7583c3939ec2c6bac4596d
Merge: 5f695c9 afce828
Author: Rohit Yadav 
AuthorDate: Sat Jun 20 10:49:11 2020 +0530

Merge remote-tracking branch 'origin/4.14'

 engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)



[cloudstack] branch master updated (5f695c9 -> 972d2e2)

2020-06-19 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 5f695c9  Merge remote-tracking branch 'origin/4.14'
 add 7e50f4a  server: Fix delete network with no services (#4132)
 add afce828  Merge remote-tracking branch 'origin/4.13' into 4.14
 new 972d2e2  Merge remote-tracking branch 'origin/4.14'

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:
 engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)



[GitHub] [cloudstack] rhtyd closed issue #4096: Shared Network (without services) is being deleted when its NICs are assigned to VM

2020-06-19 Thread GitBox


rhtyd closed issue #4096:
URL: https://github.com/apache/cloudstack/issues/4096


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[cloudstack] branch 4.14 updated (148fab4 -> afce828)

2020-06-19 Thread rohit
This is an automated email from the ASF dual-hosted git repository.

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


from 148fab4  Merge remote-tracking branch 'origin/4.13' into 4.14
 add 7e50f4a  server: Fix delete network with no services (#4132)
 new afce828  Merge remote-tracking branch 'origin/4.13' into 4.14

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:
 engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)



[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13' into 4.14

2020-06-19 Thread rohit
This is an automated email from the ASF dual-hosted git repository.

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

commit afce828dd1ba3a9cfb51bb9c3a0f322b9b52145d
Merge: 148fab4 7e50f4a
Author: Rohit Yadav 
AuthorDate: Sat Jun 20 10:48:06 2020 +0530

Merge remote-tracking branch 'origin/4.13' into 4.14

 engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)




[GitHub] [cloudstack] blueorangutan commented on pull request #4117: [VMware] Explicitly controlling VM hardware version

2020-06-19 Thread GitBox


blueorangutan commented on pull request #4117:
URL: https://github.com/apache/cloudstack/pull/4117#issuecomment-646943067


   @rhtyd a Trillian-Jenkins test job (centos7 mgmt + vmware-67u3) 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 to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] rhtyd commented on pull request #4117: [VMware] Explicitly controlling VM hardware version

2020-06-19 Thread GitBox


rhtyd commented on pull request #4117:
URL: https://github.com/apache/cloudstack/pull/4117#issuecomment-646942951


   @blueorangutan test centos7 vmware-67u3
   
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] rhtyd merged pull request #4132: Fix delete network with no services

2020-06-19 Thread GitBox


rhtyd merged pull request #4132:
URL: https://github.com/apache/cloudstack/pull/4132


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[cloudstack] branch 4.13 updated: server: Fix delete network with no services (#4132)

2020-06-19 Thread rohit
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/4.13 by this push:
 new 7e50f4a  server: Fix delete network with no services (#4132)
7e50f4a is described below

commit 7e50f4a01bf41f5868168b07f7caefee7305510c
Author: Nicolas Vazquez 
AuthorDate: Sat Jun 20 02:15:05 2020 -0300

server: Fix delete network with no services (#4132)

Fix delete shared network with no services on network offering
Fixes: #4096
---
 engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java 
b/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java
index 5e22eb5..12d206e 100644
--- a/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java
@@ -29,6 +29,8 @@ import java.util.Set;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
+import com.cloud.offerings.dao.NetworkOfferingServiceMapDao;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.log4j.Logger;
 
 import com.cloud.network.Network;
@@ -82,6 +84,8 @@ public class UserVmDaoImpl extends GenericDaoBase implements Use
 ResourceTagDao _tagsDao;
 @Inject
 NetworkDao networkDao;
+@Inject
+NetworkOfferingServiceMapDao networkOfferingServiceMapDao;
 
 private static final String LIST_PODS_HAVING_VMS_FOR_ACCOUNT =
 "SELECT pod_id FROM cloud.vm_instance WHERE data_center_id = ? AND 
account_id = ? AND pod_id IS NOT NULL AND (state = 'Running' OR state = 
'Stopped') "
@@ -313,7 +317,10 @@ public class UserVmDaoImpl extends 
GenericDaoBase implements Use
 SearchBuilder nicSearch = _nicDao.createSearchBuilder();
 nicSearch.and("networkId", nicSearch.entity().getNetworkId(), 
SearchCriteria.Op.EQ);
 nicSearch.and("removed", nicSearch.entity().getRemoved(), 
SearchCriteria.Op.NULL);
-if (!Network.GuestType.L2.equals(network.getGuestType())) {
+
+List networkServices = 
networkOfferingServiceMapDao.listServicesForNetworkOffering(network.getNetworkOfferingId());
+
+if (!Network.GuestType.L2.equals(network.getGuestType()) && 
CollectionUtils.isNotEmpty(networkServices)) {
 nicSearch.and().op("ip4Address", 
nicSearch.entity().getIPv4Address(), SearchCriteria.Op.NNULL);
 nicSearch.or("ip6Address", 
nicSearch.entity().getIPv6Address(), SearchCriteria.Op.NNULL);
 nicSearch.cp();



[GitHub] [cloudstack] blueorangutan commented on pull request #4148: server: Do not resize volume of running vm on KVM host if host is not Up or not Enabled

2020-06-19 Thread GitBox


blueorangutan commented on pull request #4148:
URL: https://github.com/apache/cloudstack/pull/4148#issuecomment-646942751


   @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 to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] rhtyd commented on pull request #4148: server: Do not resize volume of running vm on KVM host if host is not Up or not Enabled

2020-06-19 Thread GitBox


rhtyd commented on pull request #4148:
URL: https://github.com/apache/cloudstack/pull/4148#issuecomment-646942667


   @blueorangutan package



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] shwstppr commented on a change in pull request #4154: server: fix for wrong affinity group count

2020-06-19 Thread GitBox


shwstppr commented on a change in pull request #4154:
URL: https://github.com/apache/cloudstack/pull/4154#discussion_r443102528



##
File path: server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
##
@@ -3624,25 +3624,30 @@ private void fillVMOrTemplateDetailOptions(final 
Map> optio
 if (domainId != null) {
 SearchCriteria scDomain = 
buildAffinityGroupSearchCriteria(null, isRecursive, new ArrayList(), 
listProjectResourcesCriteria, affinityGroupId,
 affinityGroupName, affinityGroupType, keyword);
-affinityGroups.addAll(listDomainLevelAffinityGroups(scDomain, 
searchFilter, domainId));
+List groups = 
listDomainLevelAffinityGroups(scDomain, searchFilter, domainId);
+affinityGroups.addAll(groups);
+count += groups.size();
 } else {
 
 for (Long permAcctId : permittedAccounts) {
 Account permittedAcct = _accountDao.findById(permAcctId);
 SearchCriteria scDomain = 
buildAffinityGroupSearchCriteria(null, isRecursive, new ArrayList(), 
listProjectResourcesCriteria, affinityGroupId,
 affinityGroupName, affinityGroupType, keyword);
-
-
affinityGroups.addAll(listDomainLevelAffinityGroups(scDomain, searchFilter, 
permittedAcct.getDomainId()));
+List groups = 
listDomainLevelAffinityGroups(scDomain, searchFilter, 
permittedAcct.getDomainId());

Review comment:
   @davidjumani I think it might. Will check and fix if needed cc @rhtyd





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] rhtyd commented on a change in pull request #4154: server: fix for wrong affinity group count

2020-06-19 Thread GitBox


rhtyd commented on a change in pull request #4154:
URL: https://github.com/apache/cloudstack/pull/4154#discussion_r443102380



##
File path: server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
##
@@ -3624,25 +3624,30 @@ private void fillVMOrTemplateDetailOptions(final 
Map> optio
 if (domainId != null) {
 SearchCriteria scDomain = 
buildAffinityGroupSearchCriteria(null, isRecursive, new ArrayList(), 
listProjectResourcesCriteria, affinityGroupId,
 affinityGroupName, affinityGroupType, keyword);
-affinityGroups.addAll(listDomainLevelAffinityGroups(scDomain, 
searchFilter, domainId));
+List groups = 
listDomainLevelAffinityGroups(scDomain, searchFilter, domainId);
+affinityGroups.addAll(groups);
+count += groups.size();
 } else {
 
 for (Long permAcctId : permittedAccounts) {
 Account permittedAcct = _accountDao.findById(permAcctId);
 SearchCriteria scDomain = 
buildAffinityGroupSearchCriteria(null, isRecursive, new ArrayList(), 
listProjectResourcesCriteria, affinityGroupId,
 affinityGroupName, affinityGroupType, keyword);
-
-
affinityGroups.addAll(listDomainLevelAffinityGroups(scDomain, searchFilter, 
permittedAcct.getDomainId()));
+List groups = 
listDomainLevelAffinityGroups(scDomain, searchFilter, 
permittedAcct.getDomainId());

Review comment:
   @shwstppr ?





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] DaanHoogland commented on a change in pull request #4116: cks: fix k8s cluster template retrieval

2020-06-19 Thread GitBox


DaanHoogland commented on a change in pull request #4116:
URL: https://github.com/apache/cloudstack/pull/4116#discussion_r443030410



##
File path: 
plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
##
@@ -300,8 +294,7 @@ private boolean 
isKubernetesServiceTemplateConfigured(DataCenter zone) {
 LOGGER.warn(String.format("Unable to find the template %s to 
be used for provisioning Kubernetes cluster nodes", templateName));
 return false;
 }
-List listZoneTemplate = 
templateZoneDao.listByZoneTemplate(zone.getId(), template.getId());
-if (listZoneTemplate == null || listZoneTemplate.isEmpty()) {
+if 
(CollectionUtils.isEmpty(templateJoinDao.newTemplateView(template, 
zone.getId(), true))) {

Review comment:
   The call `public List 
newTemplateView(VirtualMachineTemplate template, long zoneId, boolean 
readyOnly)` as implemented in `TemplateJoinDaoImpl`, does a search including 
removed leading to a hit for a template that is not available. Is this intended?





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] RodrigoDLopez commented on pull request #4111: API-call to declare host as dead

2020-06-19 Thread GitBox


RodrigoDLopez commented on pull request #4111:
URL: https://github.com/apache/cloudstack/pull/4111#issuecomment-646838607


   Hello Gabriel, nice feature.  
   I did some manual testing, and it seems to me that everything is correct.
   
   **Environment**
   - 2 Hosts KVM with HA enable
- H01
- H02
   - Local and shared storage
   
   **Test 01**
   - Try to declare an enable host as dead
   
   **Expected:** Do nothing, and inform this on response
   **Result:** as expected the API responds "Cannot perform declare host [id=1, 
name=kvm413] as 'Dead' when host is in Up status"
   
   **Test 02**
   - Try to cancel host declared as dead on an enable host
   
   **Expected:** Do nothing, and infor this on response
   **Result:** as expected the API responds "Failed to Cancel host from Dead 
status due to: Cannot perform cancelHostAsDead on host [id=1, name=kvm413] when 
host is in Enabled state"
   
   **Test 03**
   - migrate VR to H01
   - deploy 1 vm with HA enable on H01
   - stop agent on H01
   - deal with instances at H01
   - declare H01 as dead
   
   **Expected:** Migrate VR and instance to a suitable host.  
   **Result:** all good, as expected
   
   **Test 04**
   - deploy 2 vms with HA enable on H01
   - deploy 1 vms without HA enable on H01
   - stop agent on H01
   - deal with instances at H01
   - declare H01 as dead
   
   **Expected:** Vms with HA enable migrate to a suitable host, vm without HA 
enable stay in stopped state  
   **Result:**  as expected, vms with HA enable was placed at a suitable host, 
vms without HA enable, need to be wake up manualy
   
   **Test 05**
   - migrate ssvm, cpvm and vr to H01
   - stop agent on H01
   - deal with instances at H01
   - declare H01 as dead
   
   **Expected:** Migrate ssvm, cpvm and vr to a suitable host  
   Result: As expected those instances was migrated to a suitable host.
   
   **Test 06**
   - disable HA on H01 and H02
   - deploy 2 vms with HA enable on H01
   - stop agent on H01
   - deal with instances at H01
   - declare H01 as dead
   
   **Expected:** I dont know what is the expected behavior here.  
   **Result:** Migrate those instances to a suitable host
   
   **Test 07**
   - disable HA on H01 and H02
   - migrate ssvm, cpvm, vr to H01
   - stop agent on H01
   - deal with instances at H01
   - declare H01 as dead
   
   **Expected:** Migrate those instances to a suitable host.  
   **Result:** Migrate those instances to a suitable host
   
   LGTM based on this test.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] weizhouapache commented on a change in pull request #4148: server: Do not resize volume of running vm on KVM host if host is not Up or not Enabled

2020-06-19 Thread GitBox


weizhouapache commented on a change in pull request #4148:
URL: https://github.com/apache/cloudstack/pull/4148#discussion_r443003808



##
File path: server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
##
@@ -1187,6 +1189,16 @@ private VolumeVO orchestrateResizeVolume(long volumeId, 
long currentSize, long n
 if (currentSize != newSize && 
_volsDao.getHypervisorType(volume.getId()) == HypervisorType.XenServer && 
!userVm.getState().equals(State.Stopped)) {
 throw new InvalidParameterValueException(errorMsg);
 }
+
+/* Do not resize volume of running vm on KVM host if host is not 
Up or not Enabled */
+if (currentSize != newSize && userVm.getState() == State.Running 
&& userVm.getHypervisorType() == HypervisorType.KVM) {
+HostVO host = _hostDao.findById(userVm.getHostId());
+if (host.getStatus() != Status.Up) {

Review comment:
   @rhtyd added null check





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] Spaceman1984 commented on pull request #4154: server: fix for wrong affinity group count

2020-06-19 Thread GitBox


Spaceman1984 commented on pull request #4154:
URL: https://github.com/apache/cloudstack/pull/4154#issuecomment-646688760


   Tested by adding an affinity group from the ui and then running the list 
affinitygroups api from cloudmonkey. LGTM



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] Spaceman1984 commented on a change in pull request #4138: Fixed incorrect error message on invalid template type download

2020-06-19 Thread GitBox


Spaceman1984 commented on a change in pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#discussion_r442870662



##
File path: 
core/src/main/java/com/cloud/storage/template/HttpTemplateDownloader.java
##
@@ -219,7 +219,7 @@ public long download(boolean resume, 
DownloadCompleteCallback callback) {
 } catch (IOException ioe) {
 status = TemplateDownloader.Status.UNRECOVERABLE_ERROR; //probably 
a file write error?
 // Let's not overwrite the original error message.
-if (errorString.isEmpty()){
+if (errorString.equals(" ")){

Review comment:
   What if we get rid of the check altogether and append the error message 
to what was there already?





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] Spaceman1984 commented on a change in pull request #4138: Fixed incorrect error message on invalid template type download

2020-06-19 Thread GitBox


Spaceman1984 commented on a change in pull request #4138:
URL: https://github.com/apache/cloudstack/pull/4138#discussion_r442870662



##
File path: 
core/src/main/java/com/cloud/storage/template/HttpTemplateDownloader.java
##
@@ -219,7 +219,7 @@ public long download(boolean resume, 
DownloadCompleteCallback callback) {
 } catch (IOException ioe) {
 status = TemplateDownloader.Status.UNRECOVERABLE_ERROR; //probably 
a file write error?
 // Let's not overwrite the original error message.
-if (errorString.isEmpty()){
+if (errorString.equals(" ")){

Review comment:
   @DaanHoogland What if we get rid of the check altogether and append the 
error message to what was there already?





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] blueorangutan commented on pull request #4156: Fixed removal of hosts from certsmap when running certificate auto-renew

2020-06-19 Thread GitBox


blueorangutan commented on pull request #4156:
URL: https://github.com/apache/cloudstack/pull/4156#issuecomment-646625054


   @Spaceman1984 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 to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] Spaceman1984 commented on pull request #4156: Fixed removal of hosts from certsmap when running certificate auto-renew

2020-06-19 Thread GitBox


Spaceman1984 commented on pull request #4156:
URL: https://github.com/apache/cloudstack/pull/4156#issuecomment-646624426


   @blueorangutan test



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] blueorangutan commented on pull request #4156: Fixed removal of hosts from certsmap when running certificate auto-renew

2020-06-19 Thread GitBox


blueorangutan commented on pull request #4156:
URL: https://github.com/apache/cloudstack/pull/4156#issuecomment-646615551


   Packaging result: ✔centos7 ✔debian. JID-1421



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] davidjumani commented on a change in pull request #4154: server: fix for wrong affinity group count

2020-06-19 Thread GitBox


davidjumani commented on a change in pull request #4154:
URL: https://github.com/apache/cloudstack/pull/4154#discussion_r442808736



##
File path: server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
##
@@ -3624,25 +3624,30 @@ private void fillVMOrTemplateDetailOptions(final 
Map> optio
 if (domainId != null) {
 SearchCriteria scDomain = 
buildAffinityGroupSearchCriteria(null, isRecursive, new ArrayList(), 
listProjectResourcesCriteria, affinityGroupId,
 affinityGroupName, affinityGroupType, keyword);
-affinityGroups.addAll(listDomainLevelAffinityGroups(scDomain, 
searchFilter, domainId));
+List groups = 
listDomainLevelAffinityGroups(scDomain, searchFilter, domainId);
+affinityGroups.addAll(groups);
+count += groups.size();
 } else {
 
 for (Long permAcctId : permittedAccounts) {
 Account permittedAcct = _accountDao.findById(permAcctId);
 SearchCriteria scDomain = 
buildAffinityGroupSearchCriteria(null, isRecursive, new ArrayList(), 
listProjectResourcesCriteria, affinityGroupId,
 affinityGroupName, affinityGroupType, keyword);
-
-
affinityGroups.addAll(listDomainLevelAffinityGroups(scDomain, searchFilter, 
permittedAcct.getDomainId()));
+List groups = 
listDomainLevelAffinityGroups(scDomain, searchFilter, 
permittedAcct.getDomainId());

Review comment:
   Could this return Ids that are already there in `affinityGroups` ?





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] wido opened a new issue #4157: dnsmasq in Virtual Router fails to start in IPv6 enabled network

2020-06-19 Thread GitBox


wido opened a new issue #4157:
URL: https://github.com/apache/cloudstack/issues/4157


   # ISSUE TYPE
* Bug Report
   # COMPONENT NAME
   ~~~
   Virtual Router
   ~~~
   
   # CLOUDSTACK VERSION
   ~~~
   4.13.1
   4.14
   ~~~
   
   # CONFIGURATION
   - Advanced Networking
   - IPv6 Enabled in Network
   
   
   # OS / ENVIRONMENT
   - Ubuntu 18.04
   
   
   # SUMMARY
   Then creating a network with IPv6 Enabled but the *DNS 1* and *DNS 2* IPv6 
for the zone haven't been specified these values remain empty in the dnsmasq 
configuration on the Virtual Router:
   
   
   dhcp-option=option6:dns-server,
   
   
   This causes dnsmasq not to start as the configuration is not valid.
   
   # STEPS TO REPRODUCE
   - Create an Advanced Zone
   - Do not fill in IPv6 DNS 1 and DNS 2
   - Create a Shared Network with Ipv6 enabled
   - Try to boot a VM
   
   # EXPECTED RESULTS
   
   
dhcp-option=option6:dns-server,[2a00:f10:ff04:153::53],[2a00:f10:ff04:253::53]
   
   
   In this case *2a00:f10:ff04:153::53* and *2a00:f10:ff04:253::53* are two DNS 
resolvers from PCextreme.
   
   There should be a check that dnsmasq starts or that the Management Server 
refuses to start (with a proper message) the VR because IPv6 DNS 1 and DNS 2 
haven't been configured.
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] blueorangutan commented on pull request #4156: Fixed removal of hosts from certsmap when running certificate auto-renwew

2020-06-19 Thread GitBox


blueorangutan commented on pull request #4156:
URL: https://github.com/apache/cloudstack/pull/4156#issuecomment-646604598


   @Spaceman1984 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 to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] Spaceman1984 commented on pull request #4156: Fixed removal of hosts from certsmap when running certificate auto-renwew

2020-06-19 Thread GitBox


Spaceman1984 commented on pull request #4156:
URL: https://github.com/apache/cloudstack/pull/4156#issuecomment-646604013


   @blueorangutan package



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] davidjumani commented on issue #4136: UI doesn't allow login if sessionkey and JSESSIONID cookies are deleted

2020-06-19 Thread GitBox


davidjumani commented on issue #4136:
URL: https://github.com/apache/cloudstack/issues/4136#issuecomment-646600359


   @rhtyd Looks like there's nothing that can be done from the front end. Need 
to look into the backend



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] rhtyd commented on pull request #4154: server: fix for wrong affinity group count

2020-06-19 Thread GitBox


rhtyd commented on pull request #4154:
URL: https://github.com/apache/cloudstack/pull/4154#issuecomment-646598182


   Request for review - @davidjumani @DaanHoogland @GabrielBrascher 
@ustcweizhou @nvazquez @Spaceman1984 



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] Spaceman1984 opened a new pull request #4156: Fixed removal of hosts from certsmap when running certificate auto-renwew

2020-06-19 Thread GitBox


Spaceman1984 opened a new pull request #4156:
URL: https://github.com/apache/cloudstack/pull/4156


   ## Description
   
   When a host connects to a management server the host IP address and the 
certificate are stored in memory. This mapping is checked periodically to 
determine if any certificates are due to expire.
   
   Before a certificate is renewed a few checks are done to determine if the 
host is connected to the management server by fetching the host record from the 
database. The problem here is if the wrong record is fetched, the host is not 
checked for renewal.
   
   This PR improves the host record fetch from the database by looking only at 
hosts that are not removed.
   
   
   
   
   
   
   
   Fixes: #4129 
   ## 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)
   
   ## Screenshots (if appropriate):
   
   ## How Has This Been Tested?
   
   
   
   
   This has been tested by setting the ca.framework.cert.validity.period and 
ca.framework.cert.expiry.alert.period to the same value. This is to ensure that 
a certificate is up for renewal as soon as it is issued.
   Then watch the management server logs to see if auto-renewal happens.
   
   This has also been tested by using two management servers and reprovision 
host security keys from the second management server and still having the certs 
auto-renew. 
   
   
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] blueorangutan commented on pull request #4040: [KVM] Enable PVLAN support on L2 networks

2020-06-19 Thread GitBox


blueorangutan commented on pull request #4040:
URL: https://github.com/apache/cloudstack/pull/4040#issuecomment-646526611


   @davidjumani 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 to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] davidjumani commented on pull request #4040: [KVM] Enable PVLAN support on L2 networks

2020-06-19 Thread GitBox


davidjumani commented on pull request #4040:
URL: https://github.com/apache/cloudstack/pull/4040#issuecomment-646526156


   @blueorangutan test



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] blueorangutan commented on pull request #4040: [KVM] Enable PVLAN support on L2 networks

2020-06-19 Thread GitBox


blueorangutan commented on pull request #4040:
URL: https://github.com/apache/cloudstack/pull/4040#issuecomment-646511521


   Packaging result: ✔centos7 ✔debian. JID-1420



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] blueorangutan commented on pull request #4040: [KVM] Enable PVLAN support on L2 networks

2020-06-19 Thread GitBox


blueorangutan commented on pull request #4040:
URL: https://github.com/apache/cloudstack/pull/4040#issuecomment-646498312


   @borisstoyanov a Jenkins job has been kicked to build packages. I'll keep 
you posted as I make progress.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org




[GitHub] [cloudstack] borisstoyanov commented on pull request #4040: [KVM] Enable PVLAN support on L2 networks

2020-06-19 Thread GitBox


borisstoyanov commented on pull request #4040:
URL: https://github.com/apache/cloudstack/pull/4040#issuecomment-646497745


   @blueorangutan package



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org