[GitHub] [cloudstack] poussa commented on a change in pull request #3680: [WIP: DO NOT MERGE] CloudStack Kubernetes Service
poussa commented on a change in pull request #3680: [WIP: DO NOT MERGE]
CloudStack Kubernetes Service
URL: https://github.com/apache/cloudstack/pull/3680#discussion_r367256989
##
File path:
plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-master.yml
##
@@ -0,0 +1,265 @@
+#cloud-config
+
+---
+ssh_authorized_keys:
+ {{ k8s.ssh.pub.key }}
+
+write-files:
+ - path: /etc/conf.d/nfs
+permissions: '0644'
+content: |
+ OPTS_RPC_MOUNTD=""
+
+ - path: /etc/kubernetes/pki/cloudstack/ca.crt
+permissions: '0644'
+content: |
+ {{ k8s_master.ca.crt }}
+
+ - path: /etc/kubernetes/pki/cloudstack/apiserver.crt
+permissions: '0644'
+content: |
+ {{ k8s_master.apiserver.crt }}
+
+ - path: /etc/kubernetes/pki/cloudstack/apiserver.key
+permissions: '0600'
+content: |
+ {{ k8s_master.apiserver.key }}
+
+ - path: /opt/bin/setup-kube-system
+permissions: 0700
+owner: root:root
+content: |
+ #!/bin/bash -e
+
+ if [[ -f "/home/core/success" ]]; then
+ echo "Already provisioned!"
+ exit 0
+ fi
+
+ export PATH=$PATH:/opt/bin
+
+ ISO_MOUNT_DIR=/mnt/k8sdisk
+ BINARIES_DIR=${ISO_MOUNT_DIR}/
+ ATTEMPT_ONLINE_INSTALL=false
+ setup_complete=false
+
+ OFFLINE_INSTALL_ATTEMPT_SLEEP=5
+ MAX_OFFLINE_INSTALL_ATTEMPTS=36
+ offline_attempts=1
+ MAX_SETUP_CRUCIAL_CMD_ATTEMPTS=3
+ crucial_cmd_attempts=1
+ while true; do
+if (( "$offline_attempts" > "$MAX_OFFLINE_INSTALL_ATTEMPTS" )); then
+ echo "Warning: Offline install timed out!"
+ break
+fi
+set +e
+output=`blkid -o device -t TYPE=iso9660`
+set -e
+if [ "$output" != "" ]; then
+ while read -r line; do
+if [ ! -d "${ISO_MOUNT_DIR}" ]; then
+ mkdir "${ISO_MOUNT_DIR}"
+fi
+retval=0
+set +e
+mount -o ro "${line}" "${ISO_MOUNT_DIR}"
+retval=$?
+set -e
+if [ $retval -eq 0 ]; then
+ if [ -d "$BINARIES_DIR" ]; then
+break
+ else
+umount "${line}" && rmdir "${ISO_MOUNT_DIR}"
+ fi
+fi
+ done <<< "$output"
+fi
+if [ -d "$BINARIES_DIR" ]; then
+ break
+fi
+echo "Waiting for Binaries directory $BINARIES_DIR to be available,
sleeping for $OFFLINE_INSTALL_ATTEMPT_SLEEP seconds, attempt: $offline_attempts"
+sleep $OFFLINE_INSTALL_ATTEMPT_SLEEP
+offline_attempts=$[$offline_attempts + 1]
+ done
+
+ if [ -d "$BINARIES_DIR" ]; then
+### Binaries available offline ###
+echo "Installing binaries from ${BINARIES_DIR}"
+mkdir -p /opt/cni/bin
+tar -f "${BINARIES_DIR}/cni/cni-plugins-amd64.tgz" -C /opt/cni/bin -xz
+
+mkdir -p /opt/bin
+tar -f "${BINARIES_DIR}/cri-tools/crictl-linux-amd64.tar.gz" -C
/opt/bin -xz
+
+mkdir -p /opt/bin
+cd /opt/bin
+cp -a ${BINARIES_DIR}/k8s/{kubeadm,kubelet,kubectl} /opt/bin
+chmod +x {kubeadm,kubelet,kubectl}
+
+sed "s:/usr/bin:/opt/bin:g" ${BINARIES_DIR}/kubelet.service >
/etc/systemd/system/kubelet.service
+mkdir -p /etc/systemd/system/kubelet.service.d
+sed "s:/usr/bin:/opt/bin:g" ${BINARIES_DIR}/10-kubeadm.conf >
/etc/systemd/system/kubelet.service.d/10-kubeadm.conf
+
+output=`ls ${BINARIES_DIR}/docker/`
+if [ "$output" != "" ]; then
+ while read -r line; do
+crucial_cmd_attempts=1
+while true; do
+ if (( "$crucial_cmd_attempts" >
"$MAX_SETUP_CRUCIAL_CMD_ATTEMPTS" )); then
+echo "Loading docker image ${BINARIES_DIR}/docker/$line
failed!"
+break;
+ fi
+ retval=0
+ set +e
+ docker load < "${BINARIES_DIR}/docker/$line"
+ retval=$?
+ set -e
+ if [ $retval -eq 0 ]; then
+break;
+ fi
+ crucial_cmd_attempts=$[$crucial_cmd_attempts + 1]
+done
+ done <<< "$output"
+ setup_complete=true
+fi
+umount "${ISO_MOUNT_DIR}" && rmdir "${ISO_MOUNT_DIR}"
+ fi
+ if [ "$setup_complete" = false ] && [ "$ATTEMPT_ONLINE_INSTALL" = true
]; then
+### Binaries not available offline ###
+RELEASE="v1.16.3"
+CNI_VERSION="v0.7.5"
+CRICTL_VERSION="v1.16.0"
+echo "Warning: ${BINARIES_DIR} not found. Will get binaries and docker
images from Internet."
+mkdir -p /opt/cni/bin
+curl -L
"https://github.com/containernetworking/plugins/releases/download/${CNI_VERSION}/cni-plugins-amd64-${CNI_VERSION}.tgz";
| tar -C /opt/cni/bin -xz
+
+mkdir -p /opt/bin
+curl -L
"https://github.com/kubernetes-incubator/cri-tools/releases/download/${CRI
[GitHub] [cloudstack] blueorangutan commented on issue #3732: [Vmware] Enable PVLAN support on L2 networks
blueorangutan commented on issue #3732: [Vmware] Enable PVLAN support on L2 networks URL: https://github.com/apache/cloudstack/pull/3732#issuecomment-574987319 Trillian test result (tid-778) Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7 Total time taken: 41675 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3732-t778-kvm-centos7.zip Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py Intermittent failure detected: /marvin/tests/smoke/test_host_maintenance.py Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py Smoke tests completed. 78 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 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 With regards, Apache Git Services
[cloudstack-primate] branch master updated (2e63a8a -> d1eb66a)
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-primate.git. from 2e63a8a storage: recurring volume snapshot form (#99) add d1eb66a storage: take volume snapshot action (#110) No new revisions were added by this update. Summary of changes: src/config/section/storage.js | 8 +- src/views/AutogenView.vue | 3 +- src/views/storage/TakeSnapshot.vue | 275 + 3 files changed, 278 insertions(+), 8 deletions(-) create mode 100644 src/views/storage/TakeSnapshot.vue
[GitHub] [cloudstack] blueorangutan commented on issue #3680: [WIP: DO NOT MERGE] CloudStack Kubernetes Service
blueorangutan commented on issue #3680: [WIP: DO NOT MERGE] CloudStack Kubernetes Service URL: https://github.com/apache/cloudstack/pull/3680#issuecomment-574966034 @shwstppr 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 With regards, Apache Git Services
[GitHub] [cloudstack] shwstppr commented on issue #3680: [WIP: DO NOT MERGE] CloudStack Kubernetes Service
shwstppr commented on issue #3680: [WIP: DO NOT MERGE] CloudStack Kubernetes Service URL: https://github.com/apache/cloudstack/pull/3680#issuecomment-574965955 @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 With regards, Apache Git Services
[GitHub] [cloudstack] GabrielBrascher commented on issue #3681: Validate disk offering IOPS normal and maximum read/write values
GabrielBrascher commented on issue #3681: Validate disk offering IOPS normal and maximum read/write values URL: https://github.com/apache/cloudstack/pull/3681#issuecomment-574934878 Thanks for the feedback @andrijapanicsb @wido! Code has been updated. 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 With regards, Apache Git Services
[GitHub] [cloudstack] andrijapanicsb commented on a change in pull request #3808: reload dnsmasq instead of restart when adding new rules
andrijapanicsb commented on a change in pull request #3808: reload dnsmasq
instead of restart when adding new rules
URL: https://github.com/apache/cloudstack/pull/3808#discussion_r367183135
##
File path: systemvm/debian/opt/cloud/bin/cs/CsDhcp.py
##
@@ -69,7 +69,7 @@ def process(self):
if not self.cl.is_redundant() or self.cl.is_master():
if restart_dnsmasq:
-CsHelper.service("dnsmasq", "restart")
+CsHelper.service("dnsmasq", "reload")
Review comment:
I'll need to test this all @weizhouapache , but afaik dnsmasq is started
when VR is created?
Do you see a problem here? (save me some time from testing all this...)
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
With regards,
Apache Git Services
[GitHub] [cloudstack] andrijapanicsb commented on issue #3575: [WIP DO NOT MERGE] Health check feature for virtual router
andrijapanicsb commented on issue #3575: [WIP DO NOT MERGE] Health check feature for virtual router URL: https://github.com/apache/cloudstack/pull/3575#issuecomment-574924304 @anuragaw see the failing Marvin test please, seems like some code exception or something: 2020-01-15 15:55:36,813 - CRITICAL - EXCEPTION: test_UpdateConfigParamWithScope: ['Traceback (most recent call last):\n', ' File "/usr/lib64/python2.7/unittest/case.py", line 369, in run\n testMethod()\n', ' File "/marvin/tests/smoke/test_global_settings.py", line 63, in test_UpdateConfigParamWithScope\nself.assertEqual(configParam.value, updateConfigurationResponse.value, "Check if the update API returned \\\n', "UnboundLocalError: local variable 'configParam' referenced before assignment\n"] 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 With regards, Apache Git Services
[GitHub] [cloudstack] blueorangutan commented on issue #3575: [WIP DO NOT MERGE] Health check feature for virtual router
blueorangutan commented on issue #3575: [WIP DO NOT MERGE] Health check feature for virtual router URL: https://github.com/apache/cloudstack/pull/3575#issuecomment-574914104 Trillian test result (tid-777) Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7 Total time taken: 32789 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3575-t777-kvm-centos7.zip Intermittent failure detected: /marvin/tests/smoke/test_global_settings.py Intermittent failure detected: /marvin/tests/smoke/test_host_maintenance.py Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py Smoke tests completed. 77 look OK, 1 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_UpdateConfigParamWithScope | `Error` | 0.12 | test_global_settings.py 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 With regards, Apache Git Services
[GitHub] [cloudstack] andrijapanicsb commented on a change in pull request #3575: [WIP DO NOT MERGE] Health check feature for virtual router
andrijapanicsb commented on a change in pull request #3575: [WIP DO NOT MERGE]
Health check feature for virtual router
URL: https://github.com/apache/cloudstack/pull/3575#discussion_r367156588
##
File path: systemvm/debian/root/health_checks/disk_space_check.py
##
@@ -0,0 +1,47 @@
+#!/usr/bin/python
+# 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.
+
+from os import sys, path, statvfs
+from utility import getHealthChecksData
+
+
+def main():
+entries = getHealthChecksData("systemThresholds")
+data = {}
+if entries is not None and len(entries) == 1:
+data = entries[0]
+
+if "minDiskNeeded" not in data:
+print "Missing minDiskNeeded in health_checks_data systemThresholds,
skipping"
+exit(0)
+
+minDiskNeeded = float(data["minDiskNeeded"]) * 1024
+s = statvfs('/')
+freeSpace = (s.f_bavail * s.f_frsize) / 1024
+
+if (freeSpace < minDiskNeeded):
+print "Insufficient free space is " + str(freeSpace/1024) + " MB"
Review comment:
Please change to "Insufficient free space: "
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
With regards,
Apache Git Services
[GitHub] [cloudstack] blueorangutan commented on issue #3694: Ldap fixes
blueorangutan commented on issue #3694: Ldap fixes URL: https://github.com/apache/cloudstack/pull/3694#issuecomment-574883672 Trillian test result (tid-776) Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7 Total time taken: 29182 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3694-t776-kvm-centos7.zip Intermittent failure detected: /marvin/tests/smoke/test_host_maintenance.py Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py Smoke tests completed. 78 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 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 With regards, Apache Git Services
[GitHub] [cloudstack] andrijapanicsb commented on a change in pull request #3575: [WIP DO NOT MERGE] Health check feature for virtual router
andrijapanicsb commented on a change in pull request #3575: [WIP DO NOT MERGE]
Health check feature for virtual router
URL: https://github.com/apache/cloudstack/pull/3575#discussion_r367130808
##
File path: systemvm/debian/root/health_checks/gateways_check.py
##
@@ -0,0 +1,57 @@
+#!/usr/bin/python
+# 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.
+
+from os import sys, path
+from subprocess import *
+from utility import getHealthChecksData
+
+
+def main():
+gws = getHealthChecksData("gateways")
+if gws is None and len(gws) == 0:
+print "No gateways data available, skipping"
+exit(0)
+
+unreachableGateWays = []
+gwsList = gws[0]["gatewaysIps"].strip().split(' ')
+for gw in gwsList:
+if len(gw) == 0:
+continue
+reachableGw = False
+for i in range(5):
+pingCmd = "ping " + gw + " -c 5 -w 10"
Review comment:
Of course, it works fine on CentOS...
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
With regards,
Apache Git Services
[GitHub] [cloudstack] andrijapanicsb commented on a change in pull request #3575: [WIP DO NOT MERGE] Health check feature for virtual router
andrijapanicsb commented on a change in pull request #3575: [WIP DO NOT MERGE]
Health check feature for virtual router
URL: https://github.com/apache/cloudstack/pull/3575#discussion_r367130118
##
File path: systemvm/debian/root/health_checks/gateways_check.py
##
@@ -0,0 +1,57 @@
+#!/usr/bin/python
+# 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.
+
+from os import sys, path
+from subprocess import *
+from utility import getHealthChecksData
+
+
+def main():
+gws = getHealthChecksData("gateways")
+if gws is None and len(gws) == 0:
+print "No gateways data available, skipping"
+exit(0)
+
+unreachableGateWays = []
+gwsList = gws[0]["gatewaysIps"].strip().split(' ')
+for gw in gwsList:
+if len(gw) == 0:
+continue
+reachableGw = False
+for i in range(5):
+pingCmd = "ping " + gw + " -c 5 -w 10"
Review comment:
seems that this "-w 10" or "-W x" doesn't work - pinging unreachable
gateway with "-w 10" or "-w 5" takes 20-23sec both cases.
Even a single ping packet (-c 1) takes 20sec
Thus the check takes an awful long time.
i.e.
root@r-6-VM:~# time ping 1.1.1.1 -c 1 -w 2
PING 1.1.1.1 (1.1.1.1): 56 data bytes
92 bytes from 1.1.1.2: Destination Host Unreachable
--- 1.1.1.1 ping statistics ---
1 packets transmitted, 0 packets received, 100% packet loss
real0m20.498s
user0m0.000s
sys 0m0.000s
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
With regards,
Apache Git Services
[GitHub] [cloudstack] blueorangutan commented on issue #3680: [WIP: DO NOT MERGE] CloudStack Kubernetes Service
blueorangutan commented on issue #3680: [WIP: DO NOT MERGE] CloudStack Kubernetes Service URL: https://github.com/apache/cloudstack/pull/3680#issuecomment-574873987 Packaging result: ✖centos6 ✔centos7 ✔debian. JID-609 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 With regards, Apache Git Services
[GitHub] [cloudstack] weizhouapache commented on a change in pull request #3808: reload dnsmasq instead of restart when adding new rules
weizhouapache commented on a change in pull request #3808: reload dnsmasq
instead of restart when adding new rules
URL: https://github.com/apache/cloudstack/pull/3808#discussion_r367121749
##
File path: systemvm/debian/opt/cloud/bin/cs/CsDhcp.py
##
@@ -69,7 +69,7 @@ def process(self):
if not self.cl.is_redundant() or self.cl.is_master():
if restart_dnsmasq:
-CsHelper.service("dnsmasq", "restart")
+CsHelper.service("dnsmasq", "reload")
Review comment:
@andrijapanicsb
"reload" works only if the service is started.
this is why we have line 74
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
With regards,
Apache Git Services
[GitHub] [cloudstack] blueorangutan commented on issue #3680: [WIP: DO NOT MERGE] CloudStack Kubernetes Service
blueorangutan commented on issue #3680: [WIP: DO NOT MERGE] CloudStack Kubernetes Service URL: https://github.com/apache/cloudstack/pull/3680#issuecomment-574848366 Packaging result: ✖centos6 ✔centos7 ✔debian. JID-608 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 With regards, Apache Git Services
[GitHub] [cloudstack] andrijapanicsb commented on issue #3808: reload dnsmasq instead of restart when adding new rules
andrijapanicsb commented on issue #3808: reload dnsmasq instead of restart when adding new rules URL: https://github.com/apache/cloudstack/pull/3808#issuecomment-574841249 Too many identical failures on 2 runes... will test manually, but it doesn't look good... 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 With regards, Apache Git Services
[GitHub] [cloudstack] shwstppr commented on issue #3680: [WIP: DO NOT MERGE] CloudStack Kubernetes Service
shwstppr commented on issue #3680: [WIP: DO NOT MERGE] CloudStack Kubernetes Service URL: https://github.com/apache/cloudstack/pull/3680#issuecomment-574841006 @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 With regards, Apache Git Services
[GitHub] [cloudstack] blueorangutan commented on issue #3680: [WIP: DO NOT MERGE] CloudStack Kubernetes Service
blueorangutan commented on issue #3680: [WIP: DO NOT MERGE] CloudStack Kubernetes Service URL: https://github.com/apache/cloudstack/pull/3680#issuecomment-574841075 @shwstppr 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 With regards, Apache Git Services
[GitHub] [cloudstack] andrijapanicsb commented on issue #3760: New feature: Resource count (CPU/RAM) take only running vms into calculation
andrijapanicsb commented on issue #3760: New feature: Resource count (CPU/RAM) take only running vms into calculation URL: https://github.com/apache/cloudstack/pull/3760#issuecomment-574840473 wow, it only took 2 days for the monkey to kick the tests... nice 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 With regards, Apache Git Services
[GitHub] [cloudstack] wido commented on issue #3808: reload dnsmasq instead of restart when adding new rules
wido commented on issue #3808: reload dnsmasq instead of restart when adding new rules URL: https://github.com/apache/cloudstack/pull/3808#issuecomment-574840633 Seems good to me. @rhtyd might your experience be from an older version of dnsmasq and that this has been fixed right now? 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 With regards, Apache Git Services
[GitHub] [cloudstack] wido commented on a change in pull request #3739: Add new command to update security group name
wido commented on a change in pull request #3739: Add new command to update
security group name
URL: https://github.com/apache/cloudstack/pull/3739#discussion_r367088181
##
File path:
server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl.java
##
@@ -858,6 +859,10 @@ public SecurityGroupVO
createSecurityGroup(CreateSecurityGroupCmd cmd) throws Pe
Account caller = CallContext.current().getCallingAccount();
Account owner = _accountMgr.finalizeOwner(caller,
cmd.getAccountName(), cmd.getDomainId(), cmd.getProjectId());
+if (name.trim().equals("")) {
Review comment:
Maybe use the commons check ifNotEmpty? We use this on multiple locations in
the CloudStack code
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
With regards,
Apache Git Services
[GitHub] [cloudstack] blueorangutan commented on issue #3760: New feature: Resource count (CPU/RAM) take only running vms into calculation
blueorangutan commented on issue #3760: New feature: Resource count (CPU/RAM) take only running vms into calculation URL: https://github.com/apache/cloudstack/pull/3760#issuecomment-574839904 @andrijapanicsb 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 With regards, Apache Git Services
[GitHub] [cloudstack] andrijapanicsb commented on issue #3633: GUI doesn't show "default" label next to networks in Add Instance wizard
andrijapanicsb commented on issue #3633: GUI doesn't show "default" label next to networks in Add Instance wizard URL: https://github.com/apache/cloudstack/issues/3633#issuecomment-574837211 ping @anuragaw @DaanHoogland - hopefully, a quick one - still present in current master 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 With regards, Apache Git Services
[GitHub] [cloudstack] wido commented on a change in pull request #3681: Validate disk offering IOPS normal and maximum read/write values
wido commented on a change in pull request #3681: Validate disk offering IOPS
normal and maximum read/write values
URL: https://github.com/apache/cloudstack/pull/3681#discussion_r367079724
##
File path:
server/src/test/java/com/cloud/configuration/ConfigurationManagerTest.java
##
@@ -854,36 +848,43 @@ public void hasSameSubnetTest() {
Network ipV6Network = mock(Network.class);
when(ipV6Network.getIp6Gateway()).thenReturn("2001:db8:0:f101::1");
when(ipV6Network.getIp6Cidr()).thenReturn("2001:db8:0:f101::0/64");
-doThrow(new InvalidParameterValueException("Exception from Mock:
startIPv6 is not in ip6cidr indicated
network!")).when(configurationMgr._networkModel).checkIp6Parameters("2001:db9:0:f101::2",
"2001:db9:0:f101::a", "2001:db8:0:f101::1", "2001:db8:0:f101::0/64");
-doThrow(new InvalidParameterValueException("Exception from Mock:
endIPv6 is not in ip6cidr indicated
network!")).when(configurationMgr._networkModel).checkIp6Parameters("2001:db8:0:f101::a",
"2001:db9:0:f101::2", "2001:db8:0:f101::1", "2001:db8:0:f101::0/64");
-doThrow(new InvalidParameterValueException("ip6Gateway and ip6Cidr
should be defined when startIPv6/endIPv6 are passed
in")).when(configurationMgr._networkModel).checkIp6Parameters(Mockito.anyString(),
Mockito.anyString(), Mockito.isNull(String.class),
Mockito.isNull(String.class));
-
-
-configurationMgr.hasSameSubnet(false, null, null, null, null, null,
null, true, "2001:db8:0:f101::1", "2001:db8:0:f101::0/64",
"2001:db8:0:f101::2", "2001:db8:0:f101::a", ipV6Network);
+doThrow(new InvalidParameterValueException("Exception from Mock:
startIPv6 is not in ip6cidr indicated
network!")).when(configurationMgr._networkModel)
+.checkIp6Parameters("2001:db9:0:f101::2",
"2001:db9:0:f101::a", "2001:db8:0:f101::1", "2001:db8:0:f101::0/64");
+doThrow(new InvalidParameterValueException("Exception from Mock:
endIPv6 is not in ip6cidr indicated
network!")).when(configurationMgr._networkModel)
+.checkIp6Parameters("2001:db8:0:f101::a",
"2001:db9:0:f101::2", "2001:db8:0:f101::1", "2001:db8:0:f101::0/64");
+doThrow(new InvalidParameterValueException("ip6Gateway and ip6Cidr
should be defined when startIPv6/endIPv6 are passed
in")).when(configurationMgr._networkModel)
+.checkIp6Parameters(Mockito.anyString(), Mockito.anyString(),
Mockito.isNull(String.class), Mockito.isNull(String.class));
+
+configurationMgr.hasSameSubnet(false, null, null, null, null, null,
null, true, "2001:db8:0:f101::1", "2001:db8:0:f101::0/64",
"2001:db8:0:f101::2", "2001:db8:0:f101::a",
+ipV6Network);
Assert.assertTrue(result);
try {
-configurationMgr.hasSameSubnet(false, null, null, null, null,
null, null, true, "2001:db8:0:f101::2", "2001:db8:0:f101::0/64",
"2001:db8:0:f101::2", "2001:db8:0:f101::a", ipV6Network);
+configurationMgr.hasSameSubnet(false, null, null, null, null,
null, null, true, "2001:db8:0:f101::2", "2001:db8:0:f101::0/64",
"2001:db8:0:f101::2",
+"2001:db8:0:f101::a", ipV6Network);
Assert.fail();
-} catch (InvalidParameterValueException e){
+} catch (InvalidParameterValueException e) {
Assert.assertEquals(e.getMessage(), "The input gateway
2001:db8:0:f101::2 is not same as network gateway 2001:db8:0:f101::1");
}
try {
-configurationMgr.hasSameSubnet(false, null, null, null, null,
null, null, true, "2001:db8:0:f101::1", "2001:db8:0:f101::0/63",
"2001:db8:0:f101::2", "2001:db8:0:f101::a", ipV6Network);
+configurationMgr.hasSameSubnet(false, null, null, null, null,
null, null, true, "2001:db8:0:f101::1", "2001:db8:0:f101::0/63",
"2001:db8:0:f101::2",
+"2001:db8:0:f101::a", ipV6Network);
Assert.fail();
-} catch (InvalidParameterValueException e){
+} catch (InvalidParameterValueException e) {
Assert.assertEquals(e.getMessage(), "The input cidr
2001:db8:0:f101::0/63 is not same as network cidr 2001:db8:0:f101::0/64");
}
try {
-configurationMgr.hasSameSubnet(false, null, null, null, null,
null, null, true, "2001:db8:0:f101::1", "2001:db8:0:f101::0/64",
"2001:db9:0:f101::2", "2001:db9:0:f101::a", ipV6Network);
+configurationMgr.hasSameSubnet(false, null, null, null, null,
null, null, true, "2001:db8:0:f101::1", "2001:db8:0:f101::0/64",
"2001:db9:0:f101::2",
+"2001:db9:0:f101::a", ipV6Network);
Assert.fail();
} catch (InvalidParameterValueException e) {
Assert.assertEquals(e.getMessage(), "Exception from Mock:
startIPv6 is not in ip6cidr indicated network!");
}
try {
-configurationMgr.hasSameSubnet(false, null, null, null, null,
null, null, true, "2001:db8:0:f101::1", "2001
[GitHub] [cloudstack] wido commented on a change in pull request #3681: Validate disk offering IOPS normal and maximum read/write values
wido commented on a change in pull request #3681: Validate disk offering IOPS normal and maximum read/write values URL: https://github.com/apache/cloudstack/pull/3681#discussion_r367079047 ## File path: server/src/test/java/com/cloud/configuration/ConfigurationManagerTest.java ## @@ -166,6 +168,8 @@ VlanVO vlan = new VlanVO(Vlan.VlanType.VirtualNetwork, "vlantag", "vlangateway", "vlannetmask", 1L, "iprange", 1L, 1L, null, null, null); +private static final String MAXIMUM_IOPS_ALLOWED = "3600"; Review comment: Maybe rename this to MAXIMUM_LENGTH_ALLOWED as it's a time which we specify here? 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 With regards, Apache Git Services
[GitHub] [cloudstack] wido commented on a change in pull request #3681: Validate disk offering IOPS normal and maximum read/write values
wido commented on a change in pull request #3681: Validate disk offering IOPS
normal and maximum read/write values
URL: https://github.com/apache/cloudstack/pull/3681#discussion_r367079155
##
File path:
server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
##
@@ -2975,6 +2983,49 @@ public DiskOffering createDiskOffering(final
CreateDiskOfferingCmd cmd) {
hypervisorSnapshotReserve);
}
+/**
+ * Validates IOPS read and write rate offerings. It throws
InvalidParameterValueException in case of one of the following cases is not
respected:
+ *
+ * IOPS write rate cannot be greater than IOPS write maximum rate
+ * IOPS read rate cannot be greater than IOPS read maximum rate
+ * IOPS read rate max length (seconds) must be greater than zero
+ * IOPS write rate max length (seconds) must be greater than zero
+ * If iops.maximum.rate.length is not 0 (zero), blank or null, IOPS
write/read maximum rate length (seconds) cannot be bigger than thevalue from
iops.maximum.rate.length
+ *
+ */
+protected void valildateIopsRateOfferings(final Long iopsReadRate, final
Long iopsReadRateMax, final Long iopsReadRateMaxLength, final Long
iopsWriteRate,
+final Long iopsWriteRateMax, final Long iopsWriteRateMaxLength) {
+if (iopsWriteRateMax != null && iopsWriteRate != null &&
iopsWriteRateMax < iopsWriteRate) {
+throw new InvalidParameterValueException(
+String.format("IOPS write rate (rate: %d) cannot be
greater than IOPS write maximum rate (maximum rate: %d)", iopsWriteRate,
iopsWriteRateMax));
+}
+
+if (iopsReadRateMax != null && iopsReadRate != null && iopsReadRateMax
< iopsReadRate) {
+throw new InvalidParameterValueException(
+String.format("IOPS read rate (rate: %d) cannot be greater
than IOPS read maximum rate (maximum rate: %d)", iopsReadRate,
iopsReadRateMax));
+}
+
+if (iopsReadRateMaxLength != null && iopsReadRateMaxLength <= 0) {
+throw new InvalidParameterValueException(String.format("IOPS read
rate max length (max length: %d seconds) must be greater than zero",
iopsReadRateMaxLength));
+}
+
+if (iopsWriteRateMaxLength != null && iopsWriteRateMaxLength <= 0) {
+throw new InvalidParameterValueException(String.format("IOPS write
rate max length (max length: %d seconds) must be greater than zero",
iopsWriteRateMaxLength));
+}
+
+if (iopsMaximumRateLength.value() != null &&
!iopsMaximumRateLength.value().equals(0L)) {
+if (iopsReadRateMaxLength != null && iopsReadRateMaxLength >
iopsMaximumRateLength.value()) {
+throw new InvalidParameterValueException(String.format("IOPS
read max length (%d seconds) cannot be greater than iops.maximum.rate.length
(%ds seconds)",
+iopsReadRateMaxLength, iopsMaximumRateLength.value()));
+}
+
+if (iopsWriteRateMaxLength != null && iopsWriteRateMaxLength >
iopsMaximumRateLength.value()) {
+throw new InvalidParameterValueException(String.format("IOPS
write max length (%d seconds) cannot be greater than
sane.iops.maximum.rate.length (%d seconds)",
+iopsWriteRateMaxLength,
iopsMaximumRateLength.value()));
+}
+}
+}
+
Review comment:
As suggested I would also validate the bytes duration here
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
With regards,
Apache Git Services
[GitHub] [cloudstack] GabrielBrascher edited a comment on issue #3195: Python 3 compatibility
GabrielBrascher edited a comment on issue #3195: Python 3 compatibility URL: https://github.com/apache/cloudstack/issues/3195#issuecomment-574825799 @rhtyd @andrijapanicsb I am testing and re-working with PR #3730 right now. However, considering the tight schedule, it might be better to keep such changes to the next release indeed. 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 With regards, Apache Git Services
[GitHub] [cloudstack] GabrielBrascher commented on issue #3195: Python 3 compatibility
GabrielBrascher commented on issue #3195: Python 3 compatibility URL: https://github.com/apache/cloudstack/issues/3195#issuecomment-574825799 @rhtyd @andrijapanicsb I am testing and re-working with this PR right now. However, considering the tight schedule, it might be better to keep such changes to the next release indeed. 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 With regards, Apache Git Services
[GitHub] [cloudstack] blueorangutan commented on issue #3383: template: copy md5 mismatch
blueorangutan commented on issue #3383: template: copy md5 mismatch URL: https://github.com/apache/cloudstack/pull/3383#issuecomment-574812618 Packaging result: ✔centos6 ✔centos7 ✔debian. JID-607 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 With regards, Apache Git Services
[GitHub] [cloudstack] blueorangutan commented on issue #3732: [Vmware] Enable PVLAN support on L2 networks
blueorangutan commented on issue #3732: [Vmware] Enable PVLAN support on L2 networks URL: https://github.com/apache/cloudstack/pull/3732#issuecomment-574759775 @nvazquez a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] [cloudstack] nvazquez commented on issue #3732: [Vmware] Enable PVLAN support on L2 networks
nvazquez commented on issue #3732: [Vmware] Enable PVLAN support on L2 networks URL: https://github.com/apache/cloudstack/pull/3732#issuecomment-574759509 @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 With regards, Apache Git Services
[GitHub] [cloudstack] PaulAngus commented on issue #3680: [WIP: DO NOT MERGE] CloudStack Kubernetes Service
PaulAngus commented on issue #3680: [WIP: DO NOT MERGE] CloudStack Kubernetes Service URL: https://github.com/apache/cloudstack/pull/3680#issuecomment-574743620 two CKS marvin tests are failing @shwstppr they look like the tests themselves are failing. 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 With regards, Apache Git Services
[GitHub] [cloudstack] blueorangutan commented on issue #3808: reload dnsmasq instead of restart when adding new rules
blueorangutan commented on issue #3808: reload dnsmasq instead of restart when adding new rules URL: https://github.com/apache/cloudstack/pull/3808#issuecomment-574714097 Trillian test result (tid-774) Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7 Total time taken: 55531 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3808-t774-kvm-centos7.zip Intermittent failure detected: /marvin/tests/smoke/test_internal_lb.py Intermittent failure detected: /marvin/tests/smoke/test_iso.py Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py Intermittent failure detected: /marvin/tests/smoke/test_routers_iptables_default_policy.py Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py Intermittent failure detected: /marvin/tests/smoke/test_templates.py Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py Intermittent failure detected: /marvin/tests/smoke/test_vpc_router_nics.py Intermittent failure detected: /marvin/tests/smoke/test_vpc_vpn.py Intermittent failure detected: /marvin/tests/smoke/test_host_maintenance.py Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py Smoke tests completed. 70 look OK, 8 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_01_internallb_roundrobin_1VPC_3VM_HTTP_port80 | `Failure` | 323.55 | test_internal_lb.py test_02_internallb_roundrobin_1RVPC_3VM_HTTP_port80 | `Failure` | 388.20 | test_internal_lb.py test_03_vpc_internallb_haproxy_stats_on_all_interfaces | `Error` | 180.95 | test_internal_lb.py test_04_rvpc_internallb_haproxy_stats_on_all_interfaces | `Error` | 228.75 | test_internal_lb.py test_04_extract_Iso | `Failure` | 1.06 | test_iso.py test_02_vpc_privategw_static_routes | `Failure` | 857.62 | test_privategw_acl.py test_03_vpc_privategw_restart_vpc_cleanup | `Failure` | 850.88 | test_privategw_acl.py test_01_single_VPC_iptables_policies | `Error` | 802.04 | test_routers_iptables_default_policy.py test_01_RVR_Network_FW_PF_SSH_default_routes_egress_true | `Failure` | 299.07 | test_routers_network_ops.py test_02_RVR_Network_FW_PF_SSH_default_routes_egress_false | `Failure` | 290.84 | test_routers_network_ops.py test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL | `Failure` | 489.85 | test_vpc_redundant.py test_02_redundant_VPC_default_routes | `Failure` | 994.12 | test_vpc_redundant.py test_05_rvpc_multi_tiers | `Failure` | 435.34 | test_vpc_redundant.py test_05_rvpc_multi_tiers | `Error` | 460.23 | test_vpc_redundant.py test_01_VPC_nics_after_destroy | `Failure` | 804.90 | test_vpc_router_nics.py test_02_VPC_default_routes | `Failure` | 812.01 | test_vpc_router_nics.py test_01_redundant_vpc_site2site_vpn | `Failure` | 443.05 | test_vpc_vpn.py test_01_vpc_site2site_vpn_multiple_options | `Error` | 323.09 | test_vpc_vpn.py test_01_vpc_site2site_vpn | `Error` | 339.62 | test_vpc_vpn.py 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 With regards, Apache Git Services
[cloudstack] branch master updated (4780a27 -> 09e812f)
This is an automated email from the ASF dual-hosted git repository. dahn pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git. from 4780a27 Add missing HA config keys (#3776) (#3814) add 54cc73a Add missing HA config keys (#3776) add 6ebd02e Agent lb on svm (#3795) add 8ef10c0 python/c++ formatting in java corrected (#3806) add 09e812f Merge branch '4.13' No new revisions were added by this update. Summary of changes: .../cloud/vm/VirtualMachinePowerStateSyncImpl.java | 6 ++- .../agent/lb/IndirectAgentLBServiceImpl.java | 62 +++--- 2 files changed, 58 insertions(+), 10 deletions(-)
[cloudstack] branch 4.13 updated: python/c++ formatting in java corrected (#3806)
This is an automated email from the ASF dual-hosted git repository.
dahn 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 8ef10c0 python/c++ formatting in java corrected (#3806)
8ef10c0 is described below
commit 8ef10c0fdd16607973cb2b17eda395a7c3b063a1
Author: dahn
AuthorDate: Wed Jan 15 15:31:28 2020 +0100
python/c++ formatting in java corrected (#3806)
---
.../main/java/com/cloud/vm/VirtualMachinePowerStateSyncImpl.java| 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git
a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachinePowerStateSyncImpl.java
b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachinePowerStateSyncImpl.java
index 14043a0..7ff3f10 100644
---
a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachinePowerStateSyncImpl.java
+++
b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachinePowerStateSyncImpl.java
@@ -16,6 +16,7 @@
// under the License.
package com.cloud.vm;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -137,13 +138,14 @@ public class VirtualMachinePowerStateSyncImpl implements
VirtualMachinePowerStat
}
if (s_logger.isInfoEnabled()) {
+String lastTime = new
SimpleDateFormat("/MM/dd'T'HH:mm:ss.SSS'Z'").format(vmStateUpdateTime);
s_logger.info(
-String.format("Detected missing VM. host: %l, vm
id: %l(%s), power state: %s, last state update: %l"
+String.format("Detected missing VM. host: %d, vm
id: %d(%s), power state: %s, last state update: %s"
, hostId
, instance.getId()
, instance.getUuid()
,
VirtualMachine.PowerState.PowerReportMissing
-, vmStateUpdateTime.getTime()));
+, lastTime));
}
long milliSecondsSinceLastStateUpdate = currentTime.getTime()
- vmStateUpdateTime.getTime();
[GitHub] [cloudstack] DaanHoogland merged pull request #3806: python/c++ formatting in java corrected
DaanHoogland merged pull request #3806: python/c++ formatting in java corrected URL: https://github.com/apache/cloudstack/pull/3806 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 With regards, Apache Git Services
[GitHub] [cloudstack] andrijapanicsb commented on issue #3575: [WIP DO NOT MERGE] Health check feature for virtual router
andrijapanicsb commented on issue #3575: [WIP DO NOT MERGE] Health check feature for virtual router URL: https://github.com/apache/cloudstack/pull/3575#issuecomment-574679577 @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 With regards, Apache Git Services
[GitHub] [cloudstack] blueorangutan commented on issue #3575: [WIP DO NOT MERGE] Health check feature for virtual router
blueorangutan commented on issue #3575: [WIP DO NOT MERGE] Health check feature for virtual router URL: https://github.com/apache/cloudstack/pull/3575#issuecomment-574679608 @andrijapanicsb 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 With regards, Apache Git Services
[GitHub] [cloudstack] blueorangutan commented on issue #3575: [WIP DO NOT MERGE] Health check feature for virtual router
blueorangutan commented on issue #3575: [WIP DO NOT MERGE] Health check feature for virtual router URL: https://github.com/apache/cloudstack/pull/3575#issuecomment-574678196 Packaging result: ✖centos6 ✔centos7 ✔debian. JID-606 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 With regards, Apache Git Services
[GitHub] [cloudstack] blueorangutan commented on issue #3575: [WIP DO NOT MERGE] Health check feature for virtual router
blueorangutan commented on issue #3575: [WIP DO NOT MERGE] Health check feature for virtual router URL: https://github.com/apache/cloudstack/pull/3575#issuecomment-574670073 @anuragaw 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 With regards, Apache Git Services
[GitHub] [cloudstack] anuragaw commented on issue #3575: [WIP DO NOT MERGE] Health check feature for virtual router
anuragaw commented on issue #3575: [WIP DO NOT MERGE] Health check feature for virtual router URL: https://github.com/apache/cloudstack/pull/3575#issuecomment-574669927 @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 With regards, Apache Git Services
[GitHub] [cloudstack] borisstoyanov commented on issue #3694: Ldap fixes
borisstoyanov commented on issue #3694: Ldap fixes URL: https://github.com/apache/cloudstack/pull/3694#issuecomment-574664982 @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 With regards, Apache Git Services
[GitHub] [cloudstack] blueorangutan commented on issue #3694: Ldap fixes
blueorangutan commented on issue #3694: Ldap fixes URL: https://github.com/apache/cloudstack/pull/3694#issuecomment-574665124 @borisstoyanov a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on 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 With regards, Apache Git Services
[GitHub] [cloudstack] blueorangutan commented on issue #3680: [WIP: DO NOT MERGE] CloudStack Kubernetes Service
blueorangutan commented on issue #3680: [WIP: DO NOT MERGE] CloudStack Kubernetes Service URL: https://github.com/apache/cloudstack/pull/3680#issuecomment-574662577 Trillian test result (tid-775) Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7 Total time taken: 30460 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3680-t775-kvm-centos7.zip Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_supported_versions.py Intermittent failure detected: /marvin/tests/smoke/test_pvlan.py Intermittent failure detected: /marvin/tests/smoke/test_host_maintenance.py Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py Smoke tests completed. 77 look OK, 3 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- ContextSuite context=TestKubernetesCluster>:setup | `Error` | 0.00 | test_kubernetes_clusters.py test_01_add_delete_kubernetes_supported_version | `Error` | 0.01 | test_kubernetes_supported_versions.py test_create_pvlan_network | `Error` | 0.03 | test_pvlan.py 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 With regards, Apache Git Services
[GitHub] [cloudstack] DaanHoogland commented on a change in pull request #3743: only update powerstate if sure it is the latest
DaanHoogland commented on a change in pull request #3743: only update
powerstate if sure it is the latest
URL: https://github.com/apache/cloudstack/pull/3743#discussion_r366875044
##
File path:
engine/orchestration/src/main/java/com/cloud/vm/VirtualMachinePowerStateSyncImpl.java
##
@@ -130,23 +136,34 @@ private void processReport(long hostId, Map tra
}
}
-if (s_logger.isDebugEnabled())
-s_logger.debug("Detected missing VM. host: " + hostId + ",
vm id: " + instance.getId() +
-", power state: PowerReportMissing, last state
update: " + vmStateUpdateTime.getTime());
+if (s_logger.isInfoEnabled()) {
+s_logger.info(
+String.format("Detected missing VM. host: %l, vm
id: %l(%s), power state: %s, last state update: %l"
Review comment:
yes, i know, fixed in #3806
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
With regards,
Apache Git Services
[GitHub] [cloudstack] nvazquez commented on a change in pull request #3743: only update powerstate if sure it is the latest
nvazquez commented on a change in pull request #3743: only update powerstate if
sure it is the latest
URL: https://github.com/apache/cloudstack/pull/3743#discussion_r366846281
##
File path:
engine/orchestration/src/main/java/com/cloud/vm/VirtualMachinePowerStateSyncImpl.java
##
@@ -130,23 +136,34 @@ private void processReport(long hostId, Map tra
}
}
-if (s_logger.isDebugEnabled())
-s_logger.debug("Detected missing VM. host: " + hostId + ",
vm id: " + instance.getId() +
-", power state: PowerReportMissing, last state
update: " + vmStateUpdateTime.getTime());
+if (s_logger.isInfoEnabled()) {
+s_logger.info(
+String.format("Detected missing VM. host: %l, vm
id: %l(%s), power state: %s, last state update: %l"
Review comment:
Hi @DaanHoogland, I'm getting this error in latest master:
INFO [c.c.a.m.AgentManagerImpl] (AgentTaskPool-98:ctx-ad691272)
(logid:1a451217) The agent from host 1 state determined is Up
INFO [c.c.a.m.AgentManagerImpl] (AgentTaskPool-98:ctx-ad691272)
(logid:1a451217) Agent is determined to be up and running
WARN [c.c.a.m.AgentManagerImpl] (AgentManager-Handler-8:null) (logid:)
Caught:
java.util.UnknownFormatConversionException: Conversion = 'l'
at java.util.Formatter$FormatSpecifier.conversion(Formatter.java:2691)
at java.util.Formatter$FormatSpecifier.(Formatter.java:2720)
at java.util.Formatter.parse(Formatter.java:2560)
at java.util.Formatter.format(Formatter.java:2501)
at java.util.Formatter.format(Formatter.java:2455)
at java.lang.String.format(String.java:2940)
at
com.cloud.vm.VirtualMachinePowerStateSyncImpl.processReport(VirtualMachinePowerStateSyncImpl.java:141)
at
com.cloud.vm.VirtualMachinePowerStateSyncImpl.processHostVmStatePingReport(VirtualMachinePowerStateSyncImpl.java:66)
at
com.cloud.vm.VirtualMachineManagerImpl.processCommands(VirtualMachineManagerImpl.java:3245)
at
com.cloud.agent.manager.AgentManagerImpl.handleCommands(AgentManagerImpl.java:309)
at
com.cloud.agent.manager.AgentManagerImpl$AgentHandler.processRequest(AgentManagerImpl.java:1287)
at
com.cloud.agent.manager.AgentManagerImpl$AgentHandler.doTask(AgentManagerImpl.java:1370)
at
com.cloud.agent.manager.ClusteredAgentManagerImpl$ClusteredAgentHandler.doTask(ClusteredAgentManagerImpl.java:702)
at com.cloud.utils.nio.Task.call(Task.java:83)
at com.cloud.utils.nio.Task.call(Task.java:29)
at java.util.concurrent.FutureTask.run(FutureTask.java:266)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
at java.lang.Thread.run(Thread.java:748)
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
With regards,
Apache Git Services
[cloudstack] branch master updated (be97470 -> 4780a27)
This is an automated email from the ASF dual-hosted git repository. dahn pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git. from be97470 Get Diagnostics: Download logs and diagnostics data from SSVM, CPVM, Router (#3350) add 4780a27 Add missing HA config keys (#3776) (#3814) No new revisions were added by this update. Summary of changes: .../java/com/cloud/ha/HighAvailabilityManager.java | 46 +- .../main/java/com/cloud/configuration/Config.java | 43 + .../configuration/ConfigurationManagerImpl.java| 174 ++--- .../com/cloud/ha/HighAvailabilityManagerImpl.java | 121 +++--- .../main/java/com/cloud/test/DatabaseConfig.java | 59 +++ 5 files changed, 219 insertions(+), 224 deletions(-)
[GitHub] [cloudstack] DaanHoogland merged pull request #3814: Add missing HA config keys (#3776)
DaanHoogland merged pull request #3814: Add missing HA config keys (#3776) URL: https://github.com/apache/cloudstack/pull/3814 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 With regards, Apache Git Services
[GitHub] [cloudstack] andrijapanicsb commented on issue #3814: Add missing HA config keys (#3776)
andrijapanicsb commented on issue #3814: Add missing HA config keys (#3776) URL: https://github.com/apache/cloudstack/pull/3814#issuecomment-574614654 You know your stuff @DaanHoogland - so if you are happy, yes. 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 With regards, Apache Git Services
[GitHub] [cloudstack] andrijapanicsb commented on issue #3350: Get Diagnostics: Download logs and diagnostics data from SSVM, CPVM, Router
andrijapanicsb commented on issue #3350: Get Diagnostics: Download logs and diagnostics data from SSVM, CPVM, Router URL: https://github.com/apache/cloudstack/pull/3350#issuecomment-574601044 Merging based on LGTMs/Approvals and extensive manual testing (in-house) 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 With regards, Apache Git Services
[GitHub] [cloudstack] andrijapanicsb merged pull request #3350: Get Diagnostics: Download logs and diagnostics data from SSVM, CPVM, Router
andrijapanicsb merged pull request #3350: Get Diagnostics: Download logs and diagnostics data from SSVM, CPVM, Router URL: https://github.com/apache/cloudstack/pull/3350 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 With regards, Apache Git Services
[GitHub] [cloudstack] andrijapanicsb closed issue #3593: Not able to call scripts with get diagnostics
andrijapanicsb closed issue #3593: Not able to call scripts with get diagnostics URL: https://github.com/apache/cloudstack/issues/3593 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 With regards, Apache Git Services
[GitHub] [cloudstack] blueorangutan commented on issue #3694: Ldap fixes
blueorangutan commented on issue #3694: Ldap fixes URL: https://github.com/apache/cloudstack/pull/3694#issuecomment-574567674 Packaging result: ✖centos6 ✔centos7 ✔debian. JID-605 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 With regards, Apache Git Services
[GitHub] [cloudstack] DaanHoogland commented on issue #3814: Add missing HA config keys (#3776)
DaanHoogland commented on issue #3814: Add missing HA config keys (#3776) URL: https://github.com/apache/cloudstack/pull/3814#issuecomment-574564068 @andrijapanicsb this is forward merged from the 4.13 branch and had LGTMs and tests. It had merge conflicts however but all looks fine now. merge? 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 With regards, Apache Git Services
[GitHub] [cloudstack] DaanHoogland opened a new pull request #3806: python/c++ formatting in java corrected
DaanHoogland opened a new pull request #3806: python/c++ formatting in java corrected URL: https://github.com/apache/cloudstack/pull/3806 ## Description A formatting of log messages bug that slipped through the cracks. ## 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? tested formatting is right in cli java 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 With regards, Apache Git Services
[GitHub] [cloudstack] DaanHoogland closed pull request #3806: python/c++ formatting in java corrected
DaanHoogland closed pull request #3806: python/c++ formatting in java corrected URL: https://github.com/apache/cloudstack/pull/3806 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 With regards, Apache Git Services
[GitHub] [cloudstack] blueorangutan commented on issue #3694: Ldap fixes
blueorangutan commented on issue #3694: Ldap fixes URL: https://github.com/apache/cloudstack/pull/3694#issuecomment-574559920 @DaanHoogland 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 With regards, Apache Git Services
[GitHub] [cloudstack] DaanHoogland commented on issue #3694: Ldap fixes
DaanHoogland commented on issue #3694: Ldap fixes URL: https://github.com/apache/cloudstack/pull/3694#issuecomment-574559680 @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 With regards, Apache Git Services
[cloudstack-primate] branch master updated: storage: recurring volume snapshot form (#99)
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-primate.git
The following commit(s) were added to refs/heads/master by this push:
new 2e63a8a storage: recurring volume snapshot form (#99)
2e63a8a is described below
commit 2e63a8a3af47af1dc17de82dadef84ce76ad9727
Author: Hoang Nguyen
AuthorDate: Wed Jan 15 15:48:59 2020 +0700
storage: recurring volume snapshot form (#99)
This adds the recurring volume snapshot form.
Signed-off-by: Rohit Yadav
Co-authored-by: Rohit Yadav
---
src/config/section/storage.js | 5 +-
src/locales/en.json | 25 +-
src/utils/timezone/index.js | 80
src/utils/timezone/timezone.json | 620 ++
src/views/storage/FormSchedule.vue| 438 ++
src/views/storage/RecurringSnapshotVolume.vue | 95
src/views/storage/ScheduledSnapshots.vue | 226 ++
7 files changed, 1486 insertions(+), 3 deletions(-)
diff --git a/src/config/section/storage.js b/src/config/section/storage.js
index 80b3c1d..8a629ff 100644
--- a/src/config/section/storage.js
+++ b/src/config/section/storage.js
@@ -89,11 +89,12 @@ export default {
},
{
api: 'createSnapshotPolicy',
- icon: 'video-camera',
+ icon: 'clock-circle',
label: 'Recurring Snapshots',
dataView: true,
show: (record) => { return record.state === 'Ready' },
- args: ['volumeid', 'intervaltype', 'schedule', 'maxsnaps',
'timezone'],
+ popup: true,
+ component: () =>
import('@/views/storage/RecurringSnapshotVolume.vue'),
mapping: {
volumeid: {
value: (record) => { return record.id }
diff --git a/src/locales/en.json b/src/locales/en.json
index a52af5e..bdd42e9 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -23,6 +23,7 @@
"Instances": "Instances",
"LDAP Configuration": "LDAP Configuration",
"Management Servers": "Management Servers",
+"monday": "Monday",
"Monitor": "Monitor",
"Network": "Network",
"Network Offerings": "Network Offerings",
@@ -43,6 +44,8 @@
"System Offerings": "System Offerings",
"System VMs": "System VMs",
"Templates": "Templates",
+"tuesday": "Tuesday",
+"thursday": "Thursday",
"Users": "Users",
"VM Snapshots": "VM Snapshots",
"VPC": "VPC",
@@ -207,6 +210,7 @@
"forceencap": "Force UDP Encapsulation of ESP Packets",
"forgedTransmits": "Forged Transmits",
"format": "Format",
+"friday": "Friday",
"fwdevicecapacity": "Capacity",
"fwdeviceid": "ID",
"fwdevicename": "Type",
@@ -319,6 +323,7 @@
"isstaticnat": "Static NAT",
"issystem": "Is System",
"isvolatile": "Volatile",
+"keep": "Keep",
"key": "Key",
"keyboardType": "Keyboard type",
"keypair": "SSH Key Pair",
@@ -482,6 +487,8 @@
"label.create.VPN.connection": "Create VPN Connection",
"label.create.ssh.key.pair": "Create a SSH Key Pair",
"label.create.template": "Create template",
+"label.day.of.month": "Day of Month",
+"label.day.of.week": "Day of Week",
"label.decline.invitation": "Decline invitation",
"label.dedicate.cluster": "Dedicate Cluster",
"label.dedicate.host": "Dedicate Host",
@@ -532,6 +539,7 @@
"label.enable.vpc.offering": "Enable VPC offering",
"label.enable.vpn": "Enable Remote Access VPN",
"label.enter.token": "Enter token",
+"label.error.volume.upload": "Please choose a file",
"label.error.zone.combined": "All Zones cannot be combined with any other
zone",
"label.french.azerty.keyboard": "French AZERTY keyboard",
"label.globo.dns.configuration": "GloboDNS Configuration",
@@ -541,11 +549,18 @@
"label.ha.configure": "Configure HA",
"label.ha.disable": "Disable HA",
"label.ha.enable": "Enable HA",
+"label.scheduled.snapshots": "Scheduled Snapshots",
+"label.header.volume.snapshot": "You can set up recurring snapshot schedules
by selecting from the available options below and applying your policy
preference",
+"label.header.volume.take.snapshot": "Please confirm that you want to take a
snapshot of this volume.",
"label.instanciate.template.associate.profile.blade": "Instanciate Template
and Associate Profile to Blade",
+"label.interval.weekly": "Every {number}",
+"label.interval.monthly": "Day {number} of month",
"label.japanese.keyboard": "Japanese keyboard",
"label.link.domain.to.ldap": "Link Domain to LDAP",
"label.make.project.owner": "Make account project owner",
"label.metrics": "Metrics",
+"label.min.past.hour": "min past the hr",
+"label.minute.past.hour": "minute(s) past the hour",
"label.migrate.instance.to.host": "Migrate instance to another host",
"label.migrate.instance.to.ps": "Migrate instance to another primary storage",
"label.migrate.lb.vm": "Migrate LB VM",
@@ -553,6 +568,7 @@
"label.migrate.volume.to.primary.storage": "Migrate volume to another primary
[cloudstack-primate] branch master updated: config: ldap configuration section changes
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-primate.git
The following commit(s) were added to refs/heads/master by this push:
new 17ba636 config: ldap configuration section changes
17ba636 is described below
commit 17ba636bf7e8a1ee67d7e0f413bfefeb3c5226ca
Author: Rohit Yadav
AuthorDate: Wed Jan 15 13:45:12 2020 +0530
config: ldap configuration section changes
Signed-off-by: Rohit Yadav
---
src/components/view/ListView.vue | 4 +++-
src/config/section/config.js | 15 ++-
src/config/section/iam.js| 19 +++
src/views/AutogenView.vue| 4
4 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/src/components/view/ListView.vue b/src/components/view/ListView.vue
index 3c93db5..c4f7d22 100644
--- a/src/components/view/ListView.vue
+++ b/src/components/view/ListView.vue
@@ -105,7 +105,9 @@
{{ text
}}
- {{ text
}}
+ {{ text }}
+ {{ text }}
+ {{ text }}
{{ text
}}
diff --git a/src/config/section/config.js b/src/config/section/config.js
index eff2869..3108f90 100644
--- a/src/config/section/config.js
+++ b/src/config/section/config.js
@@ -34,7 +34,8 @@ export default {
title: 'LDAP Configuration',
icon: 'team',
permission: ['listLdapConfigurations'],
- columns: ['hostname', 'port'],
+ columns: ['hostname', 'port', 'domainid'],
+ details: ['hostname', 'port', 'domainid'],
actions: [
{
api: 'addLdapConfiguration',
@@ -44,6 +45,18 @@ export default {
args: [
'hostname', 'port'
]
+},
+{
+ api: 'deleteLdapConfiguration',
+ icon: 'delete',
+ label: 'label.remove.ldap',
+ dataView: true,
+ args: ['hostname'],
+ mapping: {
+hostname: {
+ value: (record) => { return record.hostname }
+}
+ }
}
]
},
diff --git a/src/config/section/iam.js b/src/config/section/iam.js
index b4d7450..9cdf377 100644
--- a/src/config/section/iam.js
+++ b/src/config/section/iam.js
@@ -257,6 +257,25 @@ export default {
}
},
{
+ api: 'linkDomainToLdap',
+ icon: 'link',
+ label: 'Link Domain to LDAP Group/OU',
+ listView: true,
+ dataView: true,
+ args: ['type', 'domainid', 'name', 'accounttype', 'admin'],
+ mapping: {
+type: {
+ options: ['GROUP', 'OU']
+},
+accounttype: {
+ options: ['0', '2']
+},
+domainid: {
+ value: (record) => { return record.id }
+}
+ }
+},
+{
api: 'deleteDomain',
icon: 'delete',
label: 'label.delete.domain',
diff --git a/src/views/AutogenView.vue b/src/views/AutogenView.vue
index 9f18436..c08f548 100644
--- a/src/views/AutogenView.vue
+++ b/src/views/AutogenView.vue
@@ -407,6 +407,8 @@ export default {
params.id = this.$route.params.id
if (this.$route.path.startsWith('/ssh/')) {
params.name = this.$route.params.id
+} else if (this.$route.path.startsWith('/ldapsetting/')) {
+ params.hostname = this.$route.params.id
}
}
@@ -453,6 +455,8 @@ export default {
}
if (this.$route.path.startsWith('/ssh')) {
this.items[idx].id = this.items[idx].name
+} else if (this.$route.path.startsWith('/ldapsetting')) {
+ this.items[idx].id = this.items[idx].hostname
}
}
}
